diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-05-28 21:13:54 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-05-28 21:13:54 +0000 |
| commit | 134b463f027d1113df6f983c3348f165b1ac1ffa (patch) | |
| tree | 7e247256f1fcb5e0e1a4759b854f673366c4478d /src/interfaces/libpq/fe-exec.c | |
| parent | 117d73a9e7af61f6742e3d2b46f1dfbe3e02b9ca (diff) | |
| download | postgresql-134b463f027d1113df6f983c3348f165b1ac1ffa.tar.gz postgresql-134b463f027d1113df6f983c3348f165b1ac1ffa.zip | |
Fix up pg_dump to do string escaping fully correctly for client encoding
and standard_conforming_strings; likewise for the other client programs
that need it. As per previous discussion, a pg_dump dump now conforms
to the standard_conforming_strings setting of the source database.
We don't use E'' syntax in the dump, thereby improving portability of
the SQL. I added a SET escape_strings_warning = off command to keep
the dumps from getting a lot of back-chatter from that.
Diffstat (limited to 'src/interfaces/libpq/fe-exec.c')
| -rw-r--r-- | src/interfaces/libpq/fe-exec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 71ba05fbca6..69da7bc34c5 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.185 2006/05/28 17:23:29 alvherre Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.186 2006/05/28 21:13:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2437,8 +2437,7 @@ PQescapeStringInternal(PGconn *conn, if (!IS_HIGHBIT_SET(c)) { /* Apply quoting if needed */ - if (c == '\'' || - (c == '\\' && !std_strings)) + if (SQL_STR_DOUBLE(c, !std_strings)) *target++ = c; /* Copy the character */ *target++ = c; |