*** empty log message ***

Michael Meskes · Michael Meskes · commit 969093b7858b · 1999-10-29T19:39:31.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -694,3 +694,9 @@ Wed Oct 27 18:08:09 CEST 1999
 
 	- Synced preproc.y with gram.y.
 	- Set ecpg version to 2.6.8
+
+Fri Oct 29 21:36:25 CEST 1999
+
+	- Fixed bug that caused ecpg to not allow FOR UPDATE.
+	- Set ecpg version to 2.6.9
+
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
@@ -3,7 +3,7 @@ include $(SRCDIR)/Makefile.global
 
 MAJOR_VERSION=2
 MINOR_VERSION=6
-PATCHLEVEL=8
+PATCHLEVEL=9
 
 CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
 	-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -2792,9 +2792,9 @@ SubSelect:     SELECT opt_unique target_list
                          result from_clause where_clause
                          group_clause having_clause
 				{
-					$$ = cat4_str(cat5_str(make1_str("select"), $2, $3, $4, $5), $6, $7, $8);
 					if (strlen($7) > 0 || strlen($8) > 0)
 						ForUpdateNotAllowed = 1;
+					$$ = cat4_str(cat5_str(make1_str("select"), $2, $3, $4, $5), $6, $7, $8);
 				}
 		;
 

Original file line number	Diff line number	Diff line change
`@@ -2792,9 +2792,9 @@ SubSelect: SELECT opt_unique target_list`
`2792`	`2792`	`result from_clause where_clause`
`2793`	`2793`	`group_clause having_clause`
`2794`	`2794`	`{`
`2795`		`- $$ = cat4_str(cat5_str(make1_str("select"), $2, $3, $4, $5), $6, $7, $8);`
`2796`	`2795`	`if (strlen($7) > 0 \|\| strlen($8) > 0)`
`2797`	`2796`	`ForUpdateNotAllowed = 1;`
	`2797`	`+ $$ = cat4_str(cat5_str(make1_str("select"), $2, $3, $4, $5), $6, $7, $8);`
`2798`	`2798`	`}`
`2799`	`2799`	`;`
`2800`	`2800`