mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
Code review for escape-strings patch. Sync psql and plpgsql lexers
with main, avoid using a SQL-defined SQLSTATE for what is most definitely not a SQL-compatible error condition, fix documentation omissions, adhere to message style guidelines, don't use two GUC_REPORT variables when one is sufficient. Nothing done about pg_dump issues.
This commit is contained in:
@ -10,7 +10,7 @@
|
||||
* Written by Peter Eisentraut <peter_e@gmx.net>.
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.269 2005/06/26 03:03:41 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.270 2005/06/26 19:16:06 tgl Exp $
|
||||
*
|
||||
*--------------------------------------------------------------------
|
||||
*/
|
||||
@ -190,7 +190,6 @@ static int max_index_keys;
|
||||
static int max_identifier_length;
|
||||
static int block_size;
|
||||
static bool integer_datetimes;
|
||||
static bool escape_string_syntax;
|
||||
static bool standard_compliant_strings;
|
||||
|
||||
/* should be static, but commands/variable.c needs to get at it */
|
||||
@ -877,26 +876,16 @@ static struct config_bool ConfigureNamesBool[] =
|
||||
|
||||
{
|
||||
{"escape_string_warning", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
|
||||
gettext_noop("Warn about backslash escapes in ordinary, non-escape-syntax strings."),
|
||||
gettext_noop("Warn about backslash escapes in ordinary string literals."),
|
||||
NULL
|
||||
},
|
||||
&escape_string_warning,
|
||||
false, NULL, NULL
|
||||
},
|
||||
|
||||
{
|
||||
{"escape_string_syntax", PGC_INTERNAL, PRESET_OPTIONS,
|
||||
gettext_noop("Escape string syntax (E'') is supported."),
|
||||
NULL,
|
||||
GUC_REPORT | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
|
||||
},
|
||||
&escape_string_syntax,
|
||||
true, NULL, NULL
|
||||
},
|
||||
|
||||
{
|
||||
{"standard_compliant_strings", PGC_INTERNAL, PRESET_OPTIONS,
|
||||
gettext_noop("'' strings treat backslashes literally."),
|
||||
gettext_noop("'...' strings treat backslashes literally."),
|
||||
NULL,
|
||||
GUC_REPORT | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
|
||||
},
|
||||
|
Reference in New Issue
Block a user