'::' is no longer interpreted as a variable in a prepare statement.

Michael Meskes · Michael Meskes · commit a79f8195de79 · 2004-10-05T10:48:37.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -1864,6 +1864,11 @@ Mon Sep 27 11:05:49 CEST 2004
 
 	- Synced parser.
 	- Removed Oracle transaction syntax to fix shift/reduce error.
+	
+Tue Oct  5 12:45:48 CEST 2004
+
+	- '::' is no longer interpreted as a variable in a prepare statement.
+	  Added patch by Daniel Verite to fix this.
 	- Set ecpg version to 3.2.0.
 	- Set compat library version to 1.2.
 	- Set ecpg library version to 4.2.
diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/prepare.c,v 1.12 2004/05/21 13:50:12 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/prepare.c,v 1.13 2004/10/05 10:48:37 meskes Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -46,9 +46,14 @@ replace_variables(char *text)
 
 		if (!string && *ptr == ':')
 		{
-			*ptr = '?';
-			for (++ptr; *ptr && isvarchar(*ptr); ptr++)
-				*ptr = ' ';
+			if (ptr[1]==':')
+				ptr+=2; /* skip  '::' */
+		        else
+			{
+				*ptr = '?';
+				for (++ptr; *ptr && isvarchar(*ptr); ptr++)
+					*ptr = ' ';
+			}
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/prepare.c,v 1.12 2004/05/21 13:50:12 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/prepare.c,v 1.13 2004/10/05 10:48:37 meskes Exp $ */`
`2`	`2`
`3`	`3`	`#define POSTGRES_ECPG_INTERNAL`
`4`	`4`	`#include "postgres_fe.h"`
`@@ -46,9 +46,14 @@ replace_variables(char *text)`
`46`	`46`
`47`	`47`	`if (!string && *ptr == ':')`
`48`	`48`	`{`
`49`		`- *ptr = '?';`
`50`		`- for (++ptr; ptr && isvarchar(ptr); ptr++)`
`51`		`- *ptr = ' ';`
	`49`	`+ if (ptr[1]==':')`
	`50`	`+ ptr+=2; /* skip '::' */`
	`51`	`+ else`
	`52`	`+ {`
	`53`	`+ *ptr = '?';`
	`54`	`+ for (++ptr; ptr && isvarchar(ptr); ptr++)`
	`55`	`+ *ptr = ' ';`
	`56`	`+ }`
`52`	`57`	`}`
`53`	`58`	`}`
`54`	`59`	`}`