Use SQL standard '' rather than \' in /contrib. Backpatch to 8.1.X.

bmomjian · bmomjian · commit cc84163fa92a · 2006-05-19T02:38:47.000Z
diff --git a/contrib/dbmirror/DBMirror.pl b/contrib/dbmirror/DBMirror.pl
@@ -33,7 +33,7 @@
 # 
 #
 ##############################################################################
-# $PostgreSQL: pgsql/contrib/dbmirror/DBMirror.pl,v 1.10 2004/07/02 00:58:09 joe Exp $ 
+# $PostgreSQL: pgsql/contrib/dbmirror/DBMirror.pl,v 1.11 2006/05/19 02:38:47 momjian Exp $ 
 #
 ##############################################################################
 
@@ -437,7 +437,7 @@ ($$$$$)
       if(defined $recordValues{$column}) {
 	my $quotedValue = $recordValues{$column};
 	$quotedValue =~ s/\\/\\\\/g;
-	$quotedValue =~ s/'/\\'/g;
+	$quotedValue =~ s/'/''/g;
 	$valuesQuery .= "'$quotedValue'";
       }
       else {
@@ -617,7 +617,7 @@ ($$$$$)
       if(defined $currentValue ) {
 	$quotedValue = $currentValue;
 	$quotedValue =~ s/\\/\\\\/g;
-	$quotedValue =~ s/'/\\'/g;
+	$quotedValue =~ s/'/''/g;
 	$updateQuery .= "'$quotedValue'";
 	}
       else {
@@ -639,7 +639,7 @@ ($$$$$)
       if(defined $currentValue) {
 	$quotedValue = $currentValue;
 	$quotedValue =~ s/\\/\\\\/g;
-        $quotedValue =~ s/'/\\'/g;
+        $quotedValue =~ s/'/''/g;
 	$updateQuery .= "'$quotedValue'";
       }
       else {
diff --git a/contrib/dbmirror/pending.c b/contrib/dbmirror/pending.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * pending.c
- * $Id: pending.c,v 1.23 2005/10/15 02:49:04 momjian Exp $
- * $PostgreSQL: pgsql/contrib/dbmirror/pending.c,v 1.23 2005/10/15 02:49:04 momjian Exp $
+ * $Id: pending.c,v 1.24 2006/05/19 02:38:47 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/dbmirror/pending.c,v 1.24 2006/05/19 02:38:47 momjian Exp $
  *
  * This file contains a trigger for Postgresql-7.x to record changes to tables
  * to a pending table for mirroring.
@@ -541,7 +541,7 @@ packageData(HeapTuple tTupleData, TupleDesc tTupleDesc, Oid tableOid,
 			}
 			if (*cpUnFormatedPtr == '\\' || *cpUnFormatedPtr == '\'')
 			{
-				*cpFormatedPtr = '\\';
+				*cpFormatedPtr = *cpUnFormatedPtr;
 				cpFormatedPtr++;
 				iUsedDataBlock++;
 			}
diff --git a/contrib/tsearch2/query.c b/contrib/tsearch2/query.c
@@ -748,7 +748,7 @@ infix(INFIX * in, bool first)
 		{
 			if ( t_iseq(op, '\'') )
 			{
-				*(in->cur) = '\\';
+				*(in->cur) = '\'';
 				in->cur++;
 			}
 			COPYCHAR(in->cur,op);
diff --git a/contrib/tsearch2/tsvector.c b/contrib/tsearch2/tsvector.c
@@ -529,7 +529,7 @@ tsvector_out(PG_FUNCTION_ARGS)
 
 				outbuf = (char *) repalloc((void *) outbuf, ++lenbuf);
 				curout = outbuf + pos;
-				*curout++ = '\\';
+				*curout++ = '\'';
 			}
 			while(len--)
 				*curout++ = *curin++;

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`#`
`34`	`34`	`#`
`35`	`35`	`##############################################################################`
`36`		`-# $PostgreSQL: pgsql/contrib/dbmirror/DBMirror.pl,v 1.10 2004/07/02 00:58:09 joe Exp $`
	`36`	`+# $PostgreSQL: pgsql/contrib/dbmirror/DBMirror.pl,v 1.11 2006/05/19 02:38:47 momjian Exp $`
`37`	`37`	`#`
`38`	`38`	`##############################################################################`
`39`	`39`
`@@ -437,7 +437,7 @@ ($$$$$)`
`437`	`437`	`if(defined $recordValues{$column}) {`
`438`	`438`	`my $quotedValue = $recordValues{$column};`
`439`	`439`	`$quotedValue =~ s/\\/\\\\/g;`
`440`		`- $quotedValue =~ s/'/\\'/g;`
	`440`	`+ $quotedValue =~ s/'/''/g;`
`441`	`441`	`$valuesQuery .= "'$quotedValue'";`
`442`	`442`	`}`
`443`	`443`	`else {`
`@@ -617,7 +617,7 @@ ($$$$$)`
`617`	`617`	`if(defined $currentValue ) {`
`618`	`618`	`$quotedValue = $currentValue;`
`619`	`619`	`$quotedValue =~ s/\\/\\\\/g;`
`620`		`- $quotedValue =~ s/'/\\'/g;`
	`620`	`+ $quotedValue =~ s/'/''/g;`
`621`	`621`	`$updateQuery .= "'$quotedValue'";`
`622`	`622`	`}`
`623`	`623`	`else {`
`@@ -639,7 +639,7 @@ ($$$$$)`
`639`	`639`	`if(defined $currentValue) {`
`640`	`640`	`$quotedValue = $currentValue;`
`641`	`641`	`$quotedValue =~ s/\\/\\\\/g;`
`642`		`- $quotedValue =~ s/'/\\'/g;`
	`642`	`+ $quotedValue =~ s/'/''/g;`
`643`	`643`	`$updateQuery .= "'$quotedValue'";`
`644`	`644`	`}`
`645`	`645`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/****************************************************************************`
`2`	`2`	`* pending.c`
`3`		`- * $Id: pending.c,v 1.23 2005/10/15 02:49:04 momjian Exp $`
`4`		`- * $PostgreSQL: pgsql/contrib/dbmirror/pending.c,v 1.23 2005/10/15 02:49:04 momjian Exp $`
	`3`	`+ * $Id: pending.c,v 1.24 2006/05/19 02:38:47 momjian Exp $`
	`4`	`+ * $PostgreSQL: pgsql/contrib/dbmirror/pending.c,v 1.24 2006/05/19 02:38:47 momjian Exp $`
`5`	`5`	`*`
`6`	`6`	`* This file contains a trigger for Postgresql-7.x to record changes to tables`
`7`	`7`	`* to a pending table for mirroring.`
`@@ -541,7 +541,7 @@ packageData(HeapTuple tTupleData, TupleDesc tTupleDesc, Oid tableOid,`
`541`	`541`	`}`
`542`	`542`	`if (cpUnFormatedPtr == '\\' \|\| cpUnFormatedPtr == '\'')`
`543`	`543`	`{`
`544`		`- *cpFormatedPtr = '\\';`
	`544`	`+ cpFormatedPtr = cpUnFormatedPtr;`
`545`	`545`	`cpFormatedPtr++;`
`546`	`546`	`iUsedDataBlock++;`
`547`	`547`	`}`
Original file line number	Diff line number	Diff line change
`@@ -748,7 +748,7 @@ infix(INFIX * in, bool first)`
`748`	`748`	`{`
`749`	`749`	`if ( t_iseq(op, '\'') )`
`750`	`750`	`{`
`751`		`- *(in->cur) = '\\';`
	`751`	`+ *(in->cur) = '\'';`
`752`	`752`	`in->cur++;`
`753`	`753`	`}`
`754`	`754`	`COPYCHAR(in->cur,op);`
Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ tsvector_out(PG_FUNCTION_ARGS)`
`529`	`529`
`530`	`530`	`outbuf = (char ) repalloc((void ) outbuf, ++lenbuf);`
`531`	`531`	`curout = outbuf + pos;`
`532`		`- *curout++ = '\\';`
	`532`	`+ *curout++ = '\'';`
`533`	`533`	`}`
`534`	`534`	`while(len--)`
`535`	`535`	`curout++ = curin++;`