database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

Convert backslash_quote guc to use enum.

Browse Source
This commit is contained in:
Magnus Hagander
2008-04-04 11:47:19 +00:00
parent d672ea6ffa
commit 2288d646a6
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/backend/utils/misc/guc.c
View File

@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.444 2008/04/04 08:33:15 mha Exp $ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.445 2008/04/04 11:47:19 mha Exp $
* *
*-------------------------------------------------------------------- *--------------------------------------------------------------------
*/ */
@ -153,7 +153,6 @@ static bool assign_stage_log_stats(bool newval, bool doit, GucSource source);
static bool assign_log_stats(bool newval, bool doit, GucSource source); static bool assign_log_stats(bool newval, bool doit, GucSource source);
static bool assign_transaction_read_only(bool newval, bool doit, GucSource source); static bool assign_transaction_read_only(bool newval, bool doit, GucSource source);
static const char *assign_canonical_path(const char *newval, bool doit, GucSource source); static const char *assign_canonical_path(const char *newval, bool doit, GucSource source);
static const char *assign_backslash_quote(const char *newval, bool doit, GucSource source);
static const char *assign_timezone_abbreviations(const char *newval, bool doit, GucSource source); static const char *assign_timezone_abbreviations(const char *newval, bool doit, GucSource source);
static const char *show_archive_command(void); static const char *show_archive_command(void);
static bool assign_tcp_keepalives_idle(int newval, bool doit, GucSource source); static bool assign_tcp_keepalives_idle(int newval, bool doit, GucSource source);
@ -253,6 +252,23 @@ static const struct config_enum_entry xmloption_options[] = {
{NULL, 0} {NULL, 0}
}; };
/*
* Although only "on", "off", and "safe_encoding" are documented, we
* accept all the likely variants of "on" and "off".
*/
static const struct config_enum_entry backslash_quote_options[] = {
{"safe_encoding", BACKSLASH_QUOTE_SAFE_ENCODING},
{"on", BACKSLASH_QUOTE_ON},
{"off", BACKSLASH_QUOTE_OFF},
{"true", BACKSLASH_QUOTE_ON},
{"false", BACKSLASH_QUOTE_OFF},
{"yes", BACKSLASH_QUOTE_ON},
{"no", BACKSLASH_QUOTE_OFF},
{"1", BACKSLASH_QUOTE_ON},
{"0", BACKSLASH_QUOTE_OFF},
{NULL, 0}
};
/* /*
* GUC option variables that are exported from this module * GUC option variables that are exported from this module
*/ */
@ -311,7 +327,6 @@ static char *syslog_ident_str;
static bool phony_autocommit; static bool phony_autocommit;
static bool session_auth_is_superuser; static bool session_auth_is_superuser;
static double phony_random_seed; static double phony_random_seed;
static char *backslash_quote_string;
static char *client_encoding_string; static char *client_encoding_string;
static char *datestyle_string; static char *datestyle_string;
static char *locale_collate; static char *locale_collate;
@ -1959,15 +1974,6 @@ static struct config_string ConfigureNamesString[] =
"", NULL, show_archive_command "", NULL, show_archive_command
}, },
{
{"backslash_quote", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
gettext_noop("Sets whether \"\\'\" is allowed in string literals."),
gettext_noop("Valid values are ON, OFF, and SAFE_ENCODING.")
},
&backslash_quote_string,
"safe_encoding", assign_backslash_quote, NULL
},
{ {
{"client_encoding", PGC_USERSET, CLIENT_CONN_LOCALE, {"client_encoding", PGC_USERSET, CLIENT_CONN_LOCALE,
gettext_noop("Sets the client's character set encoding."), gettext_noop("Sets the client's character set encoding."),
@ -2419,6 +2425,15 @@ static struct config_string ConfigureNamesString[] =
static struct config_enum ConfigureNamesEnum[] = static struct config_enum ConfigureNamesEnum[] =
{ {
{
{"backslash_quote", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
gettext_noop("Sets whether \"\\'\" is allowed in string literals."),
gettext_noop("Valid values are ON, OFF, and SAFE_ENCODING.")
},
&backslash_quote,
BACKSLASH_QUOTE_SAFE_ENCODING, backslash_quote_options, NULL, NULL
},
{ {
{"client_min_messages", PGC_USERSET, LOGGING_WHEN, {"client_min_messages", PGC_USERSET, LOGGING_WHEN,
gettext_noop("Sets the message levels that are sent to the client."), gettext_noop("Sets the message levels that are sent to the client."),

4
src/include/parser/gramparse.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/parser/gramparse.h,v 1.40 2008/01/01 19:45:58 momjian Exp $ * $PostgreSQL: pgsql/src/include/parser/gramparse.h,v 1.41 2008/04/04 11:47:19 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,7 +35,7 @@ typedef enum
} BackslashQuoteType; } BackslashQuoteType;
/* GUC variables in scan.l (every one of these is a bad idea :-() */ /* GUC variables in scan.l (every one of these is a bad idea :-() */
extern BackslashQuoteType backslash_quote; extern int backslash_quote;
extern bool escape_string_warning; extern bool escape_string_warning;
extern bool standard_conforming_strings; extern bool standard_conforming_strings;