*** empty log message ***

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

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

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

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:
 				;
 		}

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) \

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}+