*** empty log message ***

Michael Meskes · Michael Meskes · commit 9f0ffa22417e · 1999-07-19T12:37:48.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -609,3 +609,11 @@ Fri Jun 25 07:17:10 CEST 1999
 	- Changed error message in ecpglib.c to list correct database name.
 	- Set library version to 3.0.0
 	- Set ecpg version to 2.6.0
+
+Mon Jul 19 07:53:20 CEST 1999
+
+	- Synced preproc.y with gram.y.
+	- Synced pgc.l with scan.l.
+	- Fixed quoting bug in ecpglib.c
+	- Set ecpg version to 2.6.1
+	- Set library version to 3.0.1
diff --git a/src/interfaces/ecpg/TODO b/src/interfaces/ecpg/TODO
@@ -13,8 +13,6 @@ support for dynamic SQL with unknown number of variables with DESCRIPTORS
 
 The line numbering is not exact.
 
-Inside an SQL statement quoting only works with SQL92 style double quotes: ''. 
-
 Missing statements:
  - exec sql allocate
  - exec sql deallocate
diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in
@@ -6,13 +6,13 @@
 # Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.44 1999/06/30 23:57:23 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.45 1999/07/19 12:37:46 meskes Exp $
 #
 #-------------------------------------------------------------------------
 
 NAME= ecpg
 SO_MAJOR_VERSION= 3
-SO_MINOR_VERSION= 0.0
+SO_MINOR_VERSION= 0.1
 
 SRCDIR= @top_srcdir@
 include $(SRCDIR)/Makefile.global
diff --git a/src/interfaces/ecpg/lib/ecpglib.c b/src/interfaces/ecpg/lib/ecpglib.c
@@ -209,8 +209,8 @@ add_mem(void *ptr, int lineno)
 	auto_allocs = am;
 }
 
-/* This function returns a newly malloced string that has the ' and \
-   in the argument quoted with \.
+/* This function returns a newly malloced string that has the  \
+   in the argument quoted with \ and the ' quote with ' as SQL92 says.
  */
 static
 char *
@@ -228,8 +228,11 @@ quote_postgres(char *arg, int lineno)
 		switch (arg[i])
 		{
 			case '\'':
+				res[ri++] = '\'';
+				break;
 			case '\\':
 				res[ri++] = '\\';
+				break;
 			default:
 				;
 		}
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=0
+PATCHLEVEL=1
 
 CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
 	-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
@@ -132,7 +132,7 @@ identifier		{letter}{letter_or_digit}*
 
 typecast		"::"
 
-self			[,()\[\].;$\:\+\-\*\/\%\<\>\=\|]
+self			[,()\[\].;$\:\+\-\*\/\%\^\<\>\=\|]
 op_and_self		[\~\!\@\#\^\&\|\?\$\:\+\-\*\/\%\<\>\=]
 operator		{op_and_self}+
 
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@`
`6`	`6`	`# Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`#`
`8`	`8`	`# IDENTIFICATION`
`9`		`-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.44 1999/06/30 23:57:23 tgl Exp $`
	`9`	`+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile.in,v 1.45 1999/07/19 12:37:46 meskes Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`13`	`13`	`NAME= ecpg`
`14`	`14`	`SO_MAJOR_VERSION= 3`
`15`		`-SO_MINOR_VERSION= 0.0`
	`15`	`+SO_MINOR_VERSION= 0.1`
`16`	`16`
`17`	`17`	`SRCDIR= @top_srcdir@`
`18`	`18`	`include $(SRCDIR)/Makefile.global`
Original file line number	Diff line number	Diff line change
`@@ -209,8 +209,8 @@ add_mem(void *ptr, int lineno)`
`209`	`209`	`auto_allocs = am;`
`210`	`210`	`}`
`211`	`211`
`212`		`-/* This function returns a newly malloced string that has the ' and \`
`213`		`- in the argument quoted with \.`
	`212`	`+/* This function returns a newly malloced string that has the \`
	`213`	`+ in the argument quoted with \ and the ' quote with ' as SQL92 says.`
`214`	`214`	`*/`
`215`	`215`	`static`
`216`	`216`	`char *`
`@@ -228,8 +228,11 @@ quote_postgres(char *arg, int lineno)`
`228`	`228`	`switch (arg[i])`
`229`	`229`	`{`
`230`	`230`	`case '\'':`
	`231`	`+ res[ri++] = '\'';`
	`232`	`+ break;`
`231`	`233`	`case '\\':`
`232`	`234`	`res[ri++] = '\\';`
	`235`	`+ break;`
`233`	`236`	`default:`
`234`	`237`	`;`
`235`	`238`	`}`