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 ...)

diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 1d04a61abf69a42591229e6ffe32eb867fabccd3..c307031ba4d5b2706b725dc80872d9cf7e69d71e 100644 (file)
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -1,5 +1,5 @@
 
 
@@ -67,8 +67,8 @@ PostgreSQL documentation
       dbname
       
        
-   Specifies the name of the database to be created.  The name must be
-   unique among all PostgreSQL databases in this cluster.
+        Specifies the name of the database to be created.  The name must be
+        unique among all PostgreSQL databases in this cluster.
         The default is to create a database with the same name as the
         current system user.
        
@@ -79,18 +79,18 @@ PostgreSQL documentation
       description
       
        
-        This optionally specifies a comment to be associated with the newly created
-   database.
+        Specifies a comment to be associated with the newly created
+        database.
        
       
      
 
      
-      -D location
-      --location location
+      -D tablespace
+      --tablespace tablespace
       
        
-   Specifies the alternative location for the database.
+        Specifies the default tablespace for the database.
        
       
      
@@ -101,7 +101,7 @@ PostgreSQL documentation
       
        
         Echo the commands that createdb generates
-   and sends to the server.
+        and sends to the server.
        
       
      
@@ -124,7 +124,7 @@ PostgreSQL documentation
       --owner owner
       
        
-   Specifies the database user who will own the new database.
+        Specifies the database user who will own the new database.
        
       
      
@@ -170,9 +170,9 @@ PostgreSQL documentation
       --host host
       
        
-   Specifies the host name of the machine on which the 
-   server is running.  If the value begins with a slash, it is used 
-   as the directory for the Unix domain socket.
+        Specifies the host name of the machine on which the 
+        server is running.  If the value begins with a slash, it is used 
+        as the directory for the Unix domain socket.
        
       
      
@@ -182,8 +182,8 @@ PostgreSQL documentation
       --port port
       
        
-   Specifies the TCP port or the local Unix domain socket file 
-   extension on which the server is listening for connections.
+        Specifies the TCP port or the local Unix domain socket file 
+        extension on which the server is listening for connections.
        
       
      

diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 02acf60f98e39d89a0f90945e2b9b79a2fb85f16..70f807f2885f4d09de39a670005a4a865c1a52ed 100644 (file)
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * 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'},
        {"quiet", no_argument, NULL, 'q'},
        {"owner", required_argument, NULL, 'O'},
-       {"location", required_argument, NULL, 'D'},
+       {"tablespace", required_argument, NULL, 'D'},
        {"template", required_argument, NULL, 'T'},
        {"encoding", required_argument, NULL, 'E'},
        {NULL, 0, NULL, 0}
@@ -50,7 +50,7 @@ main(int argc, char *argv[])
    bool        echo = false;
    bool        quiet = false;
    char       *owner = NULL;
-   char       *location = NULL;
+   char       *tablespace = NULL;
    char       *template = NULL;
    char       *encoding = NULL;
 
@@ -90,7 +90,7 @@ main(int argc, char *argv[])
                owner = optarg;
                break;
            case 'D':
-               location = optarg;
+               tablespace = optarg;
                break;
            case 'T':
                template = optarg;
@@ -149,11 +149,8 @@ main(int argc, char *argv[])
 
    if (owner)
        appendPQExpBuffer(&sql, " OWNER %s", fmtId(owner));
-   if (location)
-   {
-       appendPQExpBuffer(&sql, " LOCATION ");
-       appendStringLiteral(&sql, location, false);
-   }
+   if (tablespace)
+       appendPQExpBuffer(&sql, " TABLESPACE %s", fmtId(tablespace));
    if (encoding)
        appendPQExpBuffer(&sql, " ENCODING '%s'", encoding);
    if (template)
@@ -221,19 +218,19 @@ help(const char *progname)
    printf(_("Usage:\n"));
    printf(_("  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"), progname);
    printf(_("\nOptions:\n"));
-   printf(_("  -D, --location=PATH       alternative place to store 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(_("  -T, --template=TEMPLATE   template database to copy\n"));
-   printf(_("  -e, --echo                show the commands being sent to the server\n"));
-   printf(_("  -q, --quiet               don't write any messages\n"));
-   printf(_("  --help                    show this help, then exit\n"));
-   printf(_("  --version                 output version information, then exit\n"));
+   printf(_("  -D, --tablespace=TABLESPACE  default tablespace 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(_("  -T, --template=TEMPLATE      template database to copy\n"));
+   printf(_("  -e, --echo                   show the commands being sent to the server\n"));
+   printf(_("  -q, --quiet                  don't write any messages\n"));
+   printf(_("  --help                       show this help, then exit\n"));
+   printf(_("  --version                    output version information, then exit\n"));
    printf(_("\nConnection options:\n"));
-   printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
-   printf(_("  -p, --port=PORT           database server port\n"));
-   printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -h, --host=HOSTNAME          database server host or socket directory\n"));
+   printf(_("  -p, --port=PORT              database server port\n"));
+   printf(_("  -U, --username=USERNAME      user name to connect as\n"));
+   printf(_("  -W, --password               prompt for password\n"));
    printf(_("\nBy default, a database with the same name as the current user is created.\n"));
    printf(_("\nReport bugs to .\n"));
 }