]> granicus.if.org Git - postgresql/blobdiff - src/bin/scripts/createdb.c
Update copyright for 2018
[postgresql] / src / bin / scripts / createdb.c
index 084bebbdd518e12c14324d51d34dffcf2951bd72..81a819213662b35d5b979d72afb788b8586391d8 100644 (file)
@@ -2,19 +2,17 @@
  *
  * createdb
  *
- * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/bin/scripts/createdb.c,v 1.1 2003/03/18 22:19:46 petere Exp $
+ * src/bin/scripts/createdb.c
  *
  *-------------------------------------------------------------------------
  */
-
 #include "postgres_fe.h"
-#include "common.h"
-#include "dumputils.h"
 
-#include "mb/pg_wchar.h"
+#include "common.h"
+#include "fe_utils/string_utils.h"
 
 
 static void help(const char *progname);
@@ -27,32 +25,39 @@ main(int argc, char *argv[])
                {"host", required_argument, NULL, 'h'},
                {"port", required_argument, NULL, 'p'},
                {"username", required_argument, NULL, 'U'},
+               {"no-password", no_argument, NULL, 'w'},
                {"password", no_argument, NULL, 'W'},
                {"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'},
+               {"lc-collate", required_argument, NULL, 1},
+               {"lc-ctype", required_argument, NULL, 2},
+               {"locale", required_argument, NULL, 'l'},
+               {"maintenance-db", required_argument, NULL, 3},
                {NULL, 0, NULL, 0}
        };
 
-       char       *progname;
+       const char *progname;
        int                     optindex;
        int                     c;
 
        const char *dbname = NULL;
+       const char *maintenance_db = NULL;
        char       *comment = NULL;
        char       *host = NULL;
        char       *port = NULL;
        char       *username = NULL;
-       bool            password = false;
+       enum trivalue prompt_password = TRI_DEFAULT;
        bool            echo = false;
-       bool            quiet = false;
        char       *owner = NULL;
-       char       *location = NULL;
+       char       *tablespace = NULL;
        char       *template = NULL;
        char       *encoding = NULL;
+       char       *lc_collate = NULL;
+       char       *lc_ctype = NULL;
+       char       *locale = NULL;
 
        PQExpBufferData sql;
 
@@ -60,45 +65,58 @@ main(int argc, char *argv[])
        PGresult   *result;
 
        progname = get_progname(argv[0]);
-       init_nls();
+       set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pgscripts"));
+
        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:wWeO:D:T:E:l:", long_options, &optindex)) != -1)
        {
                switch (c)
                {
                        case 'h':
-                               host = optarg;
+                               host = pg_strdup(optarg);
                                break;
                        case 'p':
-                               port = optarg;
+                               port = pg_strdup(optarg);
                                break;
                        case 'U':
-                               username = optarg;
+                               username = pg_strdup(optarg);
+                               break;
+                       case 'w':
+                               prompt_password = TRI_NO;
                                break;
                        case 'W':
-                               password = true;
+                               prompt_password = TRI_YES;
                                break;
                        case 'e':
                                echo = true;
                                break;
-                       case 'q':
-                               quiet = true;
-                               break;
                        case 'O':
-                               owner = optarg;
+                               owner = pg_strdup(optarg);
                                break;
                        case 'D':
-                               location = optarg;
+                               tablespace = pg_strdup(optarg);
                                break;
                        case 'T':
-                               template = optarg;
+                               template = pg_strdup(optarg);
                                break;
                        case 'E':
-                               encoding = optarg;
+                               encoding = pg_strdup(optarg);
+                               break;
+                       case 1:
+                               lc_collate = pg_strdup(optarg);
+                               break;
+                       case 2:
+                               lc_ctype = pg_strdup(optarg);
+                               break;
+                       case 'l':
+                               locale = pg_strdup(optarg);
+                               break;
+                       case 3:
+                               maintenance_db = pg_strdup(optarg);
                                break;
                        default:
-                               fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+                               fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
                                exit(1);
                }
        }
@@ -115,10 +133,28 @@ main(int argc, char *argv[])
                        comment = argv[optind + 1];
                        break;
                default:
-                       fprintf(stderr, _("%s: too many command-line arguments (first is '%s')\n"),
+                       fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
                                        progname, argv[optind + 2]);
-                       fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+                       fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
+                       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)
@@ -138,31 +174,38 @@ main(int argc, char *argv[])
                else if (getenv("PGUSER"))
                        dbname = getenv("PGUSER");
                else
-                       dbname = get_user_name(progname);
+                       dbname = get_user_name_or_exit(progname);
        }
 
        initPQExpBuffer(&sql);
 
-       appendPQExpBuffer(&sql, "SET autocommit TO on;\nCREATE DATABASE %s",
+       appendPQExpBuffer(&sql, "CREATE DATABASE %s",
                                          fmtId(dbname));
 
        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)
                appendPQExpBuffer(&sql, " TEMPLATE %s", fmtId(template));
-       appendPQExpBuffer(&sql, ";\n");
+       if (lc_collate)
+               appendPQExpBuffer(&sql, " LC_COLLATE '%s'", lc_collate);
+       if (lc_ctype)
+               appendPQExpBuffer(&sql, " LC_CTYPE '%s'", lc_ctype);
 
-       conn = connectDatabase("template1", host, port, username, password, progname);
+       appendPQExpBufferChar(&sql, ';');
+
+       /* No point in trying to use postgres db when creating postgres db. */
+       if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0)
+               maintenance_db = "template1";
+
+       conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
+                                                                         prompt_password, progname);
 
        if (echo)
-               printf("%s", sql.data);
+               printf("%s\n", sql.data);
        result = PQexec(conn, sql.data);
 
        if (PQresultStatus(result) != PGRES_COMMAND_OK)
@@ -174,20 +217,15 @@ main(int argc, char *argv[])
        }
 
        PQclear(result);
-       PQfinish(conn);
-
-       if (!quiet)
-               puts("CREATE DATABASE");
 
        if (comment)
        {
-               printfPQExpBuffer(&sql, "SET autocommit TO on;\nCOMMENT ON DATABASE %s IS ", fmtId(dbname));
-               appendStringLiteral(&sql, comment, false);
-               appendPQExpBuffer(&sql, ";\n");
+               printfPQExpBuffer(&sql, "COMMENT ON DATABASE %s IS ", fmtId(dbname));
+               appendStringLiteralConn(&sql, comment, conn);
+               appendPQExpBufferChar(&sql, ';');
 
-               conn = connectDatabase(dbname, host, port, username, password, progname);
                if (echo)
-                       printf("%s", sql.data);
+                       printf("%s\n", sql.data);
                result = PQexec(conn, sql.data);
 
                if (PQresultStatus(result) != PGRES_COMMAND_OK)
@@ -198,11 +236,11 @@ main(int argc, char *argv[])
                        exit(1);
                }
 
-               PQfinish(conn);
-               if (!quiet)
-                       puts("COMMENT");
+               PQclear(result);
        }
 
+       PQfinish(conn);
+
        exit(0);
 }
 
@@ -214,19 +252,23 @@ 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, --echo                   show the commands being sent to the server\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"));
+       printf(_("  -T, --template=TEMPLATE      template database to copy\n"));
+       printf(_("  -V, --version                output version information, then exit\n"));
+       printf(_("  -?, --help                   show this help, then exit\n"));
        printf(_("\nConnection options:\n"));
-       printf(_("  -h, --host=HOSTNAME       database server host\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, --no-password            never prompt for password\n"));
+       printf(_("  -W, --password               force password prompt\n"));
+       printf(_("  --maintenance-db=DBNAME      alternate maintenance database\n"));
        printf(_("\nBy default, a database with the same name as the current user is created.\n"));
        printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
 }