diff options
| author | Tom Lane | 2006-05-11 19:15:36 +0000 |
|---|---|---|
| committer | Tom Lane | 2006-05-11 19:15:36 +0000 |
| commit | 637028afe17b9616d279d13d9fc5d6df1ecf369b (patch) | |
| tree | 1e95735e0563109cd859edf95e268a5287a97aae /src/bin | |
| parent | 3fdeb189e977ebe29ee658592d07930e016dd031 (diff) | |
Code review for standard_conforming_strings patch. Fix it so it does not
throw warnings for 100%-SQL-standard constructs, clean up some minor
infelicities, try to un-break ecpg to the best of my ability. (It's not clear
how ecpg is going to find out the setting of standard_conforming_strings,
though.) I think pg_dump still needs work, too.
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/psql/common.c | 6 | ||||
| -rw-r--r-- | src/bin/psql/psqlscan.l | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index ec0acc156e7..ba8e403dd2a 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.116 2006/03/14 22:48:22 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.117 2006/05/11 19:15:35 tgl Exp $ */ #include "postgres_fe.h" #include "common.h" @@ -1101,8 +1101,8 @@ is_superuser(void) /* * Test if the current session uses standard string literals. * - * Note: this will correctly detect the setting only with a protocol-3.0 - * or newer backend; otherwise it will always say "false". + * Note: With a pre-protocol-3.0 connection this will always say "false", + * which should be the right answer. */ bool standard_strings(void) diff --git a/src/bin/psql/psqlscan.l b/src/bin/psql/psqlscan.l index 6c04aaf30ba..4a344baf6b2 100644 --- a/src/bin/psql/psqlscan.l +++ b/src/bin/psql/psqlscan.l @@ -33,7 +33,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/psql/psqlscan.l,v 1.17 2006/03/06 19:49:20 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/psql/psqlscan.l,v 1.18 2006/05/11 19:15:35 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -467,7 +467,7 @@ other . BEGIN(INITIAL); ECHO; } -<xq,xe>{xqdouble} { +<xq,xe>{xqdouble} { ECHO; } <xq>{xqinside} { |