diff options
| author | Teodor Sigaev <teodor@sigaev.ru> | 2009-08-18 10:30:41 +0000 |
|---|---|---|
| committer | Teodor Sigaev <teodor@sigaev.ru> | 2009-08-18 10:30:41 +0000 |
| commit | a88a48011c00b6daa12e170f70b0b34cf9247113 (patch) | |
| tree | c7ad23782b3c2aa3ce19bc04a81c97f394ab58de /src/test | |
| parent | 77dfb64df4c1e7f2662b0199971ff4af289cb00e (diff) | |
| download | postgresql-a88a48011c00b6daa12e170f70b0b34cf9247113.tar.gz postgresql-a88a48011c00b6daa12e170f70b0b34cf9247113.zip | |
Introduce filtering dictionary support to tsearch. Propagate --nolocale option
to CREATE DATABASE command in pg_regress to allow correct checking of
locale-sensitive contrib modules.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/pg_regress.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index a2bc0af1a3e..3f27dbfec17 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.63 2009/06/11 14:49:15 momjian Exp $ + * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.64 2009/08/18 10:30:41 teodor Exp $ * *------------------------------------------------------------------------- */ @@ -1767,9 +1767,11 @@ create_database(const char *dbname) */ header(_("creating database \"%s\""), dbname); if (encoding) - psql_command("postgres", "CREATE DATABASE \"%s\" TEMPLATE=template0 ENCODING='%s'", dbname, encoding); + psql_command("postgres", "CREATE DATABASE \"%s\" TEMPLATE=template0 ENCODING='%s'%s", dbname, encoding, + (nolocale) ? " LC_COLLATE='C' LC_CTYPE='C'" : ""); else - psql_command("postgres", "CREATE DATABASE \"%s\" TEMPLATE=template0", dbname); + psql_command("postgres", "CREATE DATABASE \"%s\" TEMPLATE=template0%s", dbname, + (nolocale) ? " LC_COLLATE='C' LC_CTYPE='C'" : ""); psql_command(dbname, "ALTER DATABASE \"%s\" SET lc_messages TO 'C';" "ALTER DATABASE \"%s\" SET lc_monetary TO 'C';" |