From fca46f31942e973030b1ae2248e1d693bec249cb Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 30 Dec 2025 14:41:34 -0500 Subject: [PATCH v1 1/4] Force standard_conforming_strings to always be ON. Continuing to support this backwards-compatibility feature has nontrivial costs; in particular it is potentially a security hazard if an application somehow gets confused about which setting the server is using. We changed the default to ON fifteen years ago, which seems like enough time for applications to have adapted. Let's remove support for the legacy string syntax. We should not remove the GUC altogether, since client-side code will still test it, pg_dump scripts will attempt to set it to ON, etc. Instead, just prevent it from being set to OFF. There is precedent for this approach (see commit de66987ad). This initial patch locks down the setting to be ON, updates the documentation, and cleans up regression tests that now fail. Later patches will remove now-dead code and address some other loose ends such as what to do with escape_string_warning. Author: Tom Lane Discussion: https://postgr.es/m/3279216.1767072538@sss.pgh.pa.us --- contrib/pg_trgm/expected/pg_trgm.out | 3 - contrib/pg_trgm/sql/pg_trgm.sql | 4 - doc/src/sgml/config.sgml | 40 +++---- doc/src/sgml/ecpg.sgml | 4 +- doc/src/sgml/func/func-matching.sgml | 16 --- doc/src/sgml/hstore.sgml | 4 +- doc/src/sgml/libpq.sgml | 18 +-- doc/src/sgml/protocol.sgml | 3 +- doc/src/sgml/syntax.sgml | 35 ------ src/backend/commands/variable.c | 15 +++ src/backend/utils/misc/guc_parameters.dat | 8 +- src/backend/utils/misc/postgresql.conf.sample | 1 - src/include/utils/guc_hooks.h | 2 + src/interfaces/ecpg/test/expected/sql-quote.c | 90 ++++----------- .../ecpg/test/expected/sql-quote.stderr | 107 +++++------------- .../ecpg/test/expected/sql-quote.stdout | 3 - src/interfaces/ecpg/test/expected/sql-show.c | 2 +- .../ecpg/test/expected/sql-show.stderr | 4 +- .../ecpg/test/expected/sql-show.stdout | 2 +- src/interfaces/ecpg/test/sql/quote.pgc | 10 -- src/interfaces/ecpg/test/sql/show.pgc | 2 +- src/test/examples/testlibpq3.c | 1 - src/test/examples/testlibpq3.sql | 1 - .../test_regex/expected/test_regex.out | 1 - .../test_regex/expected/test_regex_utf8.out | 1 - .../modules/test_regex/sql/test_regex.sql | 2 - .../test_regex/sql/test_regex_utf8.sql | 2 - src/test/regress/expected/plpgsql.out | 45 -------- src/test/regress/expected/regex.out | 2 - src/test/regress/expected/strings.out | 94 +-------------- src/test/regress/sql/plpgsql.sql | 22 ---- src/test/regress/sql/regex.sql | 3 - src/test/regress/sql/strings.sql | 31 +---- src/tutorial/syscat.source | 7 +- 34 files changed, 112 insertions(+), 473 deletions(-) diff --git a/contrib/pg_trgm/expected/pg_trgm.out b/contrib/pg_trgm/expected/pg_trgm.out index 04da98170ab..612625f1fda 100644 --- a/contrib/pg_trgm/expected/pg_trgm.out +++ b/contrib/pg_trgm/expected/pg_trgm.out @@ -7,9 +7,6 @@ WHERE opc.oid >= 16384 AND NOT amvalidate(opc.oid); --------+--------- (0 rows) ---backslash is used in tests below, installcheck will fail if ---standard_conforming_string is off -set standard_conforming_strings=on; -- reduce noise set extra_float_digits = 0; select show_trgm(''); diff --git a/contrib/pg_trgm/sql/pg_trgm.sql b/contrib/pg_trgm/sql/pg_trgm.sql index 44debced6d5..49db86caf7d 100644 --- a/contrib/pg_trgm/sql/pg_trgm.sql +++ b/contrib/pg_trgm/sql/pg_trgm.sql @@ -5,10 +5,6 @@ SELECT amname, opcname FROM pg_opclass opc LEFT JOIN pg_am am ON am.oid = opcmethod WHERE opc.oid >= 16384 AND NOT amvalidate(opc.oid); ---backslash is used in tests below, installcheck will fail if ---standard_conforming_string is off -set standard_conforming_strings=on; - -- reduce noise set extra_float_digits = 0; diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index cdfe8e376f0..9ca6b73aa8b 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -11388,8 +11388,9 @@ dynamic_library_path = '/usr/local/lib/postgresql:$libdir' - This controls whether a quote mark can be represented by - \' in a string literal. The preferred, SQL-standard way + This parameter controls whether a quote mark can be represented by + \' in the escape string syntax + (E'...'). The preferred, SQL-standard way to represent a quote mark is by doubling it ('') but PostgreSQL has historically also accepted \'. However, use of \' creates security risks @@ -11408,10 +11409,9 @@ dynamic_library_path = '/usr/local/lib/postgresql:$libdir' - Note that in a standard-conforming string literal, \ just - means \ anyway. This parameter only affects the handling of - non-standard-conforming literals, including - escape string syntax (E'...'). + Note that in an ordinary string literal, \ just + means \ anyway. This parameter only affects + the handling of escape string syntax. @@ -11425,17 +11425,8 @@ dynamic_library_path = '/usr/local/lib/postgresql:$libdir' - When on, a warning is issued if a backslash (\) - appears in an ordinary string literal ('...' - syntax) and standard_conforming_strings is off. - The default is on. - - - Applications that wish to use backslash as escape should be - modified to use escape string syntax (E'...'), - because the default behavior of ordinary strings is now to treat - backslash as an ordinary character, per SQL standard. This variable - can be enabled to help locate code that needs to be changed. + This parameter no longer does anything, because + standard_conforming_strings cannot be turned off. @@ -11491,15 +11482,12 @@ dynamic_library_path = '/usr/local/lib/postgresql:$libdir' - This controls whether ordinary string literals - ('...') treat backslashes literally, as specified in - the SQL standard. - Beginning in PostgreSQL 9.1, the default is - on (prior releases defaulted to off). - Applications can check this - parameter to determine how string literals will be processed. - The presence of this parameter can also be taken as an indication - that the escape string syntax (E'...') is supported. + Beginning in PostgreSQL 19, this + parameter is always on. String literals are + always parsed as specified in the SQL standard (that is, + backslashes are ordinary characters within a string literal). + This parameter continues to exist because applications may consult + it; but it cannot be set to off. Escape string syntax () should be used if an application desires backslashes to be treated as escape characters. diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index e6e3a82905c..6203b2518cf 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -75,9 +75,7 @@ EXEC SQL ...; Embedded SQL statements likewise use SQL rules, not C rules, for parsing quoted strings and identifiers. (See and - respectively. Note that - ECPG assumes that standard_conforming_strings - is on.) + respectively.) Of course, the C part of the program follows C quoting rules. diff --git a/doc/src/sgml/func/func-matching.sgml b/doc/src/sgml/func/func-matching.sgml index f466860ddb0..b159137f93a 100644 --- a/doc/src/sgml/func/func-matching.sgml +++ b/doc/src/sgml/func/func-matching.sgml @@ -152,14 +152,6 @@ character itself, write two escape characters. - - - If you have turned off, - any backslashes you write in literal string constants will need to be - doubled. See for more information. - - - It's also possible to select no escape character by writing ESCAPE ''. This effectively disables the @@ -1156,14 +1148,6 @@ regexp_substr('ABCDEFGHI', '(c..)(...)', 1, 1, 'i', 2) An RE cannot end with a backslash (\). - - - If you have turned off, - any backslashes you write in literal string constants will need to be - doubled. See for more information. - - - Regular Expression Quantifiers diff --git a/doc/src/sgml/hstore.sgml b/doc/src/sgml/hstore.sgml index 5f8d1d1ff43..780ee224dce 100644 --- a/doc/src/sgml/hstore.sgml +++ b/doc/src/sgml/hstore.sgml @@ -73,9 +73,7 @@ key => NULL applies before any required quoting or escaping. If you are passing an hstore literal via a parameter, then no additional processing is needed. But if you're passing it as a quoted literal - constant, then any single-quote characters and (depending on the setting of - the standard_conforming_strings configuration parameter) - backslash characters need to be escaped correctly. See + constant, then any single-quote characters need to be escaped correctly. See for more on the handling of string constants. diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 7d05938feda..88d2a5f96c9 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -2889,18 +2889,13 @@ const char *PQparameterStatus(const PGconn *conn, const char *paramName); before 16; search_path was not reported by releases before 18.) Note that - server_version, - server_encoding and - integer_datetimes + server_version and + server_encoding cannot change after startup. - - - - If no value for standard_conforming_strings is reported, - applications can assume it is off, that is, backslashes - are treated as escapes in string literals. Also, the presence of - this parameter can be taken as an indication that the escape string - syntax (E'...') is accepted. + Also, integer_datetimes is + always on in releases 9.5 and later, + and standard_conforming_strings is + always on in releases 19 and later. @@ -11108,7 +11103,6 @@ main(int argc, char **argv) * * CREATE SCHEMA testlibpq3; * SET search_path = testlibpq3; - * SET standard_conforming_strings = ON; * CREATE TABLE test1 (i int4, t text, b bytea); * INSERT INTO test1 values (1, 'joe''s place', '\000\001\002\003\004'); * INSERT INTO test1 values (2, 'ho there', '\004\003\002\001\000'); diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index 41c5954a424..a2b528c481e 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -3040,8 +3040,7 @@ psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;" Sets the label of the backup. If none is specified, a backup label of base backup will be used. The quoting rules - for the label are the same as a standard SQL string with - turned on. + for the label are the same as for a standard SQL string. diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml index 34c83880a66..67482996861 100644 --- a/doc/src/sgml/syntax.sgml +++ b/doc/src/sgml/syntax.sgml @@ -438,30 +438,6 @@ SELECT 'foo' 'bar'; will check that the character conversion is possible. - - - If the configuration parameter - is off, - then PostgreSQL recognizes backslash escapes - in both regular and escape string constants. However, as of - PostgreSQL 9.1, the default is on, meaning - that backslash escapes are recognized only in escape string constants. - This behavior is more standards-compliant, but might break applications - which rely on the historical behavior, where backslash escapes - were always recognized. As a workaround, you can set this parameter - to off, but it is better to migrate away from using backslash - escapes. If you need to use a backslash escape to represent a special - character, write the string constant with an E. - - - - In addition to standard_conforming_strings, the configuration - parameters and - govern treatment of backslashes - in string constants. - - - The character with the code zero cannot be in a string constant. @@ -532,17 +508,6 @@ U&'d!0061t!+000061' UESCAPE '!' by one of these escape sequences is converted to the actual server encoding; an error is reported if that's not possible. - - - Also, the Unicode escape syntax for string constants only works - when the configuration - parameter is - turned on. This is because otherwise this syntax could confuse - clients that parse the SQL statements to the point that it could - lead to SQL injections and similar security issues. If the - parameter is set to off, this syntax will be rejected with an - error message. - diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 608f10d9412..462bd9d2265 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -1257,3 +1257,18 @@ check_ssl(bool *newval, void **extra, GucSource source) #endif return true; } + +bool +check_standard_conforming_strings(bool *newval, void **extra, GucSource source) +{ + if (!*newval) + { + /* check the GUC's definition for an explanation */ + GUC_check_errcode(ERRCODE_FEATURE_NOT_SUPPORTED); + GUC_check_errmsg("non-standard string literals are not supported"); + + return false; + } + + return true; +} diff --git a/src/backend/utils/misc/guc_parameters.dat b/src/backend/utils/misc/guc_parameters.dat index ac0c7c36c56..7f23186506a 100644 --- a/src/backend/utils/misc/guc_parameters.dat +++ b/src/backend/utils/misc/guc_parameters.dat @@ -2759,11 +2759,15 @@ boot_val => '""', }, +# We removed support for non-conforming string literals in PostgreSQL 19, +# but this parameter must be kept indefinitely, since client code might +# consult it or attempt to set it. We allow it to be explicitly set to true. { name => 'standard_conforming_strings', type => 'bool', context => 'PGC_USERSET', group => 'COMPAT_OPTIONS_PREVIOUS', - short_desc => 'Causes \'...\' strings to treat backslashes literally.', - flags => 'GUC_REPORT', + short_desc => 'Nonstandard strings are no longer supported; this can only be true.', + flags => 'GUC_REPORT | GUC_NOT_IN_SAMPLE', variable => 'standard_conforming_strings', boot_val => 'true', + check_hook => 'check_standard_conforming_strings', }, { name => 'statement_timeout', type => 'int', context => 'PGC_USERSET', group => 'CLIENT_CONN_STATEMENT', diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index dc9e2255f8a..ec356f62ad1 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -850,7 +850,6 @@ #escape_string_warning = on #lo_compat_privileges = off #quote_all_identifiers = off -#standard_conforming_strings = on #synchronize_seqscans = on # - Other Platforms and Clients - diff --git a/src/include/utils/guc_hooks.h b/src/include/utils/guc_hooks.h index fbe0b1e2e3d..41a32dcd263 100644 --- a/src/include/utils/guc_hooks.h +++ b/src/include/utils/guc_hooks.h @@ -134,6 +134,8 @@ extern void assign_session_replication_role(int newval, void *extra); extern void assign_stats_fetch_consistency(int newval, void *extra); extern bool check_ssl(bool *newval, void **extra, GucSource source); extern bool check_stage_log_stats(bool *newval, void **extra, GucSource source); +extern bool check_standard_conforming_strings(bool *newval, void **extra, + GucSource source); extern bool check_subtrans_buffers(int *newval, void **extra, GucSource source); extern bool check_synchronous_standby_names(char **newval, void **extra, diff --git a/src/interfaces/ecpg/test/expected/sql-quote.c b/src/interfaces/ecpg/test/expected/sql-quote.c index 05841bd6999..ddc1e90b1c3 100644 --- a/src/interfaces/ecpg/test/expected/sql-quote.c +++ b/src/interfaces/ecpg/test/expected/sql-quote.c @@ -61,7 +61,7 @@ if (sqlca.sqlcode < 0) exit (1);} #line 20 "quote.pgc" - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set standard_conforming_strings to off", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set standard_conforming_strings to on", ECPGt_EOIT, ECPGt_EORT); #line 22 "quote.pgc" if (sqlca.sqlwarn[0] == 'W') sqlprint(); @@ -84,8 +84,8 @@ if (sqlca.sqlcode < 0) exit (1);} printf("Standard conforming strings: %s\n", var); - /* this is a\\b actually */ - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 1 , 'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT); + /* this is a\\\\b actually */ + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 2 , 'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT); #line 28 "quote.pgc" if (sqlca.sqlwarn[0] == 'W') sqlprint(); @@ -95,7 +95,7 @@ if (sqlca.sqlcode < 0) exit (1);} #line 28 "quote.pgc" /* this is a\\b */ - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 1 , E'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 2 , E'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT); #line 30 "quote.pgc" if (sqlca.sqlwarn[0] == 'W') sqlprint(); @@ -105,7 +105,7 @@ if (sqlca.sqlcode < 0) exit (1);} #line 30 "quote.pgc" - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set standard_conforming_strings to on", ECPGt_EOIT, ECPGt_EORT); + { ECPGtrans(__LINE__, NULL, "begin"); #line 32 "quote.pgc" if (sqlca.sqlwarn[0] == 'W') sqlprint(); @@ -114,66 +114,22 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint(); if (sqlca.sqlcode < 0) exit (1);} #line 32 "quote.pgc" - - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "show standard_conforming_strings", ECPGt_EOIT, - ECPGt_char,(var),(long)25,(long)1,(25)*sizeof(char), - ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); -#line 34 "quote.pgc" - -if (sqlca.sqlwarn[0] == 'W') sqlprint(); -#line 34 "quote.pgc" - -if (sqlca.sqlcode < 0) exit (1);} -#line 34 "quote.pgc" - - printf("Standard conforming strings: %s\n", var); - - /* this is a\\\\b actually */ - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 2 , 'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT); -#line 38 "quote.pgc" - -if (sqlca.sqlwarn[0] == 'W') sqlprint(); -#line 38 "quote.pgc" - -if (sqlca.sqlcode < 0) exit (1);} -#line 38 "quote.pgc" - - /* this is a\\b */ - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into \"My_Table\" values ( 2 , E'a\\\\\\\\b' )", ECPGt_EOIT, ECPGt_EORT); -#line 40 "quote.pgc" - -if (sqlca.sqlwarn[0] == 'W') sqlprint(); -#line 40 "quote.pgc" - -if (sqlca.sqlcode < 0) exit (1);} -#line 40 "quote.pgc" - - - { ECPGtrans(__LINE__, NULL, "begin"); -#line 42 "quote.pgc" - -if (sqlca.sqlwarn[0] == 'W') sqlprint(); -#line 42 "quote.pgc" - -if (sqlca.sqlcode < 0) exit (1);} -#line 42 "quote.pgc" - /* declare C cursor for select * from \"My_Table\" */ -#line 43 "quote.pgc" +#line 33 "quote.pgc" { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare C cursor for select * from \"My_Table\"", ECPGt_EOIT, ECPGt_EORT); -#line 45 "quote.pgc" +#line 35 "quote.pgc" if (sqlca.sqlwarn[0] == 'W') sqlprint(); -#line 45 "quote.pgc" +#line 35 "quote.pgc" if (sqlca.sqlcode < 0) exit (1);} -#line 45 "quote.pgc" +#line 35 "quote.pgc" /* exec sql whenever not found break ; */ -#line 47 "quote.pgc" +#line 37 "quote.pgc" for (loopcount = 0; loopcount < 100; loopcount++) @@ -183,47 +139,47 @@ if (sqlca.sqlcode < 0) exit (1);} ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_char,(var),(long)25,(long)1,(25)*sizeof(char), ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); -#line 51 "quote.pgc" +#line 41 "quote.pgc" if (sqlca.sqlcode == ECPG_NOT_FOUND) break; -#line 51 "quote.pgc" +#line 41 "quote.pgc" if (sqlca.sqlwarn[0] == 'W') sqlprint(); -#line 51 "quote.pgc" +#line 41 "quote.pgc" if (sqlca.sqlcode < 0) exit (1);} -#line 51 "quote.pgc" +#line 41 "quote.pgc" printf("value: %d %s\n", i, var); } { ECPGtrans(__LINE__, NULL, "rollback"); -#line 55 "quote.pgc" +#line 45 "quote.pgc" if (sqlca.sqlwarn[0] == 'W') sqlprint(); -#line 55 "quote.pgc" +#line 45 "quote.pgc" if (sqlca.sqlcode < 0) exit (1);} -#line 55 "quote.pgc" +#line 45 "quote.pgc" { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table \"My_Table\"", ECPGt_EOIT, ECPGt_EORT); -#line 56 "quote.pgc" +#line 46 "quote.pgc" if (sqlca.sqlwarn[0] == 'W') sqlprint(); -#line 56 "quote.pgc" +#line 46 "quote.pgc" if (sqlca.sqlcode < 0) exit (1);} -#line 56 "quote.pgc" +#line 46 "quote.pgc" { ECPGdisconnect(__LINE__, "ALL"); -#line 58 "quote.pgc" +#line 48 "quote.pgc" if (sqlca.sqlwarn[0] == 'W') sqlprint(); -#line 58 "quote.pgc" +#line 48 "quote.pgc" if (sqlca.sqlcode < 0) exit (1);} -#line 58 "quote.pgc" +#line 48 "quote.pgc" return 0; diff --git a/src/interfaces/ecpg/test/expected/sql-quote.stderr b/src/interfaces/ecpg/test/expected/sql-quote.stderr index 3df8702a8a6..5f5bfb8133a 100644 --- a/src/interfaces/ecpg/test/expected/sql-quote.stderr +++ b/src/interfaces/ecpg/test/expected/sql-quote.stderr @@ -10,7 +10,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_process_output on line 20: OK: CREATE TABLE [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 22: query: set standard_conforming_strings to off; with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 22: query: set standard_conforming_strings to on; with 0 parameter(s) on connection ecpg1_regression [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 22: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 @@ -22,114 +22,63 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_process_output on line 24: correctly got 1 tuples with 1 fields [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_get_data on line 24: RESULT: off offset: -1; array: no +[NO_PID]: ecpg_get_data on line 24: RESULT: on offset: -1; array: no [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 28: query: insert into "My_Table" values ( 1 , 'a\\\\b' ); with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 28: query: insert into "My_Table" values ( 2 , 'a\\\\b' ); with 0 parameter(s) on connection ecpg1_regression [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGnoticeReceiver: nonstandard use of \\ in a string literal -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: raising sqlcode 0 -[NO_PID]: sqlca: code: 0, state: 22P06 [NO_PID]: ecpg_execute on line 28: using PQexec -[NO_PID]: sqlca: code: 0, state: 22P06 +[NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_process_output on line 28: OK: INSERT 0 1 -[NO_PID]: sqlca: code: 0, state: 22P06 -SQL error: nonstandard use of \\ in a string literal -[NO_PID]: ecpg_execute on line 30: query: insert into "My_Table" values ( 1 , E'a\\\\b' ); with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: sqlca: code: 0, state: 00000 +[NO_PID]: ecpg_execute on line 30: query: insert into "My_Table" values ( 2 , E'a\\\\b' ); with 0 parameter(s) on connection ecpg1_regression [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 30: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_process_output on line 30: OK: INSERT 0 1 [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 32: query: set standard_conforming_strings to on; with 0 parameter(s) on connection ecpg1_regression -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 32: using PQexec -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_process_output on line 32: OK: SET -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 34: query: show standard_conforming_strings; with 0 parameter(s) on connection ecpg1_regression -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 34: using PQexec -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_process_output on line 34: correctly got 1 tuples with 1 fields -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_get_data on line 34: RESULT: on offset: -1; array: no -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 38: query: insert into "My_Table" values ( 2 , 'a\\\\b' ); with 0 parameter(s) on connection ecpg1_regression -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 38: using PQexec -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_process_output on line 38: OK: INSERT 0 1 -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 40: query: insert into "My_Table" values ( 2 , E'a\\\\b' ); with 0 parameter(s) on connection ecpg1_regression -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 40: using PQexec -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_process_output on line 40: OK: INSERT 0 1 -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ECPGtrans on line 42: action "begin"; connection "ecpg1_regression" -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 45: query: declare C cursor for select * from "My_Table"; with 0 parameter(s) on connection ecpg1_regression -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 45: using PQexec -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_process_output on line 45: OK: DECLARE CURSOR -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 51: query: fetch C; with 0 parameter(s) on connection ecpg1_regression -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 51: using PQexec -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_process_output on line 51: correctly got 1 tuples with 2 fields -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_get_data on line 51: RESULT: 1 offset: -1; array: no -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_get_data on line 51: RESULT: a\\b offset: -1; array: no -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 51: query: fetch C; with 0 parameter(s) on connection ecpg1_regression -[NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 51: using PQexec +[NO_PID]: ECPGtrans on line 32: action "begin"; connection "ecpg1_regression" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_process_output on line 51: correctly got 1 tuples with 2 fields +[NO_PID]: ecpg_execute on line 35: query: declare C cursor for select * from "My_Table"; with 0 parameter(s) on connection ecpg1_regression [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_get_data on line 51: RESULT: 1 offset: -1; array: no +[NO_PID]: ecpg_execute on line 35: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_get_data on line 51: RESULT: a\\b offset: -1; array: no +[NO_PID]: ecpg_process_output on line 35: OK: DECLARE CURSOR [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 51: query: fetch C; with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 41: query: fetch C; with 0 parameter(s) on connection ecpg1_regression [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 51: using PQexec +[NO_PID]: ecpg_execute on line 41: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_process_output on line 51: correctly got 1 tuples with 2 fields +[NO_PID]: ecpg_process_output on line 41: correctly got 1 tuples with 2 fields [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_get_data on line 51: RESULT: 2 offset: -1; array: no +[NO_PID]: ecpg_get_data on line 41: RESULT: 2 offset: -1; array: no [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_get_data on line 51: RESULT: a\\\\b offset: -1; array: no +[NO_PID]: ecpg_get_data on line 41: RESULT: a\\\\b offset: -1; array: no [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 51: query: fetch C; with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 41: query: fetch C; with 0 parameter(s) on connection ecpg1_regression [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 51: using PQexec +[NO_PID]: ecpg_execute on line 41: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_process_output on line 51: correctly got 1 tuples with 2 fields +[NO_PID]: ecpg_process_output on line 41: correctly got 1 tuples with 2 fields [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_get_data on line 51: RESULT: 2 offset: -1; array: no +[NO_PID]: ecpg_get_data on line 41: RESULT: 2 offset: -1; array: no [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_get_data on line 51: RESULT: a\\b offset: -1; array: no +[NO_PID]: ecpg_get_data on line 41: RESULT: a\\b offset: -1; array: no [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 51: query: fetch C; with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 41: query: fetch C; with 0 parameter(s) on connection ecpg1_regression [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 51: using PQexec +[NO_PID]: ecpg_execute on line 41: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_process_output on line 51: correctly got 0 tuples with 2 fields +[NO_PID]: ecpg_process_output on line 41: correctly got 0 tuples with 2 fields [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: raising sqlcode 100 on line 51: no data found on line 51 +[NO_PID]: raising sqlcode 100 on line 41: no data found on line 41 [NO_PID]: sqlca: code: 100, state: 02000 -[NO_PID]: ECPGtrans on line 55: action "rollback"; connection "ecpg1_regression" +[NO_PID]: ECPGtrans on line 45: action "rollback"; connection "ecpg1_regression" [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 56: query: drop table "My_Table"; with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 46: query: drop table "My_Table"; with 0 parameter(s) on connection ecpg1_regression [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 56: using PQexec +[NO_PID]: ecpg_execute on line 46: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_process_output on line 56: OK: DROP TABLE +[NO_PID]: ecpg_process_output on line 46: OK: DROP TABLE [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: connection ecpg1_regression closed [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/sql-quote.stdout b/src/interfaces/ecpg/test/expected/sql-quote.stdout index 2f92f994831..31892d5261e 100644 --- a/src/interfaces/ecpg/test/expected/sql-quote.stdout +++ b/src/interfaces/ecpg/test/expected/sql-quote.stdout @@ -1,6 +1,3 @@ -Standard conforming strings: off Standard conforming strings: on -value: 1 a\\b -value: 1 a\\b value: 2 a\\\\b value: 2 a\\b diff --git a/src/interfaces/ecpg/test/expected/sql-show.c b/src/interfaces/ecpg/test/expected/sql-show.c index 1b52d5eaf4e..f934dc99feb 100644 --- a/src/interfaces/ecpg/test/expected/sql-show.c +++ b/src/interfaces/ecpg/test/expected/sql-show.c @@ -90,7 +90,7 @@ if (sqlca.sqlcode < 0) sqlprint();} printf("Var: Search path: %s\n", var); - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set standard_conforming_strings to off", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set standard_conforming_strings to on", ECPGt_EOIT, ECPGt_EORT); #line 26 "show.pgc" if (sqlca.sqlwarn[0] == 'W') sqlprint(); diff --git a/src/interfaces/ecpg/test/expected/sql-show.stderr b/src/interfaces/ecpg/test/expected/sql-show.stderr index c303a845b25..e906abad91e 100644 --- a/src/interfaces/ecpg/test/expected/sql-show.stderr +++ b/src/interfaces/ecpg/test/expected/sql-show.stderr @@ -30,7 +30,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_get_data on line 23: RESULT: public offset: -1; array: no [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_execute on line 26: query: set standard_conforming_strings to off; with 0 parameter(s) on connection ecpg1_regression +[NO_PID]: ecpg_execute on line 26: query: set standard_conforming_strings to on; with 0 parameter(s) on connection ecpg1_regression [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 26: using PQexec [NO_PID]: sqlca: code: 0, state: 00000 @@ -42,7 +42,7 @@ [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_process_output on line 27: correctly got 1 tuples with 1 fields [NO_PID]: sqlca: code: 0, state: 00000 -[NO_PID]: ecpg_get_data on line 27: RESULT: off offset: -1; array: no +[NO_PID]: ecpg_get_data on line 27: RESULT: on offset: -1; array: no [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_execute on line 30: query: set time zone PST8PDT; with 0 parameter(s) on connection ecpg1_regression [NO_PID]: sqlca: code: 0, state: 00000 diff --git a/src/interfaces/ecpg/test/expected/sql-show.stdout b/src/interfaces/ecpg/test/expected/sql-show.stdout index 9319c5d1135..d5628025a0e 100644 --- a/src/interfaces/ecpg/test/expected/sql-show.stdout +++ b/src/interfaces/ecpg/test/expected/sql-show.stdout @@ -1,5 +1,5 @@ Var: Search path: public Var: Search path: public -Var: Standard conforming strings: off +Var: Standard conforming strings: on Time Zone: PST8PDT Transaction isolation level: read committed diff --git a/src/interfaces/ecpg/test/sql/quote.pgc b/src/interfaces/ecpg/test/sql/quote.pgc index 9b62b7da90d..5cf4833d053 100644 --- a/src/interfaces/ecpg/test/sql/quote.pgc +++ b/src/interfaces/ecpg/test/sql/quote.pgc @@ -19,16 +19,6 @@ int main() { EXEC SQL CREATE TABLE "My_Table" ( Item1 int, Item2 text ); - EXEC SQL SET standard_conforming_strings TO off; - - EXEC SQL SHOW standard_conforming_strings INTO :var; - printf("Standard conforming strings: %s\n", var); - - /* this is a\\b actually */ - EXEC SQL INSERT INTO "My_Table" VALUES ( 1, 'a\\\\b' ); - /* this is a\\b */ - EXEC SQL INSERT INTO "My_Table" VALUES ( 1, E'a\\\\b' ); - EXEC SQL SET standard_conforming_strings TO on; EXEC SQL SHOW standard_conforming_strings INTO :var; diff --git a/src/interfaces/ecpg/test/sql/show.pgc b/src/interfaces/ecpg/test/sql/show.pgc index 339678ae994..232b3e77348 100644 --- a/src/interfaces/ecpg/test/sql/show.pgc +++ b/src/interfaces/ecpg/test/sql/show.pgc @@ -23,7 +23,7 @@ int main() { EXEC SQL SHOW search_path INTO :var; printf("Var: Search path: %s\n", var); - EXEC SQL SET standard_conforming_strings TO off; + EXEC SQL SET standard_conforming_strings TO on; EXEC SQL SHOW standard_conforming_strings INTO :var; printf("Var: Standard conforming strings: %s\n", var); diff --git a/src/test/examples/testlibpq3.c b/src/test/examples/testlibpq3.c index 4f7b7913889..cf74865ccb9 100644 --- a/src/test/examples/testlibpq3.c +++ b/src/test/examples/testlibpq3.c @@ -10,7 +10,6 @@ * * CREATE SCHEMA testlibpq3; * SET search_path = testlibpq3; - * SET standard_conforming_strings = ON; * CREATE TABLE test1 (i int4, t text, b bytea); * INSERT INTO test1 values (1, 'joe''s place', '\000\001\002\003\004'); * INSERT INTO test1 values (2, 'ho there', '\004\003\002\001\000'); diff --git a/src/test/examples/testlibpq3.sql b/src/test/examples/testlibpq3.sql index 35a95ca347b..a113849b14b 100644 --- a/src/test/examples/testlibpq3.sql +++ b/src/test/examples/testlibpq3.sql @@ -1,6 +1,5 @@ CREATE SCHEMA testlibpq3; SET search_path = testlibpq3; -SET standard_conforming_strings = ON; CREATE TABLE test1 (i int4, t text, b bytea); INSERT INTO test1 values (1, 'joe''s place', '\000\001\002\003\004'); INSERT INTO test1 values (2, 'ho there', '\004\003\002\001\000'); diff --git a/src/test/modules/test_regex/expected/test_regex.out b/src/test/modules/test_regex/expected/test_regex.out index c44c717edf4..a3d35fc142c 100644 --- a/src/test/modules/test_regex/expected/test_regex.out +++ b/src/test/modules/test_regex/expected/test_regex.out @@ -5,7 +5,6 @@ -- Most commented lines below are copied from reg.test. Each -- test case is followed by an equivalent test using test_regex(). create extension test_regex; -set standard_conforming_strings = on; -- # support functions and preliminary misc. -- # This is sensitive to changes in message wording, but we really have to -- # test the code->message expansion at least once. diff --git a/src/test/modules/test_regex/expected/test_regex_utf8.out b/src/test/modules/test_regex/expected/test_regex_utf8.out index befd75e96f3..329780ef400 100644 --- a/src/test/modules/test_regex/expected/test_regex_utf8.out +++ b/src/test/modules/test_regex/expected/test_regex_utf8.out @@ -8,7 +8,6 @@ SELECT getdatabaseencoding() <> 'UTF8' \quit \endif set client_encoding = utf8; -set standard_conforming_strings = on; -- Run the Tcl test cases that require Unicode -- expectMatch 9.44 EMP* {a[\u00fe-\u0507][\u00ff-\u0300]b} \ -- "a\u0102\u02ffb" "a\u0102\u02ffb" diff --git a/src/test/modules/test_regex/sql/test_regex.sql b/src/test/modules/test_regex/sql/test_regex.sql index b2a847577e8..8f80ce0fe1d 100644 --- a/src/test/modules/test_regex/sql/test_regex.sql +++ b/src/test/modules/test_regex/sql/test_regex.sql @@ -7,8 +7,6 @@ create extension test_regex; -set standard_conforming_strings = on; - -- # support functions and preliminary misc. -- # This is sensitive to changes in message wording, but we really have to -- # test the code->message expansion at least once. diff --git a/src/test/modules/test_regex/sql/test_regex_utf8.sql b/src/test/modules/test_regex/sql/test_regex_utf8.sql index 2aa3e0f1022..1f69f105fd7 100644 --- a/src/test/modules/test_regex/sql/test_regex_utf8.sql +++ b/src/test/modules/test_regex/sql/test_regex_utf8.sql @@ -11,8 +11,6 @@ SELECT getdatabaseencoding() <> 'UTF8' set client_encoding = utf8; -set standard_conforming_strings = on; - -- Run the Tcl test cases that require Unicode diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out index 474be478ce8..b37b2abaf80 100644 --- a/src/test/regress/expected/plpgsql.out +++ b/src/test/regress/expected/plpgsql.out @@ -4576,51 +4576,6 @@ CONTEXT: PL/pgSQL expression "1/0" PL/pgSQL function fail() line 3 at RETURN drop function fail(); -- Test handling of string literals. -set standard_conforming_strings = off; -create or replace function strtest() returns text as $$ -begin - raise notice 'foo\\bar\041baz'; - return 'foo\\bar\041baz'; -end -$$ language plpgsql; -WARNING: nonstandard use of \\ in a string literal -LINE 3: raise notice 'foo\\bar\041baz'; - ^ -HINT: Use the escape string syntax for backslashes, e.g., E'\\'. -WARNING: nonstandard use of \\ in a string literal -LINE 4: return 'foo\\bar\041baz'; - ^ -HINT: Use the escape string syntax for backslashes, e.g., E'\\'. -WARNING: nonstandard use of \\ in a string literal -LINE 4: return 'foo\\bar\041baz'; - ^ -HINT: Use the escape string syntax for backslashes, e.g., E'\\'. -select strtest(); -NOTICE: foo\bar!baz -WARNING: nonstandard use of \\ in a string literal -LINE 1: 'foo\\bar\041baz' - ^ -HINT: Use the escape string syntax for backslashes, e.g., E'\\'. -QUERY: 'foo\\bar\041baz' - strtest -------------- - foo\bar!baz -(1 row) - -create or replace function strtest() returns text as $$ -begin - raise notice E'foo\\bar\041baz'; - return E'foo\\bar\041baz'; -end -$$ language plpgsql; -select strtest(); -NOTICE: foo\bar!baz - strtest -------------- - foo\bar!baz -(1 row) - -set standard_conforming_strings = on; create or replace function strtest() returns text as $$ begin raise notice 'foo\\bar\041baz\'; diff --git a/src/test/regress/expected/regex.out b/src/test/regress/expected/regex.out index ae0de7307db..9fd503ffe78 100644 --- a/src/test/regress/expected/regex.out +++ b/src/test/regress/expected/regex.out @@ -1,8 +1,6 @@ -- -- Regular expression tests -- --- Don't want to have to double backslashes in regexes -set standard_conforming_strings = on; -- Test simple quantified backrefs select 'bbbbb' ~ '^([bc])\1*$' as t; t diff --git a/src/test/regress/expected/strings.out b/src/test/regress/expected/strings.out index 727304f60e7..6eb92bc8442 100644 --- a/src/test/regress/expected/strings.out +++ b/src/test/regress/expected/strings.out @@ -22,7 +22,6 @@ ERROR: syntax error at or near "' - third line'" LINE 3: ' - third line' ^ -- Unicode escapes -SET standard_conforming_strings TO on; SELECT U&'d\0061t\+000061' AS U&"d\0061t\+000061"; data ------ @@ -142,43 +141,12 @@ SELECT E'wrong: \U002FFFFF'; ERROR: invalid Unicode escape value at or near "\U002FFFFF" LINE 1: SELECT E'wrong: \U002FFFFF'; ^ +-- this is no longer allowed: SET standard_conforming_strings TO off; -SELECT U&'d\0061t\+000061' AS U&"d\0061t\+000061"; -ERROR: unsafe use of string constant with Unicode escapes -LINE 1: SELECT U&'d\0061t\+000061' AS U&"d\0061t\+000061"; - ^ -DETAIL: String constants with Unicode escapes cannot be used when "standard_conforming_strings" is off. -SELECT U&'d!0061t\+000061' UESCAPE '!' AS U&"d*0061t\+000061" UESCAPE '*'; -ERROR: unsafe use of string constant with Unicode escapes -LINE 1: SELECT U&'d!0061t\+000061' UESCAPE '!' AS U&"d*0061t\+000061... - ^ -DETAIL: String constants with Unicode escapes cannot be used when "standard_conforming_strings" is off. -SELECT U&' \' UESCAPE '!' AS "tricky"; -ERROR: unsafe use of string constant with Unicode escapes -LINE 1: SELECT U&' \' UESCAPE '!' AS "tricky"; - ^ -DETAIL: String constants with Unicode escapes cannot be used when "standard_conforming_strings" is off. -SELECT 'tricky' AS U&"\" UESCAPE '!'; - \ --------- - tricky -(1 row) - -SELECT U&'wrong: \061'; -ERROR: unsafe use of string constant with Unicode escapes -LINE 1: SELECT U&'wrong: \061'; - ^ -DETAIL: String constants with Unicode escapes cannot be used when "standard_conforming_strings" is off. -SELECT U&'wrong: \+0061'; -ERROR: unsafe use of string constant with Unicode escapes -LINE 1: SELECT U&'wrong: \+0061'; - ^ -DETAIL: String constants with Unicode escapes cannot be used when "standard_conforming_strings" is off. -SELECT U&'wrong: +0061' UESCAPE '+'; -ERROR: unsafe use of string constant with Unicode escapes -LINE 1: SELECT U&'wrong: +0061' UESCAPE '+'; - ^ -DETAIL: String constants with Unicode escapes cannot be used when "standard_conforming_strings" is off. +ERROR: non-standard string literals are not supported +-- but this should be acceptable: +SET standard_conforming_strings TO on; +-- or this: RESET standard_conforming_strings; -- bytea SET bytea_output TO hex; @@ -2872,20 +2840,6 @@ SELECT '\x8000000000000000'::bytea::int8 AS "-9223372036854775808", -- -- test behavior of escape_string_warning and standard_conforming_strings options -- -set escape_string_warning = off; -set standard_conforming_strings = off; -show escape_string_warning; - escape_string_warning ------------------------ - off -(1 row) - -show standard_conforming_strings; - standard_conforming_strings ------------------------------ - off -(1 row) - set escape_string_warning = on; set standard_conforming_strings = on; show escape_string_warning; @@ -2906,37 +2860,6 @@ select 'a\bcd' as f1, 'a\b''cd' as f2, 'a\b''''cd' as f3, 'abcd\' as f4, 'ab\' a\bcd | a\b'cd | a\b''cd | abcd\ | ab\'cd | \\ (1 row) -set standard_conforming_strings = off; -select 'a\\bcd' as f1, 'a\\b\'cd' as f2, 'a\\b\'''cd' as f3, 'abcd\\' as f4, 'ab\\\'cd' as f5, '\\\\' as f6; -WARNING: nonstandard use of \\ in a string literal -LINE 1: select 'a\\bcd' as f1, 'a\\b\'cd' as f2, 'a\\b\'''cd' as f3,... - ^ -HINT: Use the escape string syntax for backslashes, e.g., E'\\'. -WARNING: nonstandard use of \\ in a string literal -LINE 1: select 'a\\bcd' as f1, 'a\\b\'cd' as f2, 'a\\b\'''cd' as f3,... - ^ -HINT: Use the escape string syntax for backslashes, e.g., E'\\'. -WARNING: nonstandard use of \\ in a string literal -LINE 1: select 'a\\bcd' as f1, 'a\\b\'cd' as f2, 'a\\b\'''cd' as f3,... - ^ -HINT: Use the escape string syntax for backslashes, e.g., E'\\'. -WARNING: nonstandard use of \\ in a string literal -LINE 1: ...bcd' as f1, 'a\\b\'cd' as f2, 'a\\b\'''cd' as f3, 'abcd\\' ... - ^ -HINT: Use the escape string syntax for backslashes, e.g., E'\\'. -WARNING: nonstandard use of \\ in a string literal -LINE 1: ...'cd' as f2, 'a\\b\'''cd' as f3, 'abcd\\' as f4, 'ab\\\'cd'... - ^ -HINT: Use the escape string syntax for backslashes, e.g., E'\\'. -WARNING: nonstandard use of \\ in a string literal -LINE 1: ...'''cd' as f3, 'abcd\\' as f4, 'ab\\\'cd' as f5, '\\\\' as ... - ^ -HINT: Use the escape string syntax for backslashes, e.g., E'\\'. - f1 | f2 | f3 | f4 | f5 | f6 --------+--------+---------+-------+--------+---- - a\bcd | a\b'cd | a\b''cd | abcd\ | ab\'cd | \\ -(1 row) - set escape_string_warning = off; set standard_conforming_strings = on; select 'a\bcd' as f1, 'a\b''cd' as f2, 'a\b''''cd' as f3, 'abcd\' as f4, 'ab\''cd' as f5, '\\' as f6; @@ -2945,13 +2868,6 @@ select 'a\bcd' as f1, 'a\b''cd' as f2, 'a\b''''cd' as f3, 'abcd\' as f4, 'ab\' a\bcd | a\b'cd | a\b''cd | abcd\ | ab\'cd | \\ (1 row) -set standard_conforming_strings = off; -select 'a\\bcd' as f1, 'a\\b\'cd' as f2, 'a\\b\'''cd' as f3, 'abcd\\' as f4, 'ab\\\'cd' as f5, '\\\\' as f6; - f1 | f2 | f3 | f4 | f5 | f6 --------+--------+---------+-------+--------+---- - a\bcd | a\b'cd | a\b''cd | abcd\ | ab\'cd | \\ -(1 row) - reset standard_conforming_strings; -- -- Additional string functions diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql index d413d995d17..ae6b67e3e22 100644 --- a/src/test/regress/sql/plpgsql.sql +++ b/src/test/regress/sql/plpgsql.sql @@ -3773,28 +3773,6 @@ drop function fail(); -- Test handling of string literals. -set standard_conforming_strings = off; - -create or replace function strtest() returns text as $$ -begin - raise notice 'foo\\bar\041baz'; - return 'foo\\bar\041baz'; -end -$$ language plpgsql; - -select strtest(); - -create or replace function strtest() returns text as $$ -begin - raise notice E'foo\\bar\041baz'; - return E'foo\\bar\041baz'; -end -$$ language plpgsql; - -select strtest(); - -set standard_conforming_strings = on; - create or replace function strtest() returns text as $$ begin raise notice 'foo\\bar\041baz\'; diff --git a/src/test/regress/sql/regex.sql b/src/test/regress/sql/regex.sql index 56217104ce6..a4f99c1f25f 100644 --- a/src/test/regress/sql/regex.sql +++ b/src/test/regress/sql/regex.sql @@ -2,9 +2,6 @@ -- Regular expression tests -- --- Don't want to have to double backslashes in regexes -set standard_conforming_strings = on; - -- Test simple quantified backrefs select 'bbbbb' ~ '^([bc])\1*$' as t; select 'ccc' ~ '^([bc])\1*$' as t; diff --git a/src/test/regress/sql/strings.sql b/src/test/regress/sql/strings.sql index 88aa4c2983b..531d409542f 100644 --- a/src/test/regress/sql/strings.sql +++ b/src/test/regress/sql/strings.sql @@ -17,8 +17,6 @@ SELECT 'first line' AS "Illegal comment within continuation"; -- Unicode escapes -SET standard_conforming_strings TO on; - SELECT U&'d\0061t\+000061' AS U&"d\0061t\+000061"; SELECT U&'d!0061t\+000061' UESCAPE '!' AS U&"d*0061t\+000061" UESCAPE '*'; SELECT U&'a\\b' AS "a\b"; @@ -50,18 +48,11 @@ SELECT E'wrong: \udb99\u0061'; SELECT E'wrong: \U0000db99\U00000061'; SELECT E'wrong: \U002FFFFF'; +-- this is no longer allowed: SET standard_conforming_strings TO off; - -SELECT U&'d\0061t\+000061' AS U&"d\0061t\+000061"; -SELECT U&'d!0061t\+000061' UESCAPE '!' AS U&"d*0061t\+000061" UESCAPE '*'; - -SELECT U&' \' UESCAPE '!' AS "tricky"; -SELECT 'tricky' AS U&"\" UESCAPE '!'; - -SELECT U&'wrong: \061'; -SELECT U&'wrong: \+0061'; -SELECT U&'wrong: +0061' UESCAPE '+'; - +-- but this should be acceptable: +SET standard_conforming_strings TO on; +-- or this: RESET standard_conforming_strings; -- bytea @@ -917,12 +908,6 @@ SELECT '\x8000000000000000'::bytea::int8 AS "-9223372036854775808", -- -- test behavior of escape_string_warning and standard_conforming_strings options -- -set escape_string_warning = off; -set standard_conforming_strings = off; - -show escape_string_warning; -show standard_conforming_strings; - set escape_string_warning = on; set standard_conforming_strings = on; @@ -931,19 +916,11 @@ show standard_conforming_strings; select 'a\bcd' as f1, 'a\b''cd' as f2, 'a\b''''cd' as f3, 'abcd\' as f4, 'ab\''cd' as f5, '\\' as f6; -set standard_conforming_strings = off; - -select 'a\\bcd' as f1, 'a\\b\'cd' as f2, 'a\\b\'''cd' as f3, 'abcd\\' as f4, 'ab\\\'cd' as f5, '\\\\' as f6; - set escape_string_warning = off; set standard_conforming_strings = on; select 'a\bcd' as f1, 'a\b''cd' as f2, 'a\b''''cd' as f3, 'abcd\' as f4, 'ab\''cd' as f5, '\\' as f6; -set standard_conforming_strings = off; - -select 'a\\bcd' as f1, 'a\\b\'cd' as f2, 'a\\b\'''cd' as f3, 'abcd\\' as f4, 'ab\\\'cd' as f5, '\\\\' as f6; - reset standard_conforming_strings; diff --git a/src/tutorial/syscat.source b/src/tutorial/syscat.source index 21ee574fd9e..15355bed7a9 100644 --- a/src/tutorial/syscat.source +++ b/src/tutorial/syscat.source @@ -17,10 +17,6 @@ -- SET search_path TO pg_catalog; --- The LIKE pattern language requires underscores to be escaped, so make --- sure the backslashes are not misinterpreted. -SET standard_conforming_strings TO on; - -- -- lists the names of all database owners and the name of their database(s) -- @@ -169,7 +165,6 @@ SELECT am.amname, n.nspname, opf.opfname, opr.oprname ORDER BY nspname, amname, opfname, oprname; -- --- Reset the search path and standard_conforming_strings to their defaults +-- Reset the search path to default -- RESET search_path; -RESET standard_conforming_strings; -- 2.43.7