Fix SUBSTRING(str FROM int TO int) parsing.

Thomas G. Lockhart · Thomas G. Lockhart · commit b105324f7e86 · 1997-09-26T15:09:11.000Z
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.51 1997/09/25 14:11:42 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.52 1997/09/26 15:09:11 thomas Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -2938,9 +2938,7 @@ position_expr:  attr opt_indirection
 
 substr_list: expr_list substr_from substr_for
 				{
-					$$ = $1;
-					if ($2 != NULL) $$ = lappend($$, $2);
-					if ($3 != NULL) $$ = lappend($$, $3);
+					$$ = nconc(nconc($1,$2),$3);
 				}
 		| /* EMPTY */
 				{	$$ = NIL; }
@@ -2949,7 +2947,12 @@ substr_list: expr_list substr_from substr_for
 substr_from: FROM expr_list
 				{	$$ = $2; }
 		| /* EMPTY */
-				{	$$ = NIL; }
+				{
+					A_Const *n = makeNode(A_Const);
+					n->val.type = T_Integer;
+					n->val.val.ival = 1;
+					$$ = lcons((Node *)n,NIL);
+				}
 		;
 
 substr_for: FOR expr_list

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.51 1997/09/25 14:11:42 thomas Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.52 1997/09/26 15:09:11 thomas Exp $`
`14`	`14`	`*`
`15`	`15`	`* HISTORY`
`16`	`16`	`* AUTHOR DATE MAJOR EVENT`
`@@ -2938,9 +2938,7 @@ position_expr: attr opt_indirection`
`2938`	`2938`
`2939`	`2939`	`substr_list: expr_list substr_from substr_for`
`2940`	`2940`	`{`
`2941`		`- $$ = $1;`
`2942`		`- if ($2 != NULL) $$ = lappend($$, $2);`
`2943`		`- if ($3 != NULL) $$ = lappend($$, $3);`
	`2941`	`+ $$ = nconc(nconc($1,$2),$3);`
`2944`	`2942`	`}`
`2945`	`2943`	`\| /* EMPTY */`
`2946`	`2944`	`{ $$ = NIL; }`
`@@ -2949,7 +2947,12 @@ substr_list: expr_list substr_from substr_for`
`2949`	`2947`	`substr_from: FROM expr_list`
`2950`	`2948`	`{ $$ = $2; }`
`2951`	`2949`	`\| /* EMPTY */`
`2952`		`- { $$ = NIL; }`
	`2950`	`+ {`
	`2951`	`+ A_Const *n = makeNode(A_Const);`
	`2952`	`+ n->val.type = T_Integer;`
	`2953`	`+ n->val.val.ival = 1;`
	`2954`	`+ $$ = lcons((Node *)n,NIL);`
	`2955`	`+ }`
`2953`	`2956`	`;`
`2954`	`2957`
`2955`	`2958`	`substr_for: FOR expr_list`