mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-12 18:34:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bruce Momjian 2006-05-19 02:38:47 +00:00
parent 40a95aa25b
commit cc84163fa9
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/dbmirror/DBMirror.pl
View File

@ -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 @@ sub mirrorInsert($$$$$) {
if(defined $recordValues{$column}) { if(defined $recordValues{$column}) {
my $quotedValue = $recordValues{$column}; my $quotedValue = $recordValues{$column};
$quotedValue =~ s/\\/\\\\/g; $quotedValue =~ s/\\/\\\\/g;
$quotedValue =~ s/'/\\'/g; $quotedValue =~ s/'/''/g;
$valuesQuery .= "'$quotedValue'"; $valuesQuery .= "'$quotedValue'";
} }
else { else {
@ -617,7 +617,7 @@ sub mirrorUpdate($$$$$) {
if(defined $currentValue ) { if(defined $currentValue ) {
$quotedValue = $currentValue; $quotedValue = $currentValue;
$quotedValue =~ s/\\/\\\\/g; $quotedValue =~ s/\\/\\\\/g;
$quotedValue =~ s/'/\\'/g; $quotedValue =~ s/'/''/g;
$updateQuery .= "'$quotedValue'"; $updateQuery .= "'$quotedValue'";
} }
else { else {
@ -639,7 +639,7 @@ sub mirrorUpdate($$$$$) {
if(defined $currentValue) { if(defined $currentValue) {
$quotedValue = $currentValue; $quotedValue = $currentValue;
$quotedValue =~ s/\\/\\\\/g; $quotedValue =~ s/\\/\\\\/g;
$quotedValue =~ s/'/\\'/g; $quotedValue =~ s/'/''/g;
$updateQuery .= "'$quotedValue'"; $updateQuery .= "'$quotedValue'";
} }
else { else {

6
contrib/dbmirror/pending.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* pending.c * pending.c
* $Id: 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.23 2005/10/15 02:49:04 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 * This file contains a trigger for Postgresql-7.x to record changes to tables
* to a pending table for mirroring. * to a pending table for mirroring.
@ -541,7 +541,7 @@ packageData(HeapTuple tTupleData, TupleDesc tTupleDesc, Oid tableOid,
} }
if (*cpUnFormatedPtr == '\\' || *cpUnFormatedPtr == '\'') if (*cpUnFormatedPtr == '\\' || *cpUnFormatedPtr == '\'')
{ {
*cpFormatedPtr = '\\'; *cpFormatedPtr = *cpUnFormatedPtr;
cpFormatedPtr++; cpFormatedPtr++;
iUsedDataBlock++; iUsedDataBlock++;
} }

2
contrib/tsearch2/query.c
View File

@ -748,7 +748,7 @@ infix(INFIX * in, bool first)
{ {
if ( t_iseq(op, '\'') ) if ( t_iseq(op, '\'') )
{ {
*(in->cur) = '\\'; *(in->cur) = '\'';
in->cur++; in->cur++;
} }
COPYCHAR(in->cur,op); COPYCHAR(in->cur,op);

2
contrib/tsearch2/tsvector.c
View File

@ -529,7 +529,7 @@ tsvector_out(PG_FUNCTION_ARGS)
outbuf = (char *) repalloc((void *) outbuf, ++lenbuf); outbuf = (char *) repalloc((void *) outbuf, ++lenbuf);
curout = outbuf + pos; curout = outbuf + pos;
*curout++ = '\\'; *curout++ = '\'';
} }
while(len--) while(len--)
*curout++ = *curin++; *curout++ = *curin++;