mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-11 19:20:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add a --locale switch to createdb, to ease the creation of databases with

Browse Source 
different locales.  This is just syntactical sweetener over --lc-collate and
--lc-ctype.  Per discussion.

While at it, properly document --lc-ctype and --lc-collate in SGML docs,
which apparently were forgotten (or purposefully ommited?) when they were
created.
This commit is contained in:
Alvaro Herrera 2008-11-10 16:25:41 +00:00
parent 2b74d45c1b
commit 6462e7b81c
2 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
doc/src/sgml/ref/createdb.sgml
View File

@ -1,5 +1,5 @@
<!--
$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.47 2007/12/11 19:57:32 tgl Exp $
$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.48 2008/11/10 16:25:41 alvherre Exp $
PostgreSQL documentation
-->
@ -106,6 +106,35 @@ PostgreSQL documentation
</listitem>
</varlistentry>
<varlistentry>
<term><option>-l <replaceable class="parameter">locale</replaceable></></term>
<term><option>--locale <replaceable class="parameter">locale</replaceable></></term>
<listitem>
<para>
Specifies the locale to be used in this database. This is equivalent
to specifying both <option>--lc-collate</option> and <option>--lc-ctype</option>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--lc-collate <replaceable class="parameter">locale</replaceable></></term>
<listitem>
<para>
Specifies the LC_COLLATE setting to be used in this database.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--lc-ctype <replaceable class="parameter">locale</replaceable></></term>
<listitem>
<para>
Specifies the LC_CTYPE setting to be used in this database.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-E <replaceable class="parameter">encoding</replaceable></></term>
<term><option>--encoding <replaceable class="parameter">encoding</replaceable></></term>
@ -142,7 +171,7 @@ PostgreSQL documentation
</para>
<para>
The options <option>-D</option>, <option>-E</option>,
The options <option>-D</option>, <option>-E</option>, <option>-l</option>,
<option>-O</option>, and
<option>-T</option> correspond to options of the underlying
SQL command <xref linkend="SQL-CREATEDATABASE"

28
src/bin/scripts/createdb.c
View File

@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.27 2008/09/23 09:20:38 heikki Exp $
* $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.28 2008/11/10 16:25:41 alvherre Exp $
*
*-------------------------------------------------------------------------
*/
@ -34,6 +34,7 @@ main(int argc, char *argv[])
{"encoding", required_argument, NULL, 'E'},
{"lc-collate", required_argument, NULL, 1},
{"lc-ctype", required_argument, NULL, 2},
{"locale", required_argument, NULL, 'l'},
{NULL, 0, NULL, 0}
};
@ -54,6 +55,7 @@ main(int argc, char *argv[])
char *encoding = NULL;
char *lc_collate = NULL;
char *lc_ctype = NULL;
char *locale = NULL;
PQExpBufferData sql;
@ -65,7 +67,7 @@ main(int argc, char *argv[])
handle_help_version_opts(argc, argv, "createdb", help);
while ((c = getopt_long(argc, argv, "h:p:U:WeqO:D:T:E:", long_options, &optindex)) != -1)
while ((c = getopt_long(argc, argv, "h:p:U:WeqO:D:T:E:l:", long_options, &optindex)) != -1)
{
switch (c)
{
@ -105,6 +107,9 @@ main(int argc, char *argv[])
case 2:
lc_ctype = optarg;
break;
case 'l':
locale = optarg;
break;
default:
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
@ -129,6 +134,24 @@ main(int argc, char *argv[])
exit(1);
}
if (locale)
{
if (lc_ctype)
{
fprintf(stderr, _("%s: only one of --locale and --lc-ctype can be specified\n"),
progname);
exit(1);
}
if (lc_collate)
{
fprintf(stderr, _("%s: only one of --locale and --lc-collate can be specified\n"),
progname);
exit(1);
}
lc_ctype = locale;
lc_collate = locale;
}
if (encoding)
{
if (pg_char_to_encoding(encoding) < 0)
@ -224,6 +247,7 @@ help(const char *progname)
printf(_("\nOptions:\n"));
printf(_(" -D, --tablespace=TABLESPACE default tablespace for the database\n"));
printf(_(" -E, --encoding=ENCODING encoding for the database\n"));
printf(_(" -l, --locale=LOCALE locale settings for the database\n"));
printf(_(" --lc-collate=LOCALE LC_COLLATE setting for the database\n"));
printf(_(" --lc-ctype=LOCALE LC_CTYPE setting for the database\n"));
printf(_(" -O, --owner=OWNER database user to own the new database\n"));