rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace createdb's obsolete --location switch with --tablespace. 

I kept the same abbreviated letter -D, in hopes of maintaining some
modicum of backwards compatibility (though it's doubtful whether anyone
is really using scripts that invoke createdb -D ...)
This commit is contained in:
Tom Lane 2004-06-18 21:47:24 +00:00
parent 984c8a48f4
commit f7ca71a76b
2 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.39 2004/06/18 21:24:02 tgl Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.40 2004/06/18 21:47:23 tgl Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -79,18 +79,18 @@ PostgreSQL documentation
<term><replaceable class="parameter">description</replaceable></term> <term><replaceable class="parameter">description</replaceable></term>
<listitem> <listitem>
<para> <para>
This optionally specifies a comment to be associated with the newly created Specifies a comment to be associated with the newly created
database. database.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-D <replaceable class="parameter">location</replaceable></></term> <term><option>-D <replaceable class="parameter">tablespace</replaceable></></term>
<term><option>--location <replaceable class="parameter">location</replaceable></></term> <term><option>--tablespace <replaceable class="parameter">tablespace</replaceable></></term>
<listitem> <listitem>
<para> <para>
Specifies the alternative location for the database. Specifies the default tablespace for the database.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

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

@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.11 2004/06/03 00:07:38 momjian Exp $ * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.12 2004/06/18 21:47:24 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -31,7 +31,7 @@ main(int argc, char *argv[])
{"echo", no_argument, NULL, 'e'}, {"echo", no_argument, NULL, 'e'},
{"quiet", no_argument, NULL, 'q'}, {"quiet", no_argument, NULL, 'q'},
{"owner", required_argument, NULL, 'O'}, {"owner", required_argument, NULL, 'O'},
{"location", required_argument, NULL, 'D'}, {"tablespace", required_argument, NULL, 'D'},
{"template", required_argument, NULL, 'T'}, {"template", required_argument, NULL, 'T'},
{"encoding", required_argument, NULL, 'E'}, {"encoding", required_argument, NULL, 'E'},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
@ -50,7 +50,7 @@ main(int argc, char *argv[])
bool echo = false; bool echo = false;
bool quiet = false; bool quiet = false;
char *owner = NULL; char *owner = NULL;
char *location = NULL; char *tablespace = NULL;
char *template = NULL; char *template = NULL;
char *encoding = NULL; char *encoding = NULL;
@ -90,7 +90,7 @@ main(int argc, char *argv[])
owner = optarg; owner = optarg;
break; break;
case 'D': case 'D':
location = optarg; tablespace = optarg;
break; break;
case 'T': case 'T':
template = optarg; template = optarg;
@ -149,11 +149,8 @@ main(int argc, char *argv[])
if (owner) if (owner)
appendPQExpBuffer(&sql, " OWNER %s", fmtId(owner)); appendPQExpBuffer(&sql, " OWNER %s", fmtId(owner));
if (location) if (tablespace)
{ appendPQExpBuffer(&sql, " TABLESPACE %s", fmtId(tablespace));
appendPQExpBuffer(&sql, " LOCATION ");
appendStringLiteral(&sql, location, false);
}
if (encoding) if (encoding)
appendPQExpBuffer(&sql, " ENCODING '%s'", encoding); appendPQExpBuffer(&sql, " ENCODING '%s'", encoding);
if (template) if (template)
@ -221,7 +218,7 @@ help(const char *progname)
printf(_("Usage:\n")); printf(_("Usage:\n"));
printf(_(" %s [OPTION]... [DBNAME] [DESCRIPTION]\n"), progname); printf(_(" %s [OPTION]... [DBNAME] [DESCRIPTION]\n"), progname);
printf(_("\nOptions:\n")); printf(_("\nOptions:\n"));
printf(_(" -D, --location=PATH alternative place to store the database\n")); printf(_(" -D, --tablespace=TABLESPACE default tablespace for the database\n"));
printf(_(" -E, --encoding=ENCODING encoding for the database\n")); printf(_(" -E, --encoding=ENCODING encoding for the database\n"));
printf(_(" -O, --owner=OWNER database user to own the new database\n")); printf(_(" -O, --owner=OWNER database user to own the new database\n"));
printf(_(" -T, --template=TEMPLATE template database to copy\n")); printf(_(" -T, --template=TEMPLATE template database to copy\n"));