diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2012-04-13 20:37:07 +0300 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2012-04-13 20:37:07 +0300 |
| commit | 64e1309c76aca35e32e62e69fc11e96aadfb2615 (patch) | |
| tree | 9b327ad4dde565b811258766c9efe13bcec3683b /src/backend/commands/dbcommands.c | |
| parent | 7167fcd21bc05e9114b1ededb835c5bc8610a6b0 (diff) | |
| download | postgresql-64e1309c76aca35e32e62e69fc11e96aadfb2615.tar.gz postgresql-64e1309c76aca35e32e62e69fc11e96aadfb2615.zip | |
Consistently quote encoding and locale names in messages
Diffstat (limited to 'src/backend/commands/dbcommands.c')
| -rw-r--r-- | src/backend/commands/dbcommands.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 9721ce9e0a6..90155b9c14b 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -323,12 +323,12 @@ createdb(const CreatedbStmt *stmt) if (!check_locale(LC_COLLATE, dbcollate, &canonname)) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("invalid locale name %s", dbcollate))); + errmsg("invalid locale name: \"%s\"", dbcollate))); dbcollate = canonname; if (!check_locale(LC_CTYPE, dbctype, &canonname)) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("invalid locale name %s", dbctype))); + errmsg("invalid locale name: \"%s\"", dbctype))); dbctype = canonname; check_encoding_locale_matches(encoding, dbcollate, dbctype); @@ -692,10 +692,10 @@ check_encoding_locale_matches(int encoding, const char *collate, const char *cty (encoding == PG_SQL_ASCII && superuser()))) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("encoding %s does not match locale %s", + errmsg("encoding \"%s\" does not match locale \"%s\"", pg_encoding_to_char(encoding), ctype), - errdetail("The chosen LC_CTYPE setting requires encoding %s.", + errdetail("The chosen LC_CTYPE setting requires encoding \"%s\".", pg_encoding_to_char(ctype_encoding)))); if (!(collate_encoding == encoding || @@ -707,10 +707,10 @@ check_encoding_locale_matches(int encoding, const char *collate, const char *cty (encoding == PG_SQL_ASCII && superuser()))) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("encoding %s does not match locale %s", + errmsg("encoding \"%s\" does not match locale \"%s\"", pg_encoding_to_char(encoding), collate), - errdetail("The chosen LC_COLLATE setting requires encoding %s.", + errdetail("The chosen LC_COLLATE setting requires encoding \"%s\".", pg_encoding_to_char(collate_encoding)))); } |