diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-05-21 19:56:41 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-05-21 19:56:41 +0000 |
| commit | 583a472f7b02b0d2b99462addff060eb551465cf (patch) | |
| tree | 9440b0310a25ef66b865957c861c6eac8e246fee /src/interfaces | |
| parent | 506747337bc94a0f063cf36500e6cf5bc204c5be (diff) | |
Change \' to '', for SQL standards compliance. Backpatch to 7.3, 7.4,
and 8.0. Later releases already patched.
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/ecpg/test/test1.pgc | 2 | ||||
| -rw-r--r-- | src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-exec.c | 4 | ||||
| -rwxr-xr-x | src/interfaces/python/tutorial/func.py | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/interfaces/ecpg/test/test1.pgc b/src/interfaces/ecpg/test/test1.pgc index 78771d944d5..61409419809 100644 --- a/src/interfaces/ecpg/test/test1.pgc +++ b/src/interfaces/ecpg/test/test1.pgc @@ -83,7 +83,7 @@ exec sql end declare section; exec sql execute immediate :command; printf("New tuple got OID = %ld\n", sqlca.sqlerrd[1]); - sprintf(command, "insert into \"Test\" (name, amount, letter) values ('db: \\\'mm\\\'', 2, 't')"); + sprintf(command, "insert into \"Test\" (name, amount, letter) values ('db: ''mm''', 2, 't')"); exec sql execute immediate :command; strcpy(msg, "execute insert 2"); diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java index b7ce0794719..66e4471235e 100644 --- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java +++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java @@ -8,7 +8,7 @@ import java.util.Vector; import org.postgresql.largeobject.*; import org.postgresql.util.*; -/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Statement.java,v 1.12.2.7 2003/08/07 17:56:27 barry Exp $ +/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Statement.java,v 1.12.2.8 2006/05/21 19:56:41 momjian Exp $ * This class defines methods of the jdbc1 specification. This class is * extended by org.postgresql.jdbc2.AbstractJdbc2Statement which adds the jdbc2 * methods. The real Statement class (for jdbc1) is org.postgresql.jdbc1.Jdbc1Statement @@ -936,7 +936,7 @@ public abstract class AbstractJdbc1Statement implements org.postgresql.PGStateme { case '\\': case '\'': - p_output.append('\\'); + p_output.append(c); p_output.append(c); break; case '\0': diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index ae507d30e96..b5dc8de0a87 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.122.2.1 2003/11/30 20:52:37 joe Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.122.2.2 2006/05/21 19:56:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -161,7 +161,7 @@ PQescapeBytea(unsigned char *bintext, size_t binlen, size_t *bytealen) } else if (*vp == '\'') { - rp[0] = '\\'; + rp[0] = '\''; rp[1] = '\''; rp += 2; } diff --git a/src/interfaces/python/tutorial/func.py b/src/interfaces/python/tutorial/func.py index af2b412bdfc..8369071e077 100755 --- a/src/interfaces/python/tutorial/func.py +++ b/src/interfaces/python/tutorial/func.py @@ -120,16 +120,16 @@ def comp_func(pgcnx): print "-- same order as the columns of EMP." print print "CREATE FUNCTION new_emp() RETURNS EMP" - print " AS 'SELECT \'None\'::text AS name," + print " AS 'SELECT ''None''::text AS name," print " 1000 AS salary," print " 25 AS age," - print " \'none\'::varchar(16) AS dept'" + print " ''none''::varchar(16) AS dept'" print " LANGUAGE 'sql'" pgcnx.query("""CREATE FUNCTION new_emp() RETURNS EMP - AS 'SELECT \\\'None\\\'::text AS name, + AS 'SELECT ''None''::text AS name, 1000 AS salary, 25 AS age, - \\\'none\\\'::varchar(16) AS dept' + ''none''::varchar(16) AS dept' LANGUAGE 'sql'""") wait_key() print |