*** empty log message ***

Michael Meskes · Michael Meskes · commit c70db13265b3 · 1999-06-16T18:25:50.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -595,5 +595,9 @@ Thu Jun 10 21:09:12 CEST 1999
 
 	- Fixed typo in preproc.y.
 	- Synced pgc.l with scan.l.
+
+Wed Jun 16 20:21:42 CEST 1999
+
+	- Fixed another typo in preproc.y.
 	- Set library version to 3.0.0
 	- Set ecpg version to 2.6.0
diff --git a/src/interfaces/ecpg/TODO b/src/interfaces/ecpg/TODO
@@ -11,6 +11,10 @@ it would be nice to be able to use :var[:index] as cvariable
 
 support for dynamic SQL with unknown number of variables with DESCRIPTORS
 
+Allow INTO clause in cursor definition instead of FETCH clause. (Informix
+does this, Oracle not. But does it work with standard syntax? Or is it even
+standard?)
+
 The line numbering is not exact.
 
 Missing statements:
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -2814,7 +2814,7 @@ select_clause: '(' select_clause ')'
 			}
 		| select_clause UNION opt_union select_clause
 			{
-				$$ = cat3_str($1, make1_str("union"), $3);
+				$$ = cat4_str($1, make1_str("union"), $3, $4);
 				ForUpdateNotAllowed = 1;
 			}
 		| select_clause INTERSECT opt_union select_clause

Original file line number	Diff line number	Diff line change
`@@ -2814,7 +2814,7 @@ select_clause: '(' select_clause ')'`
`2814`	`2814`	`}`
`2815`	`2815`	`\| select_clause UNION opt_union select_clause`
`2816`	`2816`	`{`
`2817`		`- $$ = cat3_str($1, make1_str("union"), $3);`
	`2817`	`+ $$ = cat4_str($1, make1_str("union"), $3, $4);`
`2818`	`2818`	`ForUpdateNotAllowed = 1;`
`2819`	`2819`	`}`
`2820`	`2820`	`\| select_clause INTERSECT opt_union select_clause`