diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-15 19:19:56 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-15 19:19:56 +0000 |
| commit | cfa6999d3b1bdcaa058c90392057a044b0f067e8 (patch) | |
| tree | 90ef7c28ad711dc77543ef3d954528c6949ae000 /src/backend/commands/variable.c | |
| parent | 274328c8a88319f0a16d57c82128ee80ac26e578 (diff) | |
| download | postgresql-cfa6999d3b1bdcaa058c90392057a044b0f067e8.tar.gz postgresql-cfa6999d3b1bdcaa058c90392057a044b0f067e8.zip | |
Cause SHOW DATESTYLE to produce a string that will be accepted by SET
DATESTYLE, for instance 'SQL, European' instead of
'SQL with European conventions'. Per gripe a month or two back from
Barry Lind.
Diffstat (limited to 'src/backend/commands/variable.c')
| -rw-r--r-- | src/backend/commands/variable.c | 40 |
1 files changed, 5 insertions, 35 deletions
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 3dd4724f774..cc32ada4a45 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.79 2003/06/27 19:08:37 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.80 2003/07/15 19:19:56 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -90,7 +90,7 @@ assign_datestyle(const char *value, bool doit, bool interactive) newDateStyle = USE_SQL_DATES; dcnt++; } - else if (strncasecmp(tok, "POSTGRESQL", 8) == 0) + else if (strncasecmp(tok, "POSTGRES", 8) == 0) { newDateStyle = USE_POSTGRES_DATES; dcnt++; @@ -190,13 +190,13 @@ assign_datestyle(const char *value, bool doit, bool interactive) strcpy(result, "SQL"); break; case USE_GERMAN_DATES: - strcpy(result, "GERMAN"); + strcpy(result, "German"); break; default: - strcpy(result, "POSTGRESQL"); + strcpy(result, "Postgres"); break; } - strcat(result, newEuroDates ? ", EURO" : ", US"); + strcat(result, newEuroDates ? ", European" : ", US"); /* * Finally, it's safe to assign to the global variables; the @@ -208,36 +208,6 @@ assign_datestyle(const char *value, bool doit, bool interactive) return result; } -/* - * show_datestyle: GUC show_hook for datestyle - */ -const char * -show_datestyle(void) -{ - static char buf[64]; - - switch (DateStyle) - { - case USE_ISO_DATES: - strcpy(buf, "ISO"); - break; - case USE_SQL_DATES: - strcpy(buf, "SQL"); - break; - case USE_GERMAN_DATES: - strcpy(buf, "German"); - break; - default: - strcpy(buf, "Postgres"); - break; - }; - strcat(buf, " with "); - strcat(buf, ((EuroDates) ? "European" : "US (NonEuropean)")); - strcat(buf, " conventions"); - - return buf; -} - /* * TIMEZONE |