diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2009-04-06 08:42:53 +0000 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2009-04-06 08:42:53 +0000 |
| commit | 1eef90d0a21167c4043c7d8cacaa0e937c9eb8e8 (patch) | |
| tree | e638cb48d3ec22453585250506b051e4d82436c0 /src/bin/pg_dump | |
| parent | f2110a757d0bdca766fa1b8562c7dcb1a53fd422 (diff) | |
| download | postgresql-1eef90d0a21167c4043c7d8cacaa0e937c9eb8e8.tar.gz postgresql-1eef90d0a21167c4043c7d8cacaa0e937c9eb8e8.zip | |
Rename the new CREATE DATABASE options to set collation and ctype into
LC_COLLATE and LC_CTYPE, per discussion on pgsql-hackers.
Diffstat (limited to 'src/bin/pg_dump')
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 6 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_dumpall.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 7e4e7381fc6..f67002bd4ff 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -12,7 +12,7 @@ * by PostgreSQL * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.533 2009/04/05 04:19:58 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.534 2009/04/06 08:42:53 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -1716,12 +1716,12 @@ dumpDatabase(Archive *AH) } if (strlen(collate) > 0) { - appendPQExpBuffer(creaQry, " COLLATE = "); + appendPQExpBuffer(creaQry, " LC_COLLATE = "); appendStringLiteralAH(creaQry, collate, AH); } if (strlen(ctype) > 0) { - appendPQExpBuffer(creaQry, " CTYPE = "); + appendPQExpBuffer(creaQry, " LC_CTYPE = "); appendStringLiteralAH(creaQry, ctype, AH); } if (strlen(tablespace) > 0 && strcmp(tablespace, "pg_default") != 0) diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 949f9cd0f34..019c6411352 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.121 2009/04/05 04:19:58 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.122 2009/04/06 08:42:53 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -1048,13 +1048,13 @@ dumpCreateDB(PGconn *conn) if (strlen(dbcollate) != 0) { - appendPQExpBuffer(buf, " COLLATE = "); + appendPQExpBuffer(buf, " LC_COLLATE = "); appendStringLiteralConn(buf, dbcollate, conn); } if (strlen(dbctype) != 0) { - appendPQExpBuffer(buf, " CTYPE = "); + appendPQExpBuffer(buf, " LC_CTYPE = "); appendStringLiteralConn(buf, dbctype, conn); } |