Fix connection string handling in src/bin/scripts/ programs.

When told to process all databases, clusterdb, reindexdb, and vacuumdb
would reconnect by replacing their --maintenance-db parameter with the
name of the target database.  If that parameter is a connstring (which
has been allowed for a long time, though we failed to document that
before this patch), we'd lose any other options it might specify, for
example SSL or GSS parameters, possibly resulting in failure to connect.
Thus, this is the same bug as commit a45bc8a4f fixed in pg_dump and
pg_restore.  We can fix it in the same way, by using libpq's rules for
handling multiple "dbname" parameters to add the target database name
separately.  I chose to apply the same refactoring approach as in that
patch, with a struct to handle the command line parameters that need to
be passed through to connectDatabase.  (Maybe someday we can unify the
very similar functions here and in pg_dump/pg_restore.)

Per Peter Eisentraut's comments on bug #16604.  Back-patch to all
supported branches.

Discussion: https://postgr.es/m/16604-933f4b8791227b15@postgresql.org

diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index 5b54ddb2d2d8eb611fac9ed83dadd5688c0266ae..7016226777a5df158d516446fd191b6bb078c7ba 100644 (file)
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -90,9 +90,9 @@ PostgreSQL documentation
       --dbname=dbname
       
        
-        Specifies the name of the database to be clustered.
-        If this is not specified and -a (or
-        --all) is not used, the database name is read
+        Specifies the name of the database to be clustered,
+        when -a/--all is not used.
+        If this is not specified, the database name is read
         from the environment variable PGDATABASE.  If
         that is not set, the user name specified for the connection is
         used.  The dbname can be a 
@@ -249,10 +249,16 @@ PostgreSQL documentation
       --maintenance-db=dbname
       
        
-         Specifies the name of the database to connect to discover what other
-         databases should be clustered. If not specified, the
-         postgres database will be used,
-         and if that does not exist, template1 will be used.
+        Specifies the name of the database to connect to to discover which
+        databases should be clustered,
+        when -a/--all is used.
+        If not specified, the postgres database will be used,
+        or if that does not exist, template1 will be used.
+        This can be a connection
+        string.  If so, connection string parameters will override any
+        conflicting command line options.  Also, connection string parameters
+        other than the database name itself will be re-used when connecting
+        to other databases.
        
       
      


diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml

index 2fca26237e3ab43268c8a9a0917f9fb437ef9d5c..aa7e95cd6a3c91097d4c5caa205c26a7d36c6fe4 100644 (file)

--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -286,6 +286,9 @@ PostgreSQL documentation
          database will be used; if that does not exist (or if it is the name
          of the new database being created), template1 will
          be used.
+         This can be a connection
+         string.  If so, connection string parameters will override any
+         conflicting command line options.
        
       
      


diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml

index 38da0c25034b6181432415a2d32b148f033143ad..d73fdda4c6c61b1561fc3cd74262147ca447ca00 100644 (file)

--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -205,6 +205,9 @@ PostgreSQL documentation
          target database. If not specified, the postgres
          database will be used; if that does not exist (or is the database
          being dropped), template1 will be used.
+         This can be a connection
+         string.  If so, connection string parameters will override any
+         conflicting command line options.
        
       
      


diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml

index 03cf67710af2e0fd58bd3f3d77babbb50a2e7323..66f5612f0f20ef9ae1951fa68eacfb565bcb93e3 100644 (file)

--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -134,9 +134,9 @@ PostgreSQL documentation
       --dbname=dbname
       
        
-        Specifies the name of the database to be reindexed.
-        If this is not specified and -a (or
-        --all) is not used, the database name is read
+        Specifies the name of the database to be reindexed,
+        when -a/--all is not used.
+        If this is not specified, the database name is read
         from the environment variable PGDATABASE.  If
         that is not set, the user name specified for the connection is
         used.  The dbname can be a 
@@ -328,10 +328,16 @@ PostgreSQL documentation
       --maintenance-db=dbname
       
        
-         Specifies the name of the database to connect to discover what other
-         databases should be reindexed. If not specified, the
-         postgres database will be used,
-         and if that does not exist, template1 will be used.
+        Specifies the name of the database to connect to to discover which
+        databases should be reindexed,
+        when -a/--all is used.
+        If not specified, the postgres database will be used,
+        or if that does not exist, template1 will be used.
+        This can be a connection
+        string.  If so, connection string parameters will override any
+        conflicting command line options.  Also, connection string parameters
+        other than the database name itself will be re-used when connecting
+        to other databases.
        
       
      


diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml

index c9ba8d23f4cfe45d76997336c6f35a9f94430b24..f1ee120f01e3e93aaeab32920bceda1a29b81e6d 100644 (file)

--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -92,9 +92,9 @@ PostgreSQL documentation
       --dbname=dbname
       
        
-        Specifies the name of the database to be cleaned or analyzed.
-        If this is not specified and -a (or
-        --all) is not used, the database name is read
+        Specifies the name of the database to be cleaned or analyzed,
+        when -a/--all is not used.
+        If this is not specified, the database name is read
         from the environment variable PGDATABASE.  If
         that is not set, the user name specified for the connection is
         used.  The dbname can be a 
@@ -426,10 +426,16 @@ PostgreSQL documentation
       --maintenance-db=dbname
       
        
-         Specifies the name of the database to connect to discover what other
-         databases should be vacuumed. If not specified, the
-         postgres database will be used,
-         and if that does not exist, template1 will be used.
+        Specifies the name of the database to connect to to discover which
+        databases should be vacuumed,
+        when -a/--all is used.
+        If not specified, the postgres database will be used,
+        or if that does not exist, template1 will be used.
+        This can be a connection
+        string.  If so, connection string parameters will override any
+        conflicting command line options.  Also, connection string parameters
+        other than the database name itself will be re-used when connecting
+        to other databases.
        
       
      


diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c

index 15fff91e16150e3b68abf6e5008c3b3f0f89cf07..28100c9fbb3cfeae49622c1bf283bd67c6fe15d3 100644 (file)

--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -16,15 +16,10 @@
 #include "fe_utils/string_utils.h"
 
 
-static void cluster_one_database(const char *dbname, bool verbose, const char *table,
-                                const char *host, const char *port,
-                                const char *username, enum trivalue prompt_password,
-                                const char *progname, bool echo);
-static void cluster_all_databases(bool verbose, const char *maintenance_db,
-                                 const char *host, const char *port,
-                                 const char *username, enum trivalue prompt_password,
-                                 const char *progname, bool echo, bool quiet);
-
+static void cluster_one_database(const ConnParams *cparams, const char *table,
+                                const char *progname, bool verbose, bool echo);
+static void cluster_all_databases(ConnParams *cparams, const char *progname,
+                                 bool verbose, bool echo, bool quiet);
 static void help(const char *progname);
 
 
@@ -57,6 +52,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        quiet = false;
    bool        alldb = false;
@@ -133,6 +129,13 @@ main(int argc, char *argv[])
        exit(1);
    }
 
+   /* fill cparams except for dbname, which is set below */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
    setup_cancel_handler();
 
    if (alldb)
@@ -149,8 +152,9 @@ main(int argc, char *argv[])
            exit(1);
        }
 
-       cluster_all_databases(verbose, maintenance_db, host, port, username, prompt_password,
-                             progname, echo, quiet);
+       cparams.dbname = maintenance_db;
+
+       cluster_all_databases(&cparams, progname, verbose, echo, quiet);
    }
    else
    {
@@ -164,21 +168,21 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
+       cparams.dbname = dbname;
+
        if (tables.head != NULL)
        {
            SimpleStringListCell *cell;
 
            for (cell = tables.head; cell; cell = cell->next)
            {
-               cluster_one_database(dbname, verbose, cell->val,
-                                    host, port, username, prompt_password,
-                                    progname, echo);
+               cluster_one_database(&cparams, cell->val,
+                                    progname, verbose, echo);
            }
        }
        else
-           cluster_one_database(dbname, verbose, NULL,
-                                host, port, username, prompt_password,
-                                progname, echo);
+           cluster_one_database(&cparams, NULL,
+                                progname, verbose, echo);
    }
 
    exit(0);
@@ -186,17 +190,14 @@ main(int argc, char *argv[])
 
 
 static void
-cluster_one_database(const char *dbname, bool verbose, const char *table,
-                    const char *host, const char *port,
-                    const char *username, enum trivalue prompt_password,
-                    const char *progname, bool echo)
+cluster_one_database(const ConnParams *cparams, const char *table,
+                    const char *progname, bool verbose, bool echo)
 {
    PQExpBufferData sql;
 
    PGconn     *conn;
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, false);
+   conn = connectDatabase(cparams, progname, echo, false, false);
 
    initPQExpBuffer(&sql);
 
@@ -227,22 +228,17 @@ cluster_one_database(const char *dbname, bool verbose, const char *table,
 
 
 static void
-cluster_all_databases(bool verbose, const char *maintenance_db,
-                     const char *host, const char *port,
-                     const char *username, enum trivalue prompt_password,
-                     const char *progname, bool echo, bool quiet)
+cluster_all_databases(ConnParams *cparams, const char *progname,
+                     bool verbose, bool echo, bool quiet)
 {
    PGconn     *conn;
    PGresult   *result;
-   PQExpBufferData connstr;
    int         i;
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   conn = connectMaintenanceDatabase(cparams, progname, echo);
    result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;", progname, echo);
    PQfinish(conn);
 
-   initPQExpBuffer(&connstr);
    for (i = 0; i < PQntuples(result); i++)
    {
        char       *dbname = PQgetvalue(result, i, 0);
@@ -253,15 +249,10 @@ cluster_all_databases(bool verbose, const char *maintenance_db,
            fflush(stdout);
        }
 
-       resetPQExpBuffer(&connstr);
-       appendPQExpBuffer(&connstr, "dbname=");
-       appendConnStrVal(&connstr, dbname);
+       cparams->override_dbname = dbname;
 
-       cluster_one_database(connstr.data, verbose, NULL,
-                            host, port, username, prompt_password,
-                            progname, echo);
+       cluster_one_database(cparams, NULL, progname, verbose, echo);
    }
-   termPQExpBuffer(&connstr);
 
    PQclear(result);
 }


diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c

index 296029d809308d94765c94d06e30927694c6018a..7f4b635571df0f178aaa1ddd9d7b485625175b2b 100644 (file)

--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -58,7 +58,7 @@ handle_help_version_opts(int argc, char *argv[],
  * Make a database connection with the given parameters.
  *
  * An interactive password prompt is automatically issued if needed and
- * allowed by prompt_password.
+ * allowed by cparams->prompt_password.
  *
  * If allow_password_reuse is true, we will try to re-use any password
  * given during previous calls to this routine.  (Callers should not pass
@@ -66,9 +66,7 @@ handle_help_version_opts(int argc, char *argv[],
  * as before, else we might create password exposure hazards.)
  */
 PGconn *
-connectDatabase(const char *dbname, const char *pghost,
-               const char *pgport, const char *pguser,
-               enum trivalue prompt_password, const char *progname,
+connectDatabase(const ConnParams *cparams, const char *progname,
                bool echo, bool fail_ok, bool allow_password_reuse)
 {
    PGconn     *conn;
@@ -76,10 +74,13 @@ connectDatabase(const char *dbname, const char *pghost,
    static bool have_password = false;
    static char password[100];
 
+   /* Callers must supply at least dbname; other params can be NULL */
+   Assert(cparams->dbname);
+
    if (!allow_password_reuse)
        have_password = false;
 
-   if (!have_password && prompt_password == TRI_YES)
+   if (cparams->prompt_password == TRI_YES && !have_password)
    {
        simple_prompt("Password: ", password, sizeof(password), false);
        have_password = true;
@@ -91,23 +92,35 @@ connectDatabase(const char *dbname, const char *pghost,
     */
    do
    {
-       const char *keywords[7];
-       const char *values[7];
-
-       keywords[0] = "host";
-       values[0] = pghost;
-       keywords[1] = "port";
-       values[1] = pgport;
-       keywords[2] = "user";
-       values[2] = pguser;
-       keywords[3] = "password";
-       values[3] = have_password ? password : NULL;
-       keywords[4] = "dbname";
-       values[4] = dbname;
-       keywords[5] = "fallback_application_name";
-       values[5] = progname;
-       keywords[6] = NULL;
-       values[6] = NULL;
+       const char *keywords[8];
+       const char *values[8];
+       int         i = 0;
+
+       /*
+        * If dbname is a connstring, its entries can override the other
+        * values obtained from cparams; but in turn, override_dbname can
+        * override the dbname component of it.
+        */
+       keywords[i] = "host";
+       values[i++] = cparams->pghost;
+       keywords[i] = "port";
+       values[i++] = cparams->pgport;
+       keywords[i] = "user";
+       values[i++] = cparams->pguser;
+       keywords[i] = "password";
+       values[i++] = have_password ? password : NULL;
+       keywords[i] = "dbname";
+       values[i++] = cparams->dbname;
+       if (cparams->override_dbname)
+       {
+           keywords[i] = "dbname";
+           values[i++] = cparams->override_dbname;
+       }
+       keywords[i] = "fallback_application_name";
+       values[i++] = progname;
+       keywords[i] = NULL;
+       values[i++] = NULL;
+       Assert(i <= lengthof(keywords));
 
        new_pass = false;
        conn = PQconnectdbParams(keywords, values, true);
@@ -115,7 +128,7 @@ connectDatabase(const char *dbname, const char *pghost,
        if (!conn)
        {
            pg_log_error("could not connect to database %s: out of memory",
-                        dbname);
+                        cparams->dbname);
            exit(1);
        }
 
@@ -124,7 +137,7 @@ connectDatabase(const char *dbname, const char *pghost,
         */
        if (PQstatus(conn) == CONNECTION_BAD &&
            PQconnectionNeedsPassword(conn) &&
-           prompt_password != TRI_NO)
+           cparams->prompt_password != TRI_NO)
        {
            PQfinish(conn);
            simple_prompt("Password: ", password, sizeof(password), false);
@@ -142,10 +155,11 @@ connectDatabase(const char *dbname, const char *pghost,
            return NULL;
        }
        pg_log_error("could not connect to database %s: %s",
-                    dbname, PQerrorMessage(conn));
+                    cparams->dbname, PQerrorMessage(conn));
        exit(1);
    }
 
+   /* Start strict; callers may override this. */
    PQclear(executeQuery(conn, ALWAYS_SECURE_SEARCH_PATH_SQL,
                         progname, echo));
 
@@ -154,27 +168,30 @@ connectDatabase(const char *dbname, const char *pghost,
 
 /*
  * Try to connect to the appropriate maintenance database.
+ *
+ * This differs from connectDatabase only in that it has a rule for
+ * inserting a default "dbname" if none was given (which is why cparams
+ * is not const).  Note that cparams->dbname should typically come from
+ * a --maintenance-db command line parameter.
  */
 PGconn *
-connectMaintenanceDatabase(const char *maintenance_db,
-                          const char *pghost, const char *pgport,
-                          const char *pguser, enum trivalue prompt_password,
+connectMaintenanceDatabase(ConnParams *cparams,
                           const char *progname, bool echo)
 {
    PGconn     *conn;
 
    /* If a maintenance database name was specified, just connect to it. */
-   if (maintenance_db)
-       return connectDatabase(maintenance_db, pghost, pgport, pguser,
-                              prompt_password, progname, echo, false, false);
+   if (cparams->dbname)
+       return connectDatabase(cparams, progname, echo, false, false);
 
    /* Otherwise, try postgres first and then template1. */
-   conn = connectDatabase("postgres", pghost, pgport, pguser, prompt_password,
-                          progname, echo, true, false);
+   cparams->dbname = "postgres";
+   conn = connectDatabase(cparams, progname, echo, true, false);
    if (!conn)
-       conn = connectDatabase("template1", pghost, pgport, pguser,
-                              prompt_password, progname, echo, false, false);
-
+   {
+       cparams->dbname = "template1";
+       conn = connectDatabase(cparams, progname, echo, false, false);
+   }
    return conn;
 }
 


diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h

index 35d1a3e0d516dd7e62479ce0b38ca11f255e5aa0..37fc48aa697a8cb378b9736c8f7d1d3c2e2c356a 100644 (file)

--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -23,20 +23,32 @@ enum trivalue
 
 extern bool CancelRequested;
 
+/* Parameters needed by connectDatabase/connectMaintenanceDatabase */
+typedef struct _connParams
+{
+   /* These fields record the actual command line parameters */
+   const char *dbname;         /* this may be a connstring! */
+   const char *pghost;
+   const char *pgport;
+   const char *pguser;
+   enum trivalue prompt_password;
+   /* If not NULL, this overrides the dbname obtained from command line */
+   /* (but *only* the DB name, not anything else in the connstring) */
+   const char *override_dbname;
+} ConnParams;
+
 typedef void (*help_handler) (const char *progname);
 
 extern void handle_help_version_opts(int argc, char *argv[],
                                     const char *fixed_progname,
                                     help_handler hlp);
 
-extern PGconn *connectDatabase(const char *dbname, const char *pghost,
-                              const char *pgport, const char *pguser,
-                              enum trivalue prompt_password, const char *progname,
-                              bool echo, bool fail_ok, bool allow_password_reuse);
+extern PGconn *connectDatabase(const ConnParams *cparams,
+                              const char *progname,
+                              bool echo, bool fail_ok,
+                              bool allow_password_reuse);
 
-extern PGconn *connectMaintenanceDatabase(const char *maintenance_db,
-                                         const char *pghost, const char *pgport,
-                                         const char *pguser, enum trivalue prompt_password,
+extern PGconn *connectMaintenanceDatabase(ConnParams *cparams,
                                          const char *progname, bool echo);
 
 extern PGresult *executeQuery(PGconn *conn, const char *query,


diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c

index 67f376f51a72e92be4007da3a8776587621ea111..b4d3e134d932fe8c2d9640c7eeb6891b2384e8d1 100644 (file)

--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -51,6 +51,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    char       *owner = NULL;
    char       *tablespace = NULL;
@@ -180,8 +181,14 @@ main(int argc, char *argv[])
    if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0)
        maintenance_db = "template1";
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   cparams.dbname = maintenance_db;
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
 
    initPQExpBuffer(&sql);
 


diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c

index e17ae2ea32ce7f53b3e8550d847f87e2d8493015..dbc2c2a58cd1308afaf031cd7b4635a76ded9e8f 100644 (file)

--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -61,6 +61,7 @@ main(int argc, char *argv[])
    char       *username = NULL;
    SimpleStringList roles = {NULL, NULL};
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        interactive = false;
    int         conn_limit = -2;    /* less than minimum valid value */
@@ -261,8 +262,14 @@ main(int argc, char *argv[])
    if (login == 0)
        login = TRI_YES;
 
-   conn = connectDatabase("postgres", host, port, username, prompt_password,
-                          progname, echo, false, false);
+   cparams.dbname = NULL;      /* this program lacks any dbname option... */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
 
    initPQExpBuffer(&sql);
 


diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c

index dacd8e5f1dcc9a60c6370c703d402591923f1e74..ffdf12bfea7f9e4fb3f671001316ddaf2c4ed227 100644 (file)

--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -47,6 +47,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        interactive = false;
 
@@ -130,9 +131,14 @@ main(int argc, char *argv[])
    if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0)
        maintenance_db = "template1";
 
-   conn = connectMaintenanceDatabase(maintenance_db,
-                                     host, port, username, prompt_password,
-                                     progname, echo);
+   cparams.dbname = maintenance_db;
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
 
    if (echo)
        printf("%s\n", sql.data);


diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c

index 3501a06ecb1105728a760aa8f4f9e00017985887..a8be6b0784b949ee60d2beb9487554f80187e543 100644 (file)

--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -45,6 +45,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        interactive = false;
    char        dropuser_buf[128];
@@ -131,13 +132,19 @@ main(int argc, char *argv[])
            exit(0);
    }
 
+   cparams.dbname = NULL;      /* this program lacks any dbname option... */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
+
    initPQExpBuffer(&sql);
    appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
                      (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
 
-   conn = connectDatabase("postgres", host, port, username, prompt_password,
-                          progname, echo, false, false);
-
    if (echo)
        printf("%s\n", sql.data);
    result = PQexec(conn, sql.data);


diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c

index bec57589d33a67e5e19a6027255dbc83808193e4..5281e993b4306d07292f1e92d87f508edaf6491b 100644 (file)

--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -16,19 +16,14 @@
 #include "fe_utils/string_utils.h"
 
 
-static void reindex_one_database(const char *name, const char *dbname,
-                                const char *type, const char *host,
-                                const char *port, const char *username,
-                                enum trivalue prompt_password, const char *progname,
+static void reindex_one_database(const ConnParams *cparams,
+                                const char *type, const char *name,
+                                const char *progname,
                                 bool echo, bool verbose, bool concurrently);
-static void reindex_all_databases(const char *maintenance_db,
-                                 const char *host, const char *port,
-                                 const char *username, enum trivalue prompt_password,
+static void reindex_all_databases(ConnParams *cparams,
                                  const char *progname, bool echo,
                                  bool quiet, bool verbose, bool concurrently);
-static void reindex_system_catalogs(const char *dbname,
-                                   const char *host, const char *port,
-                                   const char *username, enum trivalue prompt_password,
+static void reindex_system_catalogs(const ConnParams *cparams,
                                    const char *progname, bool echo, bool verbose,
                                    bool concurrently);
 static void help(const char *progname);
@@ -66,6 +61,7 @@ main(int argc, char *argv[])
    const char *port = NULL;
    const char *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        syscatalog = false;
    bool        alldb = false;
    bool        echo = false;
@@ -159,6 +155,13 @@ main(int argc, char *argv[])
        exit(1);
    }
 
+   /* fill cparams except for dbname, which is set below */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
    setup_cancel_handler();
 
    if (alldb)
@@ -189,8 +192,10 @@ main(int argc, char *argv[])
            exit(1);
        }
 
-       reindex_all_databases(maintenance_db, host, port, username,
-                             prompt_password, progname, echo, quiet, verbose, concurrently);
+       cparams.dbname = maintenance_db;
+
+       reindex_all_databases(&cparams,
+                             progname, echo, quiet, verbose, concurrently);
    }
    else if (syscatalog)
    {
@@ -220,7 +225,9 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
-       reindex_system_catalogs(dbname, host, port, username, prompt_password,
+       cparams.dbname = dbname;
+
+       reindex_system_catalogs(&cparams,
                                progname, echo, verbose, concurrently);
    }
    else
@@ -235,14 +242,16 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
+       cparams.dbname = dbname;
+
        if (schemas.head != NULL)
        {
            SimpleStringListCell *cell;
 
            for (cell = schemas.head; cell; cell = cell->next)
            {
-               reindex_one_database(cell->val, dbname, "SCHEMA", host, port,
-                                    username, prompt_password, progname, echo, verbose, concurrently);
+               reindex_one_database(&cparams, "SCHEMA", cell->val,
+                                    progname, echo, verbose, concurrently);
            }
        }
 
@@ -252,8 +261,8 @@ main(int argc, char *argv[])
 
            for (cell = indexes.head; cell; cell = cell->next)
            {
-               reindex_one_database(cell->val, dbname, "INDEX", host, port,
-                                    username, prompt_password, progname, echo, verbose, concurrently);
+               reindex_one_database(&cparams, "INDEX", cell->val,
+                                    progname, echo, verbose, concurrently);
            }
        }
        if (tables.head != NULL)
@@ -262,8 +271,8 @@ main(int argc, char *argv[])
 
            for (cell = tables.head; cell; cell = cell->next)
            {
-               reindex_one_database(cell->val, dbname, "TABLE", host, port,
-                                    username, prompt_password, progname, echo, verbose, concurrently);
+               reindex_one_database(&cparams, "TABLE", cell->val,
+                                    progname, echo, verbose, concurrently);
            }
        }
 
@@ -272,25 +281,24 @@ main(int argc, char *argv[])
         * specified
         */
        if (indexes.head == NULL && tables.head == NULL && schemas.head == NULL)
-           reindex_one_database(NULL, dbname, "DATABASE", host, port,
-                                username, prompt_password, progname, echo, verbose, concurrently);
+           reindex_one_database(&cparams, "DATABASE", NULL,
+                                progname, echo, verbose, concurrently);
    }
 
    exit(0);
 }
 
 static void
-reindex_one_database(const char *name, const char *dbname, const char *type,
-                    const char *host, const char *port, const char *username,
-                    enum trivalue prompt_password, const char *progname, bool echo,
-                    bool verbose, bool concurrently)
+reindex_one_database(const ConnParams *cparams,
+                    const char *type, const char *name,
+                    const char *progname,
+                    bool echo, bool verbose, bool concurrently)
 {
    PQExpBufferData sql;
 
    PGconn     *conn;
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, false);
+   conn = connectDatabase(cparams, progname, echo, false, false);
 
    if (concurrently && PQserverVersion(conn) < 120000)
    {
@@ -343,23 +351,18 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
 }
 
 static void
-reindex_all_databases(const char *maintenance_db,
-                     const char *host, const char *port,
-                     const char *username, enum trivalue prompt_password,
+reindex_all_databases(ConnParams *cparams,
                      const char *progname, bool echo, bool quiet, bool verbose,
                      bool concurrently)
 {
    PGconn     *conn;
    PGresult   *result;
-   PQExpBufferData connstr;
    int         i;
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   conn = connectMaintenanceDatabase(cparams, progname, echo);
    result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;", progname, echo);
    PQfinish(conn);
 
-   initPQExpBuffer(&connstr);
    for (i = 0; i < PQntuples(result); i++)
    {
        char       *dbname = PQgetvalue(result, i, 0);
@@ -370,29 +373,23 @@ reindex_all_databases(const char *maintenance_db,
            fflush(stdout);
        }
 
-       resetPQExpBuffer(&connstr);
-       appendPQExpBuffer(&connstr, "dbname=");
-       appendConnStrVal(&connstr, dbname);
+       cparams->override_dbname = dbname;
 
-       reindex_one_database(NULL, connstr.data, "DATABASE", host,
-                            port, username, prompt_password,
+       reindex_one_database(cparams, "DATABASE", NULL,
                             progname, echo, verbose, concurrently);
    }
-   termPQExpBuffer(&connstr);
 
    PQclear(result);
 }
 
 static void
-reindex_system_catalogs(const char *dbname, const char *host, const char *port,
-                       const char *username, enum trivalue prompt_password,
+reindex_system_catalogs(const ConnParams *cparams,
                        const char *progname, bool echo, bool verbose, bool concurrently)
 {
    PGconn     *conn;
    PQExpBufferData sql;
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, false);
+   conn = connectDatabase(cparams, progname, echo, false, false);
 
    initPQExpBuffer(&sql);
 


diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c

index 2814c034d4ec300d25e44fe647dca0fb91cf3358..d0db3fb88329d6b4470c62e694e881082b31b617 100644 (file)

--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -53,19 +53,16 @@ typedef struct vacuumingOptions
 } vacuumingOptions;
 
 
-static void vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
+static void vacuum_one_database(const ConnParams *cparams,
+                               vacuumingOptions *vacopts,
                                int stage,
                                SimpleStringList *tables,
-                               const char *host, const char *port,
-                               const char *username, enum trivalue prompt_password,
                                int concurrentCons,
                                const char *progname, bool echo, bool quiet);
 
-static void vacuum_all_databases(vacuumingOptions *vacopts,
+static void vacuum_all_databases(ConnParams *cparams,
+                                vacuumingOptions *vacopts,
                                 bool analyze_in_stages,
-                                const char *maintenance_db,
-                                const char *host, const char *port,
-                                const char *username, enum trivalue prompt_password,
                                 int concurrentCons,
                                 const char *progname, bool echo, bool quiet);
 
@@ -134,6 +131,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        quiet = false;
    vacuumingOptions vacopts;
@@ -287,6 +285,13 @@ main(int argc, char *argv[])
        /* allow 'and_analyze' with 'analyze_only' */
    }
 
+   /* fill cparams except for dbname, which is set below */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
    setup_cancel_handler();
 
    /* Avoid opening extra connections. */
@@ -306,10 +311,10 @@ main(int argc, char *argv[])
            exit(1);
        }
 
-       vacuum_all_databases(&vacopts,
+       cparams.dbname = maintenance_db;
+
+       vacuum_all_databases(&cparams, &vacopts,
                             analyze_in_stages,
-                            maintenance_db,
-                            host, port, username, prompt_password,
                             concurrentCons,
                             progname, echo, quiet);
    }
@@ -325,25 +330,25 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
+       cparams.dbname = dbname;
+
        if (analyze_in_stages)
        {
            int         stage;
 
            for (stage = 0; stage < ANALYZE_NUM_STAGES; stage++)
            {
-               vacuum_one_database(dbname, &vacopts,
+               vacuum_one_database(&cparams, &vacopts,
                                    stage,
                                    &tables,
-                                   host, port, username, prompt_password,
                                    concurrentCons,
                                    progname, echo, quiet);
            }
        }
        else
-           vacuum_one_database(dbname, &vacopts,
+           vacuum_one_database(&cparams, &vacopts,
                                ANALYZE_NO_STAGE,
                                &tables,
-                               host, port, username, prompt_password,
                                concurrentCons,
                                progname, echo, quiet);
    }
@@ -365,11 +370,10 @@ main(int argc, char *argv[])
  * a list of tables from the database.
  */
 static void
-vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
+vacuum_one_database(const ConnParams *cparams,
+                   vacuumingOptions *vacopts,
                    int stage,
                    SimpleStringList *tables,
-                   const char *host, const char *port,
-                   const char *username, enum trivalue prompt_password,
                    int concurrentCons,
                    const char *progname, bool echo, bool quiet)
 {
@@ -401,8 +405,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
    Assert(stage == ANALYZE_NO_STAGE ||
           (stage >= 0 && stage < ANALYZE_NUM_STAGES));
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, true);
+   conn = connectDatabase(cparams, progname, echo, false, true);
 
    if (vacopts->disable_page_skipping && PQserverVersion(conn) < 90600)
    {
@@ -629,8 +632,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
    {
        for (i = 1; i < concurrentCons; i++)
        {
-           conn = connectDatabase(dbname, host, port, username, prompt_password,
-                                  progname, echo, false, true);
+           conn = connectDatabase(cparams, progname, echo, false, true);
 
            /*
             * Fail and exit immediately if trying to use a socket in an
@@ -748,28 +750,23 @@ finish:
  * quickly everywhere before generating more detailed ones.
  */
 static void
-vacuum_all_databases(vacuumingOptions *vacopts,
+vacuum_all_databases(ConnParams *cparams,
+                    vacuumingOptions *vacopts,
                     bool analyze_in_stages,
-                    const char *maintenance_db, const char *host,
-                    const char *port, const char *username,
-                    enum trivalue prompt_password,
                     int concurrentCons,
                     const char *progname, bool echo, bool quiet)
 {
    PGconn     *conn;
    PGresult   *result;
-   PQExpBufferData connstr;
    int         stage;
    int         i;
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   conn = connectMaintenanceDatabase(cparams, progname, echo);
    result = executeQuery(conn,
                          "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;",
                          progname, echo);
    PQfinish(conn);
 
-   initPQExpBuffer(&connstr);
    if (analyze_in_stages)
    {
        /*
@@ -784,14 +781,11 @@ vacuum_all_databases(vacuumingOptions *vacopts,
        {
            for (i = 0; i < PQntuples(result); i++)
            {
-               resetPQExpBuffer(&connstr);
-               appendPQExpBuffer(&connstr, "dbname=");
-               appendConnStrVal(&connstr, PQgetvalue(result, i, 0));
+               cparams->override_dbname = PQgetvalue(result, i, 0);
 
-               vacuum_one_database(connstr.data, vacopts,
+               vacuum_one_database(cparams, vacopts,
                                    stage,
                                    NULL,
-                                   host, port, username, prompt_password,
                                    concurrentCons,
                                    progname, echo, quiet);
            }
@@ -801,19 +795,15 @@ vacuum_all_databases(vacuumingOptions *vacopts,
    {
        for (i = 0; i < PQntuples(result); i++)
        {
-           resetPQExpBuffer(&connstr);
-           appendPQExpBuffer(&connstr, "dbname=");
-           appendConnStrVal(&connstr, PQgetvalue(result, i, 0));
+           cparams->override_dbname = PQgetvalue(result, i, 0);
 
-           vacuum_one_database(connstr.data, vacopts,
+           vacuum_one_database(cparams, vacopts,
                                ANALYZE_NO_STAGE,
                                NULL,
-                               host, port, username, prompt_password,
                                concurrentCons,
                                progname, echo, quiet);
        }
    }
-   termPQExpBuffer(&connstr);
 
    PQclear(result);
 }




This is the main PostgreSQL git repository.
RSS
Atom

diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 2fca26237e3ab43268c8a9a0917f9fb437ef9d5c..aa7e95cd6a3c91097d4c5caa205c26a7d36c6fe4 100644 (file)
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -286,6 +286,9 @@ PostgreSQL documentation
          database will be used; if that does not exist (or if it is the name
          of the new database being created), template1 will
          be used.
+         This can be a connection
+         string.  If so, connection string parameters will override any
+         conflicting command line options.
        
       
      

diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml
index 38da0c25034b6181432415a2d32b148f033143ad..d73fdda4c6c61b1561fc3cd74262147ca447ca00 100644 (file)
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -205,6 +205,9 @@ PostgreSQL documentation
          target database. If not specified, the postgres
          database will be used; if that does not exist (or is the database
          being dropped), template1 will be used.
+         This can be a connection
+         string.  If so, connection string parameters will override any
+         conflicting command line options.
        
       
      

diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index 03cf67710af2e0fd58bd3f3d77babbb50a2e7323..66f5612f0f20ef9ae1951fa68eacfb565bcb93e3 100644 (file)
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -134,9 +134,9 @@ PostgreSQL documentation
       --dbname=dbname
       
        
-        Specifies the name of the database to be reindexed.
-        If this is not specified and -a (or
-        --all) is not used, the database name is read
+        Specifies the name of the database to be reindexed,
+        when -a/--all is not used.
+        If this is not specified, the database name is read
         from the environment variable PGDATABASE.  If
         that is not set, the user name specified for the connection is
         used.  The dbname can be a 
@@ -328,10 +328,16 @@ PostgreSQL documentation
       --maintenance-db=dbname
       
        
-         Specifies the name of the database to connect to discover what other
-         databases should be reindexed. If not specified, the
-         postgres database will be used,
-         and if that does not exist, template1 will be used.
+        Specifies the name of the database to connect to to discover which
+        databases should be reindexed,
+        when -a/--all is used.
+        If not specified, the postgres database will be used,
+        or if that does not exist, template1 will be used.
+        This can be a connection
+        string.  If so, connection string parameters will override any
+        conflicting command line options.  Also, connection string parameters
+        other than the database name itself will be re-used when connecting
+        to other databases.
        
       
      


diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml

index c9ba8d23f4cfe45d76997336c6f35a9f94430b24..f1ee120f01e3e93aaeab32920bceda1a29b81e6d 100644 (file)

--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -92,9 +92,9 @@ PostgreSQL documentation
       --dbname=dbname
       
        
-        Specifies the name of the database to be cleaned or analyzed.
-        If this is not specified and -a (or
-        --all) is not used, the database name is read
+        Specifies the name of the database to be cleaned or analyzed,
+        when -a/--all is not used.
+        If this is not specified, the database name is read
         from the environment variable PGDATABASE.  If
         that is not set, the user name specified for the connection is
         used.  The dbname can be a 
@@ -426,10 +426,16 @@ PostgreSQL documentation
       --maintenance-db=dbname
       
        
-         Specifies the name of the database to connect to discover what other
-         databases should be vacuumed. If not specified, the
-         postgres database will be used,
-         and if that does not exist, template1 will be used.
+        Specifies the name of the database to connect to to discover which
+        databases should be vacuumed,
+        when -a/--all is used.
+        If not specified, the postgres database will be used,
+        or if that does not exist, template1 will be used.
+        This can be a connection
+        string.  If so, connection string parameters will override any
+        conflicting command line options.  Also, connection string parameters
+        other than the database name itself will be re-used when connecting
+        to other databases.
        
       
      


diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c

index 15fff91e16150e3b68abf6e5008c3b3f0f89cf07..28100c9fbb3cfeae49622c1bf283bd67c6fe15d3 100644 (file)

--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -16,15 +16,10 @@
 #include "fe_utils/string_utils.h"
 
 
-static void cluster_one_database(const char *dbname, bool verbose, const char *table,
-                                const char *host, const char *port,
-                                const char *username, enum trivalue prompt_password,
-                                const char *progname, bool echo);
-static void cluster_all_databases(bool verbose, const char *maintenance_db,
-                                 const char *host, const char *port,
-                                 const char *username, enum trivalue prompt_password,
-                                 const char *progname, bool echo, bool quiet);
-
+static void cluster_one_database(const ConnParams *cparams, const char *table,
+                                const char *progname, bool verbose, bool echo);
+static void cluster_all_databases(ConnParams *cparams, const char *progname,
+                                 bool verbose, bool echo, bool quiet);
 static void help(const char *progname);
 
 
@@ -57,6 +52,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        quiet = false;
    bool        alldb = false;
@@ -133,6 +129,13 @@ main(int argc, char *argv[])
        exit(1);
    }
 
+   /* fill cparams except for dbname, which is set below */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
    setup_cancel_handler();
 
    if (alldb)
@@ -149,8 +152,9 @@ main(int argc, char *argv[])
            exit(1);
        }
 
-       cluster_all_databases(verbose, maintenance_db, host, port, username, prompt_password,
-                             progname, echo, quiet);
+       cparams.dbname = maintenance_db;
+
+       cluster_all_databases(&cparams, progname, verbose, echo, quiet);
    }
    else
    {
@@ -164,21 +168,21 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
+       cparams.dbname = dbname;
+
        if (tables.head != NULL)
        {
            SimpleStringListCell *cell;
 
            for (cell = tables.head; cell; cell = cell->next)
            {
-               cluster_one_database(dbname, verbose, cell->val,
-                                    host, port, username, prompt_password,
-                                    progname, echo);
+               cluster_one_database(&cparams, cell->val,
+                                    progname, verbose, echo);
            }
        }
        else
-           cluster_one_database(dbname, verbose, NULL,
-                                host, port, username, prompt_password,
-                                progname, echo);
+           cluster_one_database(&cparams, NULL,
+                                progname, verbose, echo);
    }
 
    exit(0);
@@ -186,17 +190,14 @@ main(int argc, char *argv[])
 
 
 static void
-cluster_one_database(const char *dbname, bool verbose, const char *table,
-                    const char *host, const char *port,
-                    const char *username, enum trivalue prompt_password,
-                    const char *progname, bool echo)
+cluster_one_database(const ConnParams *cparams, const char *table,
+                    const char *progname, bool verbose, bool echo)
 {
    PQExpBufferData sql;
 
    PGconn     *conn;
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, false);
+   conn = connectDatabase(cparams, progname, echo, false, false);
 
    initPQExpBuffer(&sql);
 
@@ -227,22 +228,17 @@ cluster_one_database(const char *dbname, bool verbose, const char *table,
 
 
 static void
-cluster_all_databases(bool verbose, const char *maintenance_db,
-                     const char *host, const char *port,
-                     const char *username, enum trivalue prompt_password,
-                     const char *progname, bool echo, bool quiet)
+cluster_all_databases(ConnParams *cparams, const char *progname,
+                     bool verbose, bool echo, bool quiet)
 {
    PGconn     *conn;
    PGresult   *result;
-   PQExpBufferData connstr;
    int         i;
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   conn = connectMaintenanceDatabase(cparams, progname, echo);
    result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;", progname, echo);
    PQfinish(conn);
 
-   initPQExpBuffer(&connstr);
    for (i = 0; i < PQntuples(result); i++)
    {
        char       *dbname = PQgetvalue(result, i, 0);
@@ -253,15 +249,10 @@ cluster_all_databases(bool verbose, const char *maintenance_db,
            fflush(stdout);
        }
 
-       resetPQExpBuffer(&connstr);
-       appendPQExpBuffer(&connstr, "dbname=");
-       appendConnStrVal(&connstr, dbname);
+       cparams->override_dbname = dbname;
 
-       cluster_one_database(connstr.data, verbose, NULL,
-                            host, port, username, prompt_password,
-                            progname, echo);
+       cluster_one_database(cparams, NULL, progname, verbose, echo);
    }
-   termPQExpBuffer(&connstr);
 
    PQclear(result);
 }


diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c

index 296029d809308d94765c94d06e30927694c6018a..7f4b635571df0f178aaa1ddd9d7b485625175b2b 100644 (file)

--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -58,7 +58,7 @@ handle_help_version_opts(int argc, char *argv[],
  * Make a database connection with the given parameters.
  *
  * An interactive password prompt is automatically issued if needed and
- * allowed by prompt_password.
+ * allowed by cparams->prompt_password.
  *
  * If allow_password_reuse is true, we will try to re-use any password
  * given during previous calls to this routine.  (Callers should not pass
@@ -66,9 +66,7 @@ handle_help_version_opts(int argc, char *argv[],
  * as before, else we might create password exposure hazards.)
  */
 PGconn *
-connectDatabase(const char *dbname, const char *pghost,
-               const char *pgport, const char *pguser,
-               enum trivalue prompt_password, const char *progname,
+connectDatabase(const ConnParams *cparams, const char *progname,
                bool echo, bool fail_ok, bool allow_password_reuse)
 {
    PGconn     *conn;
@@ -76,10 +74,13 @@ connectDatabase(const char *dbname, const char *pghost,
    static bool have_password = false;
    static char password[100];
 
+   /* Callers must supply at least dbname; other params can be NULL */
+   Assert(cparams->dbname);
+
    if (!allow_password_reuse)
        have_password = false;
 
-   if (!have_password && prompt_password == TRI_YES)
+   if (cparams->prompt_password == TRI_YES && !have_password)
    {
        simple_prompt("Password: ", password, sizeof(password), false);
        have_password = true;
@@ -91,23 +92,35 @@ connectDatabase(const char *dbname, const char *pghost,
     */
    do
    {
-       const char *keywords[7];
-       const char *values[7];
-
-       keywords[0] = "host";
-       values[0] = pghost;
-       keywords[1] = "port";
-       values[1] = pgport;
-       keywords[2] = "user";
-       values[2] = pguser;
-       keywords[3] = "password";
-       values[3] = have_password ? password : NULL;
-       keywords[4] = "dbname";
-       values[4] = dbname;
-       keywords[5] = "fallback_application_name";
-       values[5] = progname;
-       keywords[6] = NULL;
-       values[6] = NULL;
+       const char *keywords[8];
+       const char *values[8];
+       int         i = 0;
+
+       /*
+        * If dbname is a connstring, its entries can override the other
+        * values obtained from cparams; but in turn, override_dbname can
+        * override the dbname component of it.
+        */
+       keywords[i] = "host";
+       values[i++] = cparams->pghost;
+       keywords[i] = "port";
+       values[i++] = cparams->pgport;
+       keywords[i] = "user";
+       values[i++] = cparams->pguser;
+       keywords[i] = "password";
+       values[i++] = have_password ? password : NULL;
+       keywords[i] = "dbname";
+       values[i++] = cparams->dbname;
+       if (cparams->override_dbname)
+       {
+           keywords[i] = "dbname";
+           values[i++] = cparams->override_dbname;
+       }
+       keywords[i] = "fallback_application_name";
+       values[i++] = progname;
+       keywords[i] = NULL;
+       values[i++] = NULL;
+       Assert(i <= lengthof(keywords));
 
        new_pass = false;
        conn = PQconnectdbParams(keywords, values, true);
@@ -115,7 +128,7 @@ connectDatabase(const char *dbname, const char *pghost,
        if (!conn)
        {
            pg_log_error("could not connect to database %s: out of memory",
-                        dbname);
+                        cparams->dbname);
            exit(1);
        }
 
@@ -124,7 +137,7 @@ connectDatabase(const char *dbname, const char *pghost,
         */
        if (PQstatus(conn) == CONNECTION_BAD &&
            PQconnectionNeedsPassword(conn) &&
-           prompt_password != TRI_NO)
+           cparams->prompt_password != TRI_NO)
        {
            PQfinish(conn);
            simple_prompt("Password: ", password, sizeof(password), false);
@@ -142,10 +155,11 @@ connectDatabase(const char *dbname, const char *pghost,
            return NULL;
        }
        pg_log_error("could not connect to database %s: %s",
-                    dbname, PQerrorMessage(conn));
+                    cparams->dbname, PQerrorMessage(conn));
        exit(1);
    }
 
+   /* Start strict; callers may override this. */
    PQclear(executeQuery(conn, ALWAYS_SECURE_SEARCH_PATH_SQL,
                         progname, echo));
 
@@ -154,27 +168,30 @@ connectDatabase(const char *dbname, const char *pghost,
 
 /*
  * Try to connect to the appropriate maintenance database.
+ *
+ * This differs from connectDatabase only in that it has a rule for
+ * inserting a default "dbname" if none was given (which is why cparams
+ * is not const).  Note that cparams->dbname should typically come from
+ * a --maintenance-db command line parameter.
  */
 PGconn *
-connectMaintenanceDatabase(const char *maintenance_db,
-                          const char *pghost, const char *pgport,
-                          const char *pguser, enum trivalue prompt_password,
+connectMaintenanceDatabase(ConnParams *cparams,
                           const char *progname, bool echo)
 {
    PGconn     *conn;
 
    /* If a maintenance database name was specified, just connect to it. */
-   if (maintenance_db)
-       return connectDatabase(maintenance_db, pghost, pgport, pguser,
-                              prompt_password, progname, echo, false, false);
+   if (cparams->dbname)
+       return connectDatabase(cparams, progname, echo, false, false);
 
    /* Otherwise, try postgres first and then template1. */
-   conn = connectDatabase("postgres", pghost, pgport, pguser, prompt_password,
-                          progname, echo, true, false);
+   cparams->dbname = "postgres";
+   conn = connectDatabase(cparams, progname, echo, true, false);
    if (!conn)
-       conn = connectDatabase("template1", pghost, pgport, pguser,
-                              prompt_password, progname, echo, false, false);
-
+   {
+       cparams->dbname = "template1";
+       conn = connectDatabase(cparams, progname, echo, false, false);
+   }
    return conn;
 }
 


diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h

index 35d1a3e0d516dd7e62479ce0b38ca11f255e5aa0..37fc48aa697a8cb378b9736c8f7d1d3c2e2c356a 100644 (file)

--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -23,20 +23,32 @@ enum trivalue
 
 extern bool CancelRequested;
 
+/* Parameters needed by connectDatabase/connectMaintenanceDatabase */
+typedef struct _connParams
+{
+   /* These fields record the actual command line parameters */
+   const char *dbname;         /* this may be a connstring! */
+   const char *pghost;
+   const char *pgport;
+   const char *pguser;
+   enum trivalue prompt_password;
+   /* If not NULL, this overrides the dbname obtained from command line */
+   /* (but *only* the DB name, not anything else in the connstring) */
+   const char *override_dbname;
+} ConnParams;
+
 typedef void (*help_handler) (const char *progname);
 
 extern void handle_help_version_opts(int argc, char *argv[],
                                     const char *fixed_progname,
                                     help_handler hlp);
 
-extern PGconn *connectDatabase(const char *dbname, const char *pghost,
-                              const char *pgport, const char *pguser,
-                              enum trivalue prompt_password, const char *progname,
-                              bool echo, bool fail_ok, bool allow_password_reuse);
+extern PGconn *connectDatabase(const ConnParams *cparams,
+                              const char *progname,
+                              bool echo, bool fail_ok,
+                              bool allow_password_reuse);
 
-extern PGconn *connectMaintenanceDatabase(const char *maintenance_db,
-                                         const char *pghost, const char *pgport,
-                                         const char *pguser, enum trivalue prompt_password,
+extern PGconn *connectMaintenanceDatabase(ConnParams *cparams,
                                          const char *progname, bool echo);
 
 extern PGresult *executeQuery(PGconn *conn, const char *query,


diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c

index 67f376f51a72e92be4007da3a8776587621ea111..b4d3e134d932fe8c2d9640c7eeb6891b2384e8d1 100644 (file)

--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -51,6 +51,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    char       *owner = NULL;
    char       *tablespace = NULL;
@@ -180,8 +181,14 @@ main(int argc, char *argv[])
    if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0)
        maintenance_db = "template1";
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   cparams.dbname = maintenance_db;
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
 
    initPQExpBuffer(&sql);
 


diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c

index e17ae2ea32ce7f53b3e8550d847f87e2d8493015..dbc2c2a58cd1308afaf031cd7b4635a76ded9e8f 100644 (file)

--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -61,6 +61,7 @@ main(int argc, char *argv[])
    char       *username = NULL;
    SimpleStringList roles = {NULL, NULL};
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        interactive = false;
    int         conn_limit = -2;    /* less than minimum valid value */
@@ -261,8 +262,14 @@ main(int argc, char *argv[])
    if (login == 0)
        login = TRI_YES;
 
-   conn = connectDatabase("postgres", host, port, username, prompt_password,
-                          progname, echo, false, false);
+   cparams.dbname = NULL;      /* this program lacks any dbname option... */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
 
    initPQExpBuffer(&sql);
 


diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c

index dacd8e5f1dcc9a60c6370c703d402591923f1e74..ffdf12bfea7f9e4fb3f671001316ddaf2c4ed227 100644 (file)

--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -47,6 +47,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        interactive = false;
 
@@ -130,9 +131,14 @@ main(int argc, char *argv[])
    if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0)
        maintenance_db = "template1";
 
-   conn = connectMaintenanceDatabase(maintenance_db,
-                                     host, port, username, prompt_password,
-                                     progname, echo);
+   cparams.dbname = maintenance_db;
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
 
    if (echo)
        printf("%s\n", sql.data);


diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c

index 3501a06ecb1105728a760aa8f4f9e00017985887..a8be6b0784b949ee60d2beb9487554f80187e543 100644 (file)

--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -45,6 +45,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        interactive = false;
    char        dropuser_buf[128];
@@ -131,13 +132,19 @@ main(int argc, char *argv[])
            exit(0);
    }
 
+   cparams.dbname = NULL;      /* this program lacks any dbname option... */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
+
    initPQExpBuffer(&sql);
    appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
                      (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
 
-   conn = connectDatabase("postgres", host, port, username, prompt_password,
-                          progname, echo, false, false);
-
    if (echo)
        printf("%s\n", sql.data);
    result = PQexec(conn, sql.data);


diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c

index bec57589d33a67e5e19a6027255dbc83808193e4..5281e993b4306d07292f1e92d87f508edaf6491b 100644 (file)

--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -16,19 +16,14 @@
 #include "fe_utils/string_utils.h"
 
 
-static void reindex_one_database(const char *name, const char *dbname,
-                                const char *type, const char *host,
-                                const char *port, const char *username,
-                                enum trivalue prompt_password, const char *progname,
+static void reindex_one_database(const ConnParams *cparams,
+                                const char *type, const char *name,
+                                const char *progname,
                                 bool echo, bool verbose, bool concurrently);
-static void reindex_all_databases(const char *maintenance_db,
-                                 const char *host, const char *port,
-                                 const char *username, enum trivalue prompt_password,
+static void reindex_all_databases(ConnParams *cparams,
                                  const char *progname, bool echo,
                                  bool quiet, bool verbose, bool concurrently);
-static void reindex_system_catalogs(const char *dbname,
-                                   const char *host, const char *port,
-                                   const char *username, enum trivalue prompt_password,
+static void reindex_system_catalogs(const ConnParams *cparams,
                                    const char *progname, bool echo, bool verbose,
                                    bool concurrently);
 static void help(const char *progname);
@@ -66,6 +61,7 @@ main(int argc, char *argv[])
    const char *port = NULL;
    const char *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        syscatalog = false;
    bool        alldb = false;
    bool        echo = false;
@@ -159,6 +155,13 @@ main(int argc, char *argv[])
        exit(1);
    }
 
+   /* fill cparams except for dbname, which is set below */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
    setup_cancel_handler();
 
    if (alldb)
@@ -189,8 +192,10 @@ main(int argc, char *argv[])
            exit(1);
        }
 
-       reindex_all_databases(maintenance_db, host, port, username,
-                             prompt_password, progname, echo, quiet, verbose, concurrently);
+       cparams.dbname = maintenance_db;
+
+       reindex_all_databases(&cparams,
+                             progname, echo, quiet, verbose, concurrently);
    }
    else if (syscatalog)
    {
@@ -220,7 +225,9 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
-       reindex_system_catalogs(dbname, host, port, username, prompt_password,
+       cparams.dbname = dbname;
+
+       reindex_system_catalogs(&cparams,
                                progname, echo, verbose, concurrently);
    }
    else
@@ -235,14 +242,16 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
+       cparams.dbname = dbname;
+
        if (schemas.head != NULL)
        {
            SimpleStringListCell *cell;
 
            for (cell = schemas.head; cell; cell = cell->next)
            {
-               reindex_one_database(cell->val, dbname, "SCHEMA", host, port,
-                                    username, prompt_password, progname, echo, verbose, concurrently);
+               reindex_one_database(&cparams, "SCHEMA", cell->val,
+                                    progname, echo, verbose, concurrently);
            }
        }
 
@@ -252,8 +261,8 @@ main(int argc, char *argv[])
 
            for (cell = indexes.head; cell; cell = cell->next)
            {
-               reindex_one_database(cell->val, dbname, "INDEX", host, port,
-                                    username, prompt_password, progname, echo, verbose, concurrently);
+               reindex_one_database(&cparams, "INDEX", cell->val,
+                                    progname, echo, verbose, concurrently);
            }
        }
        if (tables.head != NULL)
@@ -262,8 +271,8 @@ main(int argc, char *argv[])
 
            for (cell = tables.head; cell; cell = cell->next)
            {
-               reindex_one_database(cell->val, dbname, "TABLE", host, port,
-                                    username, prompt_password, progname, echo, verbose, concurrently);
+               reindex_one_database(&cparams, "TABLE", cell->val,
+                                    progname, echo, verbose, concurrently);
            }
        }
 
@@ -272,25 +281,24 @@ main(int argc, char *argv[])
         * specified
         */
        if (indexes.head == NULL && tables.head == NULL && schemas.head == NULL)
-           reindex_one_database(NULL, dbname, "DATABASE", host, port,
-                                username, prompt_password, progname, echo, verbose, concurrently);
+           reindex_one_database(&cparams, "DATABASE", NULL,
+                                progname, echo, verbose, concurrently);
    }
 
    exit(0);
 }
 
 static void
-reindex_one_database(const char *name, const char *dbname, const char *type,
-                    const char *host, const char *port, const char *username,
-                    enum trivalue prompt_password, const char *progname, bool echo,
-                    bool verbose, bool concurrently)
+reindex_one_database(const ConnParams *cparams,
+                    const char *type, const char *name,
+                    const char *progname,
+                    bool echo, bool verbose, bool concurrently)
 {
    PQExpBufferData sql;
 
    PGconn     *conn;
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, false);
+   conn = connectDatabase(cparams, progname, echo, false, false);
 
    if (concurrently && PQserverVersion(conn) < 120000)
    {
@@ -343,23 +351,18 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
 }
 
 static void
-reindex_all_databases(const char *maintenance_db,
-                     const char *host, const char *port,
-                     const char *username, enum trivalue prompt_password,
+reindex_all_databases(ConnParams *cparams,
                      const char *progname, bool echo, bool quiet, bool verbose,
                      bool concurrently)
 {
    PGconn     *conn;
    PGresult   *result;
-   PQExpBufferData connstr;
    int         i;
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   conn = connectMaintenanceDatabase(cparams, progname, echo);
    result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;", progname, echo);
    PQfinish(conn);
 
-   initPQExpBuffer(&connstr);
    for (i = 0; i < PQntuples(result); i++)
    {
        char       *dbname = PQgetvalue(result, i, 0);
@@ -370,29 +373,23 @@ reindex_all_databases(const char *maintenance_db,
            fflush(stdout);
        }
 
-       resetPQExpBuffer(&connstr);
-       appendPQExpBuffer(&connstr, "dbname=");
-       appendConnStrVal(&connstr, dbname);
+       cparams->override_dbname = dbname;
 
-       reindex_one_database(NULL, connstr.data, "DATABASE", host,
-                            port, username, prompt_password,
+       reindex_one_database(cparams, "DATABASE", NULL,
                             progname, echo, verbose, concurrently);
    }
-   termPQExpBuffer(&connstr);
 
    PQclear(result);
 }
 
 static void
-reindex_system_catalogs(const char *dbname, const char *host, const char *port,
-                       const char *username, enum trivalue prompt_password,
+reindex_system_catalogs(const ConnParams *cparams,
                        const char *progname, bool echo, bool verbose, bool concurrently)
 {
    PGconn     *conn;
    PQExpBufferData sql;
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, false);
+   conn = connectDatabase(cparams, progname, echo, false, false);
 
    initPQExpBuffer(&sql);
 


diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c

index 2814c034d4ec300d25e44fe647dca0fb91cf3358..d0db3fb88329d6b4470c62e694e881082b31b617 100644 (file)

--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -53,19 +53,16 @@ typedef struct vacuumingOptions
 } vacuumingOptions;
 
 
-static void vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
+static void vacuum_one_database(const ConnParams *cparams,
+                               vacuumingOptions *vacopts,
                                int stage,
                                SimpleStringList *tables,
-                               const char *host, const char *port,
-                               const char *username, enum trivalue prompt_password,
                                int concurrentCons,
                                const char *progname, bool echo, bool quiet);
 
-static void vacuum_all_databases(vacuumingOptions *vacopts,
+static void vacuum_all_databases(ConnParams *cparams,
+                                vacuumingOptions *vacopts,
                                 bool analyze_in_stages,
-                                const char *maintenance_db,
-                                const char *host, const char *port,
-                                const char *username, enum trivalue prompt_password,
                                 int concurrentCons,
                                 const char *progname, bool echo, bool quiet);
 
@@ -134,6 +131,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        quiet = false;
    vacuumingOptions vacopts;
@@ -287,6 +285,13 @@ main(int argc, char *argv[])
        /* allow 'and_analyze' with 'analyze_only' */
    }
 
+   /* fill cparams except for dbname, which is set below */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
    setup_cancel_handler();
 
    /* Avoid opening extra connections. */
@@ -306,10 +311,10 @@ main(int argc, char *argv[])
            exit(1);
        }
 
-       vacuum_all_databases(&vacopts,
+       cparams.dbname = maintenance_db;
+
+       vacuum_all_databases(&cparams, &vacopts,
                             analyze_in_stages,
-                            maintenance_db,
-                            host, port, username, prompt_password,
                             concurrentCons,
                             progname, echo, quiet);
    }
@@ -325,25 +330,25 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
+       cparams.dbname = dbname;
+
        if (analyze_in_stages)
        {
            int         stage;
 
            for (stage = 0; stage < ANALYZE_NUM_STAGES; stage++)
            {
-               vacuum_one_database(dbname, &vacopts,
+               vacuum_one_database(&cparams, &vacopts,
                                    stage,
                                    &tables,
-                                   host, port, username, prompt_password,
                                    concurrentCons,
                                    progname, echo, quiet);
            }
        }
        else
-           vacuum_one_database(dbname, &vacopts,
+           vacuum_one_database(&cparams, &vacopts,
                                ANALYZE_NO_STAGE,
                                &tables,
-                               host, port, username, prompt_password,
                                concurrentCons,
                                progname, echo, quiet);
    }
@@ -365,11 +370,10 @@ main(int argc, char *argv[])
  * a list of tables from the database.
  */
 static void
-vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
+vacuum_one_database(const ConnParams *cparams,
+                   vacuumingOptions *vacopts,
                    int stage,
                    SimpleStringList *tables,
-                   const char *host, const char *port,
-                   const char *username, enum trivalue prompt_password,
                    int concurrentCons,
                    const char *progname, bool echo, bool quiet)
 {
@@ -401,8 +405,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
    Assert(stage == ANALYZE_NO_STAGE ||
           (stage >= 0 && stage < ANALYZE_NUM_STAGES));
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, true);
+   conn = connectDatabase(cparams, progname, echo, false, true);
 
    if (vacopts->disable_page_skipping && PQserverVersion(conn) < 90600)
    {
@@ -629,8 +632,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
    {
        for (i = 1; i < concurrentCons; i++)
        {
-           conn = connectDatabase(dbname, host, port, username, prompt_password,
-                                  progname, echo, false, true);
+           conn = connectDatabase(cparams, progname, echo, false, true);
 
            /*
             * Fail and exit immediately if trying to use a socket in an
@@ -748,28 +750,23 @@ finish:
  * quickly everywhere before generating more detailed ones.
  */
 static void
-vacuum_all_databases(vacuumingOptions *vacopts,
+vacuum_all_databases(ConnParams *cparams,
+                    vacuumingOptions *vacopts,
                     bool analyze_in_stages,
-                    const char *maintenance_db, const char *host,
-                    const char *port, const char *username,
-                    enum trivalue prompt_password,
                     int concurrentCons,
                     const char *progname, bool echo, bool quiet)
 {
    PGconn     *conn;
    PGresult   *result;
-   PQExpBufferData connstr;
    int         stage;
    int         i;
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   conn = connectMaintenanceDatabase(cparams, progname, echo);
    result = executeQuery(conn,
                          "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;",
                          progname, echo);
    PQfinish(conn);
 
-   initPQExpBuffer(&connstr);
    if (analyze_in_stages)
    {
        /*
@@ -784,14 +781,11 @@ vacuum_all_databases(vacuumingOptions *vacopts,
        {
            for (i = 0; i < PQntuples(result); i++)
            {
-               resetPQExpBuffer(&connstr);
-               appendPQExpBuffer(&connstr, "dbname=");
-               appendConnStrVal(&connstr, PQgetvalue(result, i, 0));
+               cparams->override_dbname = PQgetvalue(result, i, 0);
 
-               vacuum_one_database(connstr.data, vacopts,
+               vacuum_one_database(cparams, vacopts,
                                    stage,
                                    NULL,
-                                   host, port, username, prompt_password,
                                    concurrentCons,
                                    progname, echo, quiet);
            }
@@ -801,19 +795,15 @@ vacuum_all_databases(vacuumingOptions *vacopts,
    {
        for (i = 0; i < PQntuples(result); i++)
        {
-           resetPQExpBuffer(&connstr);
-           appendPQExpBuffer(&connstr, "dbname=");
-           appendConnStrVal(&connstr, PQgetvalue(result, i, 0));
+           cparams->override_dbname = PQgetvalue(result, i, 0);
 
-           vacuum_one_database(connstr.data, vacopts,
+           vacuum_one_database(cparams, vacopts,
                                ANALYZE_NO_STAGE,
                                NULL,
-                               host, port, username, prompt_password,
                                concurrentCons,
                                progname, echo, quiet);
        }
    }
-   termPQExpBuffer(&connstr);
 
    PQclear(result);
 }

diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index c9ba8d23f4cfe45d76997336c6f35a9f94430b24..f1ee120f01e3e93aaeab32920bceda1a29b81e6d 100644 (file)
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -92,9 +92,9 @@ PostgreSQL documentation
       --dbname=dbname
       
        
-        Specifies the name of the database to be cleaned or analyzed.
-        If this is not specified and -a (or
-        --all) is not used, the database name is read
+        Specifies the name of the database to be cleaned or analyzed,
+        when -a/--all is not used.
+        If this is not specified, the database name is read
         from the environment variable PGDATABASE.  If
         that is not set, the user name specified for the connection is
         used.  The dbname can be a 
@@ -426,10 +426,16 @@ PostgreSQL documentation
       --maintenance-db=dbname
       
        
-         Specifies the name of the database to connect to discover what other
-         databases should be vacuumed. If not specified, the
-         postgres database will be used,
-         and if that does not exist, template1 will be used.
+        Specifies the name of the database to connect to to discover which
+        databases should be vacuumed,
+        when -a/--all is used.
+        If not specified, the postgres database will be used,
+        or if that does not exist, template1 will be used.
+        This can be a connection
+        string.  If so, connection string parameters will override any
+        conflicting command line options.  Also, connection string parameters
+        other than the database name itself will be re-used when connecting
+        to other databases.
        
       
      


diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c

index 15fff91e16150e3b68abf6e5008c3b3f0f89cf07..28100c9fbb3cfeae49622c1bf283bd67c6fe15d3 100644 (file)

--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -16,15 +16,10 @@
 #include "fe_utils/string_utils.h"
 
 
-static void cluster_one_database(const char *dbname, bool verbose, const char *table,
-                                const char *host, const char *port,
-                                const char *username, enum trivalue prompt_password,
-                                const char *progname, bool echo);
-static void cluster_all_databases(bool verbose, const char *maintenance_db,
-                                 const char *host, const char *port,
-                                 const char *username, enum trivalue prompt_password,
-                                 const char *progname, bool echo, bool quiet);
-
+static void cluster_one_database(const ConnParams *cparams, const char *table,
+                                const char *progname, bool verbose, bool echo);
+static void cluster_all_databases(ConnParams *cparams, const char *progname,
+                                 bool verbose, bool echo, bool quiet);
 static void help(const char *progname);
 
 
@@ -57,6 +52,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        quiet = false;
    bool        alldb = false;
@@ -133,6 +129,13 @@ main(int argc, char *argv[])
        exit(1);
    }
 
+   /* fill cparams except for dbname, which is set below */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
    setup_cancel_handler();
 
    if (alldb)
@@ -149,8 +152,9 @@ main(int argc, char *argv[])
            exit(1);
        }
 
-       cluster_all_databases(verbose, maintenance_db, host, port, username, prompt_password,
-                             progname, echo, quiet);
+       cparams.dbname = maintenance_db;
+
+       cluster_all_databases(&cparams, progname, verbose, echo, quiet);
    }
    else
    {
@@ -164,21 +168,21 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
+       cparams.dbname = dbname;
+
        if (tables.head != NULL)
        {
            SimpleStringListCell *cell;
 
            for (cell = tables.head; cell; cell = cell->next)
            {
-               cluster_one_database(dbname, verbose, cell->val,
-                                    host, port, username, prompt_password,
-                                    progname, echo);
+               cluster_one_database(&cparams, cell->val,
+                                    progname, verbose, echo);
            }
        }
        else
-           cluster_one_database(dbname, verbose, NULL,
-                                host, port, username, prompt_password,
-                                progname, echo);
+           cluster_one_database(&cparams, NULL,
+                                progname, verbose, echo);
    }
 
    exit(0);
@@ -186,17 +190,14 @@ main(int argc, char *argv[])
 
 
 static void
-cluster_one_database(const char *dbname, bool verbose, const char *table,
-                    const char *host, const char *port,
-                    const char *username, enum trivalue prompt_password,
-                    const char *progname, bool echo)
+cluster_one_database(const ConnParams *cparams, const char *table,
+                    const char *progname, bool verbose, bool echo)
 {
    PQExpBufferData sql;
 
    PGconn     *conn;
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, false);
+   conn = connectDatabase(cparams, progname, echo, false, false);
 
    initPQExpBuffer(&sql);
 
@@ -227,22 +228,17 @@ cluster_one_database(const char *dbname, bool verbose, const char *table,
 
 
 static void
-cluster_all_databases(bool verbose, const char *maintenance_db,
-                     const char *host, const char *port,
-                     const char *username, enum trivalue prompt_password,
-                     const char *progname, bool echo, bool quiet)
+cluster_all_databases(ConnParams *cparams, const char *progname,
+                     bool verbose, bool echo, bool quiet)
 {
    PGconn     *conn;
    PGresult   *result;
-   PQExpBufferData connstr;
    int         i;
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   conn = connectMaintenanceDatabase(cparams, progname, echo);
    result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;", progname, echo);
    PQfinish(conn);
 
-   initPQExpBuffer(&connstr);
    for (i = 0; i < PQntuples(result); i++)
    {
        char       *dbname = PQgetvalue(result, i, 0);
@@ -253,15 +249,10 @@ cluster_all_databases(bool verbose, const char *maintenance_db,
            fflush(stdout);
        }
 
-       resetPQExpBuffer(&connstr);
-       appendPQExpBuffer(&connstr, "dbname=");
-       appendConnStrVal(&connstr, dbname);
+       cparams->override_dbname = dbname;
 
-       cluster_one_database(connstr.data, verbose, NULL,
-                            host, port, username, prompt_password,
-                            progname, echo);
+       cluster_one_database(cparams, NULL, progname, verbose, echo);
    }
-   termPQExpBuffer(&connstr);
 
    PQclear(result);
 }


diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c

index 296029d809308d94765c94d06e30927694c6018a..7f4b635571df0f178aaa1ddd9d7b485625175b2b 100644 (file)

--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -58,7 +58,7 @@ handle_help_version_opts(int argc, char *argv[],
  * Make a database connection with the given parameters.
  *
  * An interactive password prompt is automatically issued if needed and
- * allowed by prompt_password.
+ * allowed by cparams->prompt_password.
  *
  * If allow_password_reuse is true, we will try to re-use any password
  * given during previous calls to this routine.  (Callers should not pass
@@ -66,9 +66,7 @@ handle_help_version_opts(int argc, char *argv[],
  * as before, else we might create password exposure hazards.)
  */
 PGconn *
-connectDatabase(const char *dbname, const char *pghost,
-               const char *pgport, const char *pguser,
-               enum trivalue prompt_password, const char *progname,
+connectDatabase(const ConnParams *cparams, const char *progname,
                bool echo, bool fail_ok, bool allow_password_reuse)
 {
    PGconn     *conn;
@@ -76,10 +74,13 @@ connectDatabase(const char *dbname, const char *pghost,
    static bool have_password = false;
    static char password[100];
 
+   /* Callers must supply at least dbname; other params can be NULL */
+   Assert(cparams->dbname);
+
    if (!allow_password_reuse)
        have_password = false;
 
-   if (!have_password && prompt_password == TRI_YES)
+   if (cparams->prompt_password == TRI_YES && !have_password)
    {
        simple_prompt("Password: ", password, sizeof(password), false);
        have_password = true;
@@ -91,23 +92,35 @@ connectDatabase(const char *dbname, const char *pghost,
     */
    do
    {
-       const char *keywords[7];
-       const char *values[7];
-
-       keywords[0] = "host";
-       values[0] = pghost;
-       keywords[1] = "port";
-       values[1] = pgport;
-       keywords[2] = "user";
-       values[2] = pguser;
-       keywords[3] = "password";
-       values[3] = have_password ? password : NULL;
-       keywords[4] = "dbname";
-       values[4] = dbname;
-       keywords[5] = "fallback_application_name";
-       values[5] = progname;
-       keywords[6] = NULL;
-       values[6] = NULL;
+       const char *keywords[8];
+       const char *values[8];
+       int         i = 0;
+
+       /*
+        * If dbname is a connstring, its entries can override the other
+        * values obtained from cparams; but in turn, override_dbname can
+        * override the dbname component of it.
+        */
+       keywords[i] = "host";
+       values[i++] = cparams->pghost;
+       keywords[i] = "port";
+       values[i++] = cparams->pgport;
+       keywords[i] = "user";
+       values[i++] = cparams->pguser;
+       keywords[i] = "password";
+       values[i++] = have_password ? password : NULL;
+       keywords[i] = "dbname";
+       values[i++] = cparams->dbname;
+       if (cparams->override_dbname)
+       {
+           keywords[i] = "dbname";
+           values[i++] = cparams->override_dbname;
+       }
+       keywords[i] = "fallback_application_name";
+       values[i++] = progname;
+       keywords[i] = NULL;
+       values[i++] = NULL;
+       Assert(i <= lengthof(keywords));
 
        new_pass = false;
        conn = PQconnectdbParams(keywords, values, true);
@@ -115,7 +128,7 @@ connectDatabase(const char *dbname, const char *pghost,
        if (!conn)
        {
            pg_log_error("could not connect to database %s: out of memory",
-                        dbname);
+                        cparams->dbname);
            exit(1);
        }
 
@@ -124,7 +137,7 @@ connectDatabase(const char *dbname, const char *pghost,
         */
        if (PQstatus(conn) == CONNECTION_BAD &&
            PQconnectionNeedsPassword(conn) &&
-           prompt_password != TRI_NO)
+           cparams->prompt_password != TRI_NO)
        {
            PQfinish(conn);
            simple_prompt("Password: ", password, sizeof(password), false);
@@ -142,10 +155,11 @@ connectDatabase(const char *dbname, const char *pghost,
            return NULL;
        }
        pg_log_error("could not connect to database %s: %s",
-                    dbname, PQerrorMessage(conn));
+                    cparams->dbname, PQerrorMessage(conn));
        exit(1);
    }
 
+   /* Start strict; callers may override this. */
    PQclear(executeQuery(conn, ALWAYS_SECURE_SEARCH_PATH_SQL,
                         progname, echo));
 
@@ -154,27 +168,30 @@ connectDatabase(const char *dbname, const char *pghost,
 
 /*
  * Try to connect to the appropriate maintenance database.
+ *
+ * This differs from connectDatabase only in that it has a rule for
+ * inserting a default "dbname" if none was given (which is why cparams
+ * is not const).  Note that cparams->dbname should typically come from
+ * a --maintenance-db command line parameter.
  */
 PGconn *
-connectMaintenanceDatabase(const char *maintenance_db,
-                          const char *pghost, const char *pgport,
-                          const char *pguser, enum trivalue prompt_password,
+connectMaintenanceDatabase(ConnParams *cparams,
                           const char *progname, bool echo)
 {
    PGconn     *conn;
 
    /* If a maintenance database name was specified, just connect to it. */
-   if (maintenance_db)
-       return connectDatabase(maintenance_db, pghost, pgport, pguser,
-                              prompt_password, progname, echo, false, false);
+   if (cparams->dbname)
+       return connectDatabase(cparams, progname, echo, false, false);
 
    /* Otherwise, try postgres first and then template1. */
-   conn = connectDatabase("postgres", pghost, pgport, pguser, prompt_password,
-                          progname, echo, true, false);
+   cparams->dbname = "postgres";
+   conn = connectDatabase(cparams, progname, echo, true, false);
    if (!conn)
-       conn = connectDatabase("template1", pghost, pgport, pguser,
-                              prompt_password, progname, echo, false, false);
-
+   {
+       cparams->dbname = "template1";
+       conn = connectDatabase(cparams, progname, echo, false, false);
+   }
    return conn;
 }
 


diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h

index 35d1a3e0d516dd7e62479ce0b38ca11f255e5aa0..37fc48aa697a8cb378b9736c8f7d1d3c2e2c356a 100644 (file)

--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -23,20 +23,32 @@ enum trivalue
 
 extern bool CancelRequested;
 
+/* Parameters needed by connectDatabase/connectMaintenanceDatabase */
+typedef struct _connParams
+{
+   /* These fields record the actual command line parameters */
+   const char *dbname;         /* this may be a connstring! */
+   const char *pghost;
+   const char *pgport;
+   const char *pguser;
+   enum trivalue prompt_password;
+   /* If not NULL, this overrides the dbname obtained from command line */
+   /* (but *only* the DB name, not anything else in the connstring) */
+   const char *override_dbname;
+} ConnParams;
+
 typedef void (*help_handler) (const char *progname);
 
 extern void handle_help_version_opts(int argc, char *argv[],
                                     const char *fixed_progname,
                                     help_handler hlp);
 
-extern PGconn *connectDatabase(const char *dbname, const char *pghost,
-                              const char *pgport, const char *pguser,
-                              enum trivalue prompt_password, const char *progname,
-                              bool echo, bool fail_ok, bool allow_password_reuse);
+extern PGconn *connectDatabase(const ConnParams *cparams,
+                              const char *progname,
+                              bool echo, bool fail_ok,
+                              bool allow_password_reuse);
 
-extern PGconn *connectMaintenanceDatabase(const char *maintenance_db,
-                                         const char *pghost, const char *pgport,
-                                         const char *pguser, enum trivalue prompt_password,
+extern PGconn *connectMaintenanceDatabase(ConnParams *cparams,
                                          const char *progname, bool echo);
 
 extern PGresult *executeQuery(PGconn *conn, const char *query,


diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c

index 67f376f51a72e92be4007da3a8776587621ea111..b4d3e134d932fe8c2d9640c7eeb6891b2384e8d1 100644 (file)

--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -51,6 +51,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    char       *owner = NULL;
    char       *tablespace = NULL;
@@ -180,8 +181,14 @@ main(int argc, char *argv[])
    if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0)
        maintenance_db = "template1";
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   cparams.dbname = maintenance_db;
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
 
    initPQExpBuffer(&sql);
 


diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c

index e17ae2ea32ce7f53b3e8550d847f87e2d8493015..dbc2c2a58cd1308afaf031cd7b4635a76ded9e8f 100644 (file)

--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -61,6 +61,7 @@ main(int argc, char *argv[])
    char       *username = NULL;
    SimpleStringList roles = {NULL, NULL};
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        interactive = false;
    int         conn_limit = -2;    /* less than minimum valid value */
@@ -261,8 +262,14 @@ main(int argc, char *argv[])
    if (login == 0)
        login = TRI_YES;
 
-   conn = connectDatabase("postgres", host, port, username, prompt_password,
-                          progname, echo, false, false);
+   cparams.dbname = NULL;      /* this program lacks any dbname option... */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
 
    initPQExpBuffer(&sql);
 


diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c

index dacd8e5f1dcc9a60c6370c703d402591923f1e74..ffdf12bfea7f9e4fb3f671001316ddaf2c4ed227 100644 (file)

--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -47,6 +47,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        interactive = false;
 
@@ -130,9 +131,14 @@ main(int argc, char *argv[])
    if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0)
        maintenance_db = "template1";
 
-   conn = connectMaintenanceDatabase(maintenance_db,
-                                     host, port, username, prompt_password,
-                                     progname, echo);
+   cparams.dbname = maintenance_db;
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
 
    if (echo)
        printf("%s\n", sql.data);


diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c

index 3501a06ecb1105728a760aa8f4f9e00017985887..a8be6b0784b949ee60d2beb9487554f80187e543 100644 (file)

--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -45,6 +45,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        interactive = false;
    char        dropuser_buf[128];
@@ -131,13 +132,19 @@ main(int argc, char *argv[])
            exit(0);
    }
 
+   cparams.dbname = NULL;      /* this program lacks any dbname option... */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
+
    initPQExpBuffer(&sql);
    appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
                      (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
 
-   conn = connectDatabase("postgres", host, port, username, prompt_password,
-                          progname, echo, false, false);
-
    if (echo)
        printf("%s\n", sql.data);
    result = PQexec(conn, sql.data);


diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c

index bec57589d33a67e5e19a6027255dbc83808193e4..5281e993b4306d07292f1e92d87f508edaf6491b 100644 (file)

--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -16,19 +16,14 @@
 #include "fe_utils/string_utils.h"
 
 
-static void reindex_one_database(const char *name, const char *dbname,
-                                const char *type, const char *host,
-                                const char *port, const char *username,
-                                enum trivalue prompt_password, const char *progname,
+static void reindex_one_database(const ConnParams *cparams,
+                                const char *type, const char *name,
+                                const char *progname,
                                 bool echo, bool verbose, bool concurrently);
-static void reindex_all_databases(const char *maintenance_db,
-                                 const char *host, const char *port,
-                                 const char *username, enum trivalue prompt_password,
+static void reindex_all_databases(ConnParams *cparams,
                                  const char *progname, bool echo,
                                  bool quiet, bool verbose, bool concurrently);
-static void reindex_system_catalogs(const char *dbname,
-                                   const char *host, const char *port,
-                                   const char *username, enum trivalue prompt_password,
+static void reindex_system_catalogs(const ConnParams *cparams,
                                    const char *progname, bool echo, bool verbose,
                                    bool concurrently);
 static void help(const char *progname);
@@ -66,6 +61,7 @@ main(int argc, char *argv[])
    const char *port = NULL;
    const char *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        syscatalog = false;
    bool        alldb = false;
    bool        echo = false;
@@ -159,6 +155,13 @@ main(int argc, char *argv[])
        exit(1);
    }
 
+   /* fill cparams except for dbname, which is set below */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
    setup_cancel_handler();
 
    if (alldb)
@@ -189,8 +192,10 @@ main(int argc, char *argv[])
            exit(1);
        }
 
-       reindex_all_databases(maintenance_db, host, port, username,
-                             prompt_password, progname, echo, quiet, verbose, concurrently);
+       cparams.dbname = maintenance_db;
+
+       reindex_all_databases(&cparams,
+                             progname, echo, quiet, verbose, concurrently);
    }
    else if (syscatalog)
    {
@@ -220,7 +225,9 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
-       reindex_system_catalogs(dbname, host, port, username, prompt_password,
+       cparams.dbname = dbname;
+
+       reindex_system_catalogs(&cparams,
                                progname, echo, verbose, concurrently);
    }
    else
@@ -235,14 +242,16 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
+       cparams.dbname = dbname;
+
        if (schemas.head != NULL)
        {
            SimpleStringListCell *cell;
 
            for (cell = schemas.head; cell; cell = cell->next)
            {
-               reindex_one_database(cell->val, dbname, "SCHEMA", host, port,
-                                    username, prompt_password, progname, echo, verbose, concurrently);
+               reindex_one_database(&cparams, "SCHEMA", cell->val,
+                                    progname, echo, verbose, concurrently);
            }
        }
 
@@ -252,8 +261,8 @@ main(int argc, char *argv[])
 
            for (cell = indexes.head; cell; cell = cell->next)
            {
-               reindex_one_database(cell->val, dbname, "INDEX", host, port,
-                                    username, prompt_password, progname, echo, verbose, concurrently);
+               reindex_one_database(&cparams, "INDEX", cell->val,
+                                    progname, echo, verbose, concurrently);
            }
        }
        if (tables.head != NULL)
@@ -262,8 +271,8 @@ main(int argc, char *argv[])
 
            for (cell = tables.head; cell; cell = cell->next)
            {
-               reindex_one_database(cell->val, dbname, "TABLE", host, port,
-                                    username, prompt_password, progname, echo, verbose, concurrently);
+               reindex_one_database(&cparams, "TABLE", cell->val,
+                                    progname, echo, verbose, concurrently);
            }
        }
 
@@ -272,25 +281,24 @@ main(int argc, char *argv[])
         * specified
         */
        if (indexes.head == NULL && tables.head == NULL && schemas.head == NULL)
-           reindex_one_database(NULL, dbname, "DATABASE", host, port,
-                                username, prompt_password, progname, echo, verbose, concurrently);
+           reindex_one_database(&cparams, "DATABASE", NULL,
+                                progname, echo, verbose, concurrently);
    }
 
    exit(0);
 }
 
 static void
-reindex_one_database(const char *name, const char *dbname, const char *type,
-                    const char *host, const char *port, const char *username,
-                    enum trivalue prompt_password, const char *progname, bool echo,
-                    bool verbose, bool concurrently)
+reindex_one_database(const ConnParams *cparams,
+                    const char *type, const char *name,
+                    const char *progname,
+                    bool echo, bool verbose, bool concurrently)
 {
    PQExpBufferData sql;
 
    PGconn     *conn;
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, false);
+   conn = connectDatabase(cparams, progname, echo, false, false);
 
    if (concurrently && PQserverVersion(conn) < 120000)
    {
@@ -343,23 +351,18 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
 }
 
 static void
-reindex_all_databases(const char *maintenance_db,
-                     const char *host, const char *port,
-                     const char *username, enum trivalue prompt_password,
+reindex_all_databases(ConnParams *cparams,
                      const char *progname, bool echo, bool quiet, bool verbose,
                      bool concurrently)
 {
    PGconn     *conn;
    PGresult   *result;
-   PQExpBufferData connstr;
    int         i;
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   conn = connectMaintenanceDatabase(cparams, progname, echo);
    result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;", progname, echo);
    PQfinish(conn);
 
-   initPQExpBuffer(&connstr);
    for (i = 0; i < PQntuples(result); i++)
    {
        char       *dbname = PQgetvalue(result, i, 0);
@@ -370,29 +373,23 @@ reindex_all_databases(const char *maintenance_db,
            fflush(stdout);
        }
 
-       resetPQExpBuffer(&connstr);
-       appendPQExpBuffer(&connstr, "dbname=");
-       appendConnStrVal(&connstr, dbname);
+       cparams->override_dbname = dbname;
 
-       reindex_one_database(NULL, connstr.data, "DATABASE", host,
-                            port, username, prompt_password,
+       reindex_one_database(cparams, "DATABASE", NULL,
                             progname, echo, verbose, concurrently);
    }
-   termPQExpBuffer(&connstr);
 
    PQclear(result);
 }
 
 static void
-reindex_system_catalogs(const char *dbname, const char *host, const char *port,
-                       const char *username, enum trivalue prompt_password,
+reindex_system_catalogs(const ConnParams *cparams,
                        const char *progname, bool echo, bool verbose, bool concurrently)
 {
    PGconn     *conn;
    PQExpBufferData sql;
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, false);
+   conn = connectDatabase(cparams, progname, echo, false, false);
 
    initPQExpBuffer(&sql);
 


diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c

index 2814c034d4ec300d25e44fe647dca0fb91cf3358..d0db3fb88329d6b4470c62e694e881082b31b617 100644 (file)

--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -53,19 +53,16 @@ typedef struct vacuumingOptions
 } vacuumingOptions;
 
 
-static void vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
+static void vacuum_one_database(const ConnParams *cparams,
+                               vacuumingOptions *vacopts,
                                int stage,
                                SimpleStringList *tables,
-                               const char *host, const char *port,
-                               const char *username, enum trivalue prompt_password,
                                int concurrentCons,
                                const char *progname, bool echo, bool quiet);
 
-static void vacuum_all_databases(vacuumingOptions *vacopts,
+static void vacuum_all_databases(ConnParams *cparams,
+                                vacuumingOptions *vacopts,
                                 bool analyze_in_stages,
-                                const char *maintenance_db,
-                                const char *host, const char *port,
-                                const char *username, enum trivalue prompt_password,
                                 int concurrentCons,
                                 const char *progname, bool echo, bool quiet);
 
@@ -134,6 +131,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        quiet = false;
    vacuumingOptions vacopts;
@@ -287,6 +285,13 @@ main(int argc, char *argv[])
        /* allow 'and_analyze' with 'analyze_only' */
    }
 
+   /* fill cparams except for dbname, which is set below */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
    setup_cancel_handler();
 
    /* Avoid opening extra connections. */
@@ -306,10 +311,10 @@ main(int argc, char *argv[])
            exit(1);
        }
 
-       vacuum_all_databases(&vacopts,
+       cparams.dbname = maintenance_db;
+
+       vacuum_all_databases(&cparams, &vacopts,
                             analyze_in_stages,
-                            maintenance_db,
-                            host, port, username, prompt_password,
                             concurrentCons,
                             progname, echo, quiet);
    }
@@ -325,25 +330,25 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
+       cparams.dbname = dbname;
+
        if (analyze_in_stages)
        {
            int         stage;
 
            for (stage = 0; stage < ANALYZE_NUM_STAGES; stage++)
            {
-               vacuum_one_database(dbname, &vacopts,
+               vacuum_one_database(&cparams, &vacopts,
                                    stage,
                                    &tables,
-                                   host, port, username, prompt_password,
                                    concurrentCons,
                                    progname, echo, quiet);
            }
        }
        else
-           vacuum_one_database(dbname, &vacopts,
+           vacuum_one_database(&cparams, &vacopts,
                                ANALYZE_NO_STAGE,
                                &tables,
-                               host, port, username, prompt_password,
                                concurrentCons,
                                progname, echo, quiet);
    }
@@ -365,11 +370,10 @@ main(int argc, char *argv[])
  * a list of tables from the database.
  */
 static void
-vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
+vacuum_one_database(const ConnParams *cparams,
+                   vacuumingOptions *vacopts,
                    int stage,
                    SimpleStringList *tables,
-                   const char *host, const char *port,
-                   const char *username, enum trivalue prompt_password,
                    int concurrentCons,
                    const char *progname, bool echo, bool quiet)
 {
@@ -401,8 +405,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
    Assert(stage == ANALYZE_NO_STAGE ||
           (stage >= 0 && stage < ANALYZE_NUM_STAGES));
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, true);
+   conn = connectDatabase(cparams, progname, echo, false, true);
 
    if (vacopts->disable_page_skipping && PQserverVersion(conn) < 90600)
    {
@@ -629,8 +632,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
    {
        for (i = 1; i < concurrentCons; i++)
        {
-           conn = connectDatabase(dbname, host, port, username, prompt_password,
-                                  progname, echo, false, true);
+           conn = connectDatabase(cparams, progname, echo, false, true);
 
            /*
             * Fail and exit immediately if trying to use a socket in an
@@ -748,28 +750,23 @@ finish:
  * quickly everywhere before generating more detailed ones.
  */
 static void
-vacuum_all_databases(vacuumingOptions *vacopts,
+vacuum_all_databases(ConnParams *cparams,
+                    vacuumingOptions *vacopts,
                     bool analyze_in_stages,
-                    const char *maintenance_db, const char *host,
-                    const char *port, const char *username,
-                    enum trivalue prompt_password,
                     int concurrentCons,
                     const char *progname, bool echo, bool quiet)
 {
    PGconn     *conn;
    PGresult   *result;
-   PQExpBufferData connstr;
    int         stage;
    int         i;
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   conn = connectMaintenanceDatabase(cparams, progname, echo);
    result = executeQuery(conn,
                          "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;",
                          progname, echo);
    PQfinish(conn);
 
-   initPQExpBuffer(&connstr);
    if (analyze_in_stages)
    {
        /*
@@ -784,14 +781,11 @@ vacuum_all_databases(vacuumingOptions *vacopts,
        {
            for (i = 0; i < PQntuples(result); i++)
            {
-               resetPQExpBuffer(&connstr);
-               appendPQExpBuffer(&connstr, "dbname=");
-               appendConnStrVal(&connstr, PQgetvalue(result, i, 0));
+               cparams->override_dbname = PQgetvalue(result, i, 0);
 
-               vacuum_one_database(connstr.data, vacopts,
+               vacuum_one_database(cparams, vacopts,
                                    stage,
                                    NULL,
-                                   host, port, username, prompt_password,
                                    concurrentCons,
                                    progname, echo, quiet);
            }
@@ -801,19 +795,15 @@ vacuum_all_databases(vacuumingOptions *vacopts,
    {
        for (i = 0; i < PQntuples(result); i++)
        {
-           resetPQExpBuffer(&connstr);
-           appendPQExpBuffer(&connstr, "dbname=");
-           appendConnStrVal(&connstr, PQgetvalue(result, i, 0));
+           cparams->override_dbname = PQgetvalue(result, i, 0);
 
-           vacuum_one_database(connstr.data, vacopts,
+           vacuum_one_database(cparams, vacopts,
                                ANALYZE_NO_STAGE,
                                NULL,
-                               host, port, username, prompt_password,
                                concurrentCons,
                                progname, echo, quiet);
        }
    }
-   termPQExpBuffer(&connstr);
 
    PQclear(result);
 }

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index 15fff91e16150e3b68abf6e5008c3b3f0f89cf07..28100c9fbb3cfeae49622c1bf283bd67c6fe15d3 100644 (file)
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -16,15 +16,10 @@
 #include "fe_utils/string_utils.h"
 
 
-static void cluster_one_database(const char *dbname, bool verbose, const char *table,
-                                const char *host, const char *port,
-                                const char *username, enum trivalue prompt_password,
-                                const char *progname, bool echo);
-static void cluster_all_databases(bool verbose, const char *maintenance_db,
-                                 const char *host, const char *port,
-                                 const char *username, enum trivalue prompt_password,
-                                 const char *progname, bool echo, bool quiet);
-
+static void cluster_one_database(const ConnParams *cparams, const char *table,
+                                const char *progname, bool verbose, bool echo);
+static void cluster_all_databases(ConnParams *cparams, const char *progname,
+                                 bool verbose, bool echo, bool quiet);
 static void help(const char *progname);
 
 
@@ -57,6 +52,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        quiet = false;
    bool        alldb = false;
@@ -133,6 +129,13 @@ main(int argc, char *argv[])
        exit(1);
    }
 
+   /* fill cparams except for dbname, which is set below */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
    setup_cancel_handler();
 
    if (alldb)
@@ -149,8 +152,9 @@ main(int argc, char *argv[])
            exit(1);
        }
 
-       cluster_all_databases(verbose, maintenance_db, host, port, username, prompt_password,
-                             progname, echo, quiet);
+       cparams.dbname = maintenance_db;
+
+       cluster_all_databases(&cparams, progname, verbose, echo, quiet);
    }
    else
    {
@@ -164,21 +168,21 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
+       cparams.dbname = dbname;
+
        if (tables.head != NULL)
        {
            SimpleStringListCell *cell;
 
            for (cell = tables.head; cell; cell = cell->next)
            {
-               cluster_one_database(dbname, verbose, cell->val,
-                                    host, port, username, prompt_password,
-                                    progname, echo);
+               cluster_one_database(&cparams, cell->val,
+                                    progname, verbose, echo);
            }
        }
        else
-           cluster_one_database(dbname, verbose, NULL,
-                                host, port, username, prompt_password,
-                                progname, echo);
+           cluster_one_database(&cparams, NULL,
+                                progname, verbose, echo);
    }
 
    exit(0);
@@ -186,17 +190,14 @@ main(int argc, char *argv[])
 
 
 static void
-cluster_one_database(const char *dbname, bool verbose, const char *table,
-                    const char *host, const char *port,
-                    const char *username, enum trivalue prompt_password,
-                    const char *progname, bool echo)
+cluster_one_database(const ConnParams *cparams, const char *table,
+                    const char *progname, bool verbose, bool echo)
 {
    PQExpBufferData sql;
 
    PGconn     *conn;
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, false);
+   conn = connectDatabase(cparams, progname, echo, false, false);
 
    initPQExpBuffer(&sql);
 
@@ -227,22 +228,17 @@ cluster_one_database(const char *dbname, bool verbose, const char *table,
 
 
 static void
-cluster_all_databases(bool verbose, const char *maintenance_db,
-                     const char *host, const char *port,
-                     const char *username, enum trivalue prompt_password,
-                     const char *progname, bool echo, bool quiet)
+cluster_all_databases(ConnParams *cparams, const char *progname,
+                     bool verbose, bool echo, bool quiet)
 {
    PGconn     *conn;
    PGresult   *result;
-   PQExpBufferData connstr;
    int         i;
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   conn = connectMaintenanceDatabase(cparams, progname, echo);
    result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;", progname, echo);
    PQfinish(conn);
 
-   initPQExpBuffer(&connstr);
    for (i = 0; i < PQntuples(result); i++)
    {
        char       *dbname = PQgetvalue(result, i, 0);
@@ -253,15 +249,10 @@ cluster_all_databases(bool verbose, const char *maintenance_db,
            fflush(stdout);
        }
 
-       resetPQExpBuffer(&connstr);
-       appendPQExpBuffer(&connstr, "dbname=");
-       appendConnStrVal(&connstr, dbname);
+       cparams->override_dbname = dbname;
 
-       cluster_one_database(connstr.data, verbose, NULL,
-                            host, port, username, prompt_password,
-                            progname, echo);
+       cluster_one_database(cparams, NULL, progname, verbose, echo);
    }
-   termPQExpBuffer(&connstr);
 
    PQclear(result);
 }

diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
index 296029d809308d94765c94d06e30927694c6018a..7f4b635571df0f178aaa1ddd9d7b485625175b2b 100644 (file)
--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -58,7 +58,7 @@ handle_help_version_opts(int argc, char *argv[],
  * Make a database connection with the given parameters.
  *
  * An interactive password prompt is automatically issued if needed and
- * allowed by prompt_password.
+ * allowed by cparams->prompt_password.
  *
  * If allow_password_reuse is true, we will try to re-use any password
  * given during previous calls to this routine.  (Callers should not pass
@@ -66,9 +66,7 @@ handle_help_version_opts(int argc, char *argv[],
  * as before, else we might create password exposure hazards.)
  */
 PGconn *
-connectDatabase(const char *dbname, const char *pghost,
-               const char *pgport, const char *pguser,
-               enum trivalue prompt_password, const char *progname,
+connectDatabase(const ConnParams *cparams, const char *progname,
                bool echo, bool fail_ok, bool allow_password_reuse)
 {
    PGconn     *conn;
@@ -76,10 +74,13 @@ connectDatabase(const char *dbname, const char *pghost,
    static bool have_password = false;
    static char password[100];
 
+   /* Callers must supply at least dbname; other params can be NULL */
+   Assert(cparams->dbname);
+
    if (!allow_password_reuse)
        have_password = false;
 
-   if (!have_password && prompt_password == TRI_YES)
+   if (cparams->prompt_password == TRI_YES && !have_password)
    {
        simple_prompt("Password: ", password, sizeof(password), false);
        have_password = true;
@@ -91,23 +92,35 @@ connectDatabase(const char *dbname, const char *pghost,
     */
    do
    {
-       const char *keywords[7];
-       const char *values[7];
-
-       keywords[0] = "host";
-       values[0] = pghost;
-       keywords[1] = "port";
-       values[1] = pgport;
-       keywords[2] = "user";
-       values[2] = pguser;
-       keywords[3] = "password";
-       values[3] = have_password ? password : NULL;
-       keywords[4] = "dbname";
-       values[4] = dbname;
-       keywords[5] = "fallback_application_name";
-       values[5] = progname;
-       keywords[6] = NULL;
-       values[6] = NULL;
+       const char *keywords[8];
+       const char *values[8];
+       int         i = 0;
+
+       /*
+        * If dbname is a connstring, its entries can override the other
+        * values obtained from cparams; but in turn, override_dbname can
+        * override the dbname component of it.
+        */
+       keywords[i] = "host";
+       values[i++] = cparams->pghost;
+       keywords[i] = "port";
+       values[i++] = cparams->pgport;
+       keywords[i] = "user";
+       values[i++] = cparams->pguser;
+       keywords[i] = "password";
+       values[i++] = have_password ? password : NULL;
+       keywords[i] = "dbname";
+       values[i++] = cparams->dbname;
+       if (cparams->override_dbname)
+       {
+           keywords[i] = "dbname";
+           values[i++] = cparams->override_dbname;
+       }
+       keywords[i] = "fallback_application_name";
+       values[i++] = progname;
+       keywords[i] = NULL;
+       values[i++] = NULL;
+       Assert(i <= lengthof(keywords));
 
        new_pass = false;
        conn = PQconnectdbParams(keywords, values, true);
@@ -115,7 +128,7 @@ connectDatabase(const char *dbname, const char *pghost,
        if (!conn)
        {
            pg_log_error("could not connect to database %s: out of memory",
-                        dbname);
+                        cparams->dbname);
            exit(1);
        }
 
@@ -124,7 +137,7 @@ connectDatabase(const char *dbname, const char *pghost,
         */
        if (PQstatus(conn) == CONNECTION_BAD &&
            PQconnectionNeedsPassword(conn) &&
-           prompt_password != TRI_NO)
+           cparams->prompt_password != TRI_NO)
        {
            PQfinish(conn);
            simple_prompt("Password: ", password, sizeof(password), false);
@@ -142,10 +155,11 @@ connectDatabase(const char *dbname, const char *pghost,
            return NULL;
        }
        pg_log_error("could not connect to database %s: %s",
-                    dbname, PQerrorMessage(conn));
+                    cparams->dbname, PQerrorMessage(conn));
        exit(1);
    }
 
+   /* Start strict; callers may override this. */
    PQclear(executeQuery(conn, ALWAYS_SECURE_SEARCH_PATH_SQL,
                         progname, echo));
 
@@ -154,27 +168,30 @@ connectDatabase(const char *dbname, const char *pghost,
 
 /*
  * Try to connect to the appropriate maintenance database.
+ *
+ * This differs from connectDatabase only in that it has a rule for
+ * inserting a default "dbname" if none was given (which is why cparams
+ * is not const).  Note that cparams->dbname should typically come from
+ * a --maintenance-db command line parameter.
  */
 PGconn *
-connectMaintenanceDatabase(const char *maintenance_db,
-                          const char *pghost, const char *pgport,
-                          const char *pguser, enum trivalue prompt_password,
+connectMaintenanceDatabase(ConnParams *cparams,
                           const char *progname, bool echo)
 {
    PGconn     *conn;
 
    /* If a maintenance database name was specified, just connect to it. */
-   if (maintenance_db)
-       return connectDatabase(maintenance_db, pghost, pgport, pguser,
-                              prompt_password, progname, echo, false, false);
+   if (cparams->dbname)
+       return connectDatabase(cparams, progname, echo, false, false);
 
    /* Otherwise, try postgres first and then template1. */
-   conn = connectDatabase("postgres", pghost, pgport, pguser, prompt_password,
-                          progname, echo, true, false);
+   cparams->dbname = "postgres";
+   conn = connectDatabase(cparams, progname, echo, true, false);
    if (!conn)
-       conn = connectDatabase("template1", pghost, pgport, pguser,
-                              prompt_password, progname, echo, false, false);
-
+   {
+       cparams->dbname = "template1";
+       conn = connectDatabase(cparams, progname, echo, false, false);
+   }
    return conn;
 }
 

diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
index 35d1a3e0d516dd7e62479ce0b38ca11f255e5aa0..37fc48aa697a8cb378b9736c8f7d1d3c2e2c356a 100644 (file)
--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -23,20 +23,32 @@ enum trivalue
 
 extern bool CancelRequested;
 
+/* Parameters needed by connectDatabase/connectMaintenanceDatabase */
+typedef struct _connParams
+{
+   /* These fields record the actual command line parameters */
+   const char *dbname;         /* this may be a connstring! */
+   const char *pghost;
+   const char *pgport;
+   const char *pguser;
+   enum trivalue prompt_password;
+   /* If not NULL, this overrides the dbname obtained from command line */
+   /* (but *only* the DB name, not anything else in the connstring) */
+   const char *override_dbname;
+} ConnParams;
+
 typedef void (*help_handler) (const char *progname);
 
 extern void handle_help_version_opts(int argc, char *argv[],
                                     const char *fixed_progname,
                                     help_handler hlp);
 
-extern PGconn *connectDatabase(const char *dbname, const char *pghost,
-                              const char *pgport, const char *pguser,
-                              enum trivalue prompt_password, const char *progname,
-                              bool echo, bool fail_ok, bool allow_password_reuse);
+extern PGconn *connectDatabase(const ConnParams *cparams,
+                              const char *progname,
+                              bool echo, bool fail_ok,
+                              bool allow_password_reuse);
 
-extern PGconn *connectMaintenanceDatabase(const char *maintenance_db,
-                                         const char *pghost, const char *pgport,
-                                         const char *pguser, enum trivalue prompt_password,
+extern PGconn *connectMaintenanceDatabase(ConnParams *cparams,
                                          const char *progname, bool echo);
 
 extern PGresult *executeQuery(PGconn *conn, const char *query,

diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 67f376f51a72e92be4007da3a8776587621ea111..b4d3e134d932fe8c2d9640c7eeb6891b2384e8d1 100644 (file)
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -51,6 +51,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    char       *owner = NULL;
    char       *tablespace = NULL;
@@ -180,8 +181,14 @@ main(int argc, char *argv[])
    if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0)
        maintenance_db = "template1";
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   cparams.dbname = maintenance_db;
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
 
    initPQExpBuffer(&sql);
 

diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index e17ae2ea32ce7f53b3e8550d847f87e2d8493015..dbc2c2a58cd1308afaf031cd7b4635a76ded9e8f 100644 (file)
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -61,6 +61,7 @@ main(int argc, char *argv[])
    char       *username = NULL;
    SimpleStringList roles = {NULL, NULL};
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        interactive = false;
    int         conn_limit = -2;    /* less than minimum valid value */
@@ -261,8 +262,14 @@ main(int argc, char *argv[])
    if (login == 0)
        login = TRI_YES;
 
-   conn = connectDatabase("postgres", host, port, username, prompt_password,
-                          progname, echo, false, false);
+   cparams.dbname = NULL;      /* this program lacks any dbname option... */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
 
    initPQExpBuffer(&sql);
 

diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index dacd8e5f1dcc9a60c6370c703d402591923f1e74..ffdf12bfea7f9e4fb3f671001316ddaf2c4ed227 100644 (file)
--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -47,6 +47,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        interactive = false;
 
@@ -130,9 +131,14 @@ main(int argc, char *argv[])
    if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0)
        maintenance_db = "template1";
 
-   conn = connectMaintenanceDatabase(maintenance_db,
-                                     host, port, username, prompt_password,
-                                     progname, echo);
+   cparams.dbname = maintenance_db;
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
 
    if (echo)
        printf("%s\n", sql.data);

diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 3501a06ecb1105728a760aa8f4f9e00017985887..a8be6b0784b949ee60d2beb9487554f80187e543 100644 (file)
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -45,6 +45,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        interactive = false;
    char        dropuser_buf[128];
@@ -131,13 +132,19 @@ main(int argc, char *argv[])
            exit(0);
    }
 
+   cparams.dbname = NULL;      /* this program lacks any dbname option... */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
+   conn = connectMaintenanceDatabase(&cparams, progname, echo);
+
    initPQExpBuffer(&sql);
    appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
                      (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
 
-   conn = connectDatabase("postgres", host, port, username, prompt_password,
-                          progname, echo, false, false);
-
    if (echo)
        printf("%s\n", sql.data);
    result = PQexec(conn, sql.data);

diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index bec57589d33a67e5e19a6027255dbc83808193e4..5281e993b4306d07292f1e92d87f508edaf6491b 100644 (file)
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -16,19 +16,14 @@
 #include "fe_utils/string_utils.h"
 
 
-static void reindex_one_database(const char *name, const char *dbname,
-                                const char *type, const char *host,
-                                const char *port, const char *username,
-                                enum trivalue prompt_password, const char *progname,
+static void reindex_one_database(const ConnParams *cparams,
+                                const char *type, const char *name,
+                                const char *progname,
                                 bool echo, bool verbose, bool concurrently);
-static void reindex_all_databases(const char *maintenance_db,
-                                 const char *host, const char *port,
-                                 const char *username, enum trivalue prompt_password,
+static void reindex_all_databases(ConnParams *cparams,
                                  const char *progname, bool echo,
                                  bool quiet, bool verbose, bool concurrently);
-static void reindex_system_catalogs(const char *dbname,
-                                   const char *host, const char *port,
-                                   const char *username, enum trivalue prompt_password,
+static void reindex_system_catalogs(const ConnParams *cparams,
                                    const char *progname, bool echo, bool verbose,
                                    bool concurrently);
 static void help(const char *progname);
@@ -66,6 +61,7 @@ main(int argc, char *argv[])
    const char *port = NULL;
    const char *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        syscatalog = false;
    bool        alldb = false;
    bool        echo = false;
@@ -159,6 +155,13 @@ main(int argc, char *argv[])
        exit(1);
    }
 
+   /* fill cparams except for dbname, which is set below */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
    setup_cancel_handler();
 
    if (alldb)
@@ -189,8 +192,10 @@ main(int argc, char *argv[])
            exit(1);
        }
 
-       reindex_all_databases(maintenance_db, host, port, username,
-                             prompt_password, progname, echo, quiet, verbose, concurrently);
+       cparams.dbname = maintenance_db;
+
+       reindex_all_databases(&cparams,
+                             progname, echo, quiet, verbose, concurrently);
    }
    else if (syscatalog)
    {
@@ -220,7 +225,9 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
-       reindex_system_catalogs(dbname, host, port, username, prompt_password,
+       cparams.dbname = dbname;
+
+       reindex_system_catalogs(&cparams,
                                progname, echo, verbose, concurrently);
    }
    else
@@ -235,14 +242,16 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
+       cparams.dbname = dbname;
+
        if (schemas.head != NULL)
        {
            SimpleStringListCell *cell;
 
            for (cell = schemas.head; cell; cell = cell->next)
            {
-               reindex_one_database(cell->val, dbname, "SCHEMA", host, port,
-                                    username, prompt_password, progname, echo, verbose, concurrently);
+               reindex_one_database(&cparams, "SCHEMA", cell->val,
+                                    progname, echo, verbose, concurrently);
            }
        }
 
@@ -252,8 +261,8 @@ main(int argc, char *argv[])
 
            for (cell = indexes.head; cell; cell = cell->next)
            {
-               reindex_one_database(cell->val, dbname, "INDEX", host, port,
-                                    username, prompt_password, progname, echo, verbose, concurrently);
+               reindex_one_database(&cparams, "INDEX", cell->val,
+                                    progname, echo, verbose, concurrently);
            }
        }
        if (tables.head != NULL)
@@ -262,8 +271,8 @@ main(int argc, char *argv[])
 
            for (cell = tables.head; cell; cell = cell->next)
            {
-               reindex_one_database(cell->val, dbname, "TABLE", host, port,
-                                    username, prompt_password, progname, echo, verbose, concurrently);
+               reindex_one_database(&cparams, "TABLE", cell->val,
+                                    progname, echo, verbose, concurrently);
            }
        }
 
@@ -272,25 +281,24 @@ main(int argc, char *argv[])
         * specified
         */
        if (indexes.head == NULL && tables.head == NULL && schemas.head == NULL)
-           reindex_one_database(NULL, dbname, "DATABASE", host, port,
-                                username, prompt_password, progname, echo, verbose, concurrently);
+           reindex_one_database(&cparams, "DATABASE", NULL,
+                                progname, echo, verbose, concurrently);
    }
 
    exit(0);
 }
 
 static void
-reindex_one_database(const char *name, const char *dbname, const char *type,
-                    const char *host, const char *port, const char *username,
-                    enum trivalue prompt_password, const char *progname, bool echo,
-                    bool verbose, bool concurrently)
+reindex_one_database(const ConnParams *cparams,
+                    const char *type, const char *name,
+                    const char *progname,
+                    bool echo, bool verbose, bool concurrently)
 {
    PQExpBufferData sql;
 
    PGconn     *conn;
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, false);
+   conn = connectDatabase(cparams, progname, echo, false, false);
 
    if (concurrently && PQserverVersion(conn) < 120000)
    {
@@ -343,23 +351,18 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
 }
 
 static void
-reindex_all_databases(const char *maintenance_db,
-                     const char *host, const char *port,
-                     const char *username, enum trivalue prompt_password,
+reindex_all_databases(ConnParams *cparams,
                      const char *progname, bool echo, bool quiet, bool verbose,
                      bool concurrently)
 {
    PGconn     *conn;
    PGresult   *result;
-   PQExpBufferData connstr;
    int         i;
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   conn = connectMaintenanceDatabase(cparams, progname, echo);
    result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;", progname, echo);
    PQfinish(conn);
 
-   initPQExpBuffer(&connstr);
    for (i = 0; i < PQntuples(result); i++)
    {
        char       *dbname = PQgetvalue(result, i, 0);
@@ -370,29 +373,23 @@ reindex_all_databases(const char *maintenance_db,
            fflush(stdout);
        }
 
-       resetPQExpBuffer(&connstr);
-       appendPQExpBuffer(&connstr, "dbname=");
-       appendConnStrVal(&connstr, dbname);
+       cparams->override_dbname = dbname;
 
-       reindex_one_database(NULL, connstr.data, "DATABASE", host,
-                            port, username, prompt_password,
+       reindex_one_database(cparams, "DATABASE", NULL,
                             progname, echo, verbose, concurrently);
    }
-   termPQExpBuffer(&connstr);
 
    PQclear(result);
 }
 
 static void
-reindex_system_catalogs(const char *dbname, const char *host, const char *port,
-                       const char *username, enum trivalue prompt_password,
+reindex_system_catalogs(const ConnParams *cparams,
                        const char *progname, bool echo, bool verbose, bool concurrently)
 {
    PGconn     *conn;
    PQExpBufferData sql;
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, false);
+   conn = connectDatabase(cparams, progname, echo, false, false);
 
    initPQExpBuffer(&sql);
 

diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 2814c034d4ec300d25e44fe647dca0fb91cf3358..d0db3fb88329d6b4470c62e694e881082b31b617 100644 (file)
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -53,19 +53,16 @@ typedef struct vacuumingOptions
 } vacuumingOptions;
 
 
-static void vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
+static void vacuum_one_database(const ConnParams *cparams,
+                               vacuumingOptions *vacopts,
                                int stage,
                                SimpleStringList *tables,
-                               const char *host, const char *port,
-                               const char *username, enum trivalue prompt_password,
                                int concurrentCons,
                                const char *progname, bool echo, bool quiet);
 
-static void vacuum_all_databases(vacuumingOptions *vacopts,
+static void vacuum_all_databases(ConnParams *cparams,
+                                vacuumingOptions *vacopts,
                                 bool analyze_in_stages,
-                                const char *maintenance_db,
-                                const char *host, const char *port,
-                                const char *username, enum trivalue prompt_password,
                                 int concurrentCons,
                                 const char *progname, bool echo, bool quiet);
 
@@ -134,6 +131,7 @@ main(int argc, char *argv[])
    char       *port = NULL;
    char       *username = NULL;
    enum trivalue prompt_password = TRI_DEFAULT;
+   ConnParams  cparams;
    bool        echo = false;
    bool        quiet = false;
    vacuumingOptions vacopts;
@@ -287,6 +285,13 @@ main(int argc, char *argv[])
        /* allow 'and_analyze' with 'analyze_only' */
    }
 
+   /* fill cparams except for dbname, which is set below */
+   cparams.pghost = host;
+   cparams.pgport = port;
+   cparams.pguser = username;
+   cparams.prompt_password = prompt_password;
+   cparams.override_dbname = NULL;
+
    setup_cancel_handler();
 
    /* Avoid opening extra connections. */
@@ -306,10 +311,10 @@ main(int argc, char *argv[])
            exit(1);
        }
 
-       vacuum_all_databases(&vacopts,
+       cparams.dbname = maintenance_db;
+
+       vacuum_all_databases(&cparams, &vacopts,
                             analyze_in_stages,
-                            maintenance_db,
-                            host, port, username, prompt_password,
                             concurrentCons,
                             progname, echo, quiet);
    }
@@ -325,25 +330,25 @@ main(int argc, char *argv[])
                dbname = get_user_name_or_exit(progname);
        }
 
+       cparams.dbname = dbname;
+
        if (analyze_in_stages)
        {
            int         stage;
 
            for (stage = 0; stage < ANALYZE_NUM_STAGES; stage++)
            {
-               vacuum_one_database(dbname, &vacopts,
+               vacuum_one_database(&cparams, &vacopts,
                                    stage,
                                    &tables,
-                                   host, port, username, prompt_password,
                                    concurrentCons,
                                    progname, echo, quiet);
            }
        }
        else
-           vacuum_one_database(dbname, &vacopts,
+           vacuum_one_database(&cparams, &vacopts,
                                ANALYZE_NO_STAGE,
                                &tables,
-                               host, port, username, prompt_password,
                                concurrentCons,
                                progname, echo, quiet);
    }
@@ -365,11 +370,10 @@ main(int argc, char *argv[])
  * a list of tables from the database.
  */
 static void
-vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
+vacuum_one_database(const ConnParams *cparams,
+                   vacuumingOptions *vacopts,
                    int stage,
                    SimpleStringList *tables,
-                   const char *host, const char *port,
-                   const char *username, enum trivalue prompt_password,
                    int concurrentCons,
                    const char *progname, bool echo, bool quiet)
 {
@@ -401,8 +405,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
    Assert(stage == ANALYZE_NO_STAGE ||
           (stage >= 0 && stage < ANALYZE_NUM_STAGES));
 
-   conn = connectDatabase(dbname, host, port, username, prompt_password,
-                          progname, echo, false, true);
+   conn = connectDatabase(cparams, progname, echo, false, true);
 
    if (vacopts->disable_page_skipping && PQserverVersion(conn) < 90600)
    {
@@ -629,8 +632,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
    {
        for (i = 1; i < concurrentCons; i++)
        {
-           conn = connectDatabase(dbname, host, port, username, prompt_password,
-                                  progname, echo, false, true);
+           conn = connectDatabase(cparams, progname, echo, false, true);
 
            /*
             * Fail and exit immediately if trying to use a socket in an
@@ -748,28 +750,23 @@ finish:
  * quickly everywhere before generating more detailed ones.
  */
 static void
-vacuum_all_databases(vacuumingOptions *vacopts,
+vacuum_all_databases(ConnParams *cparams,
+                    vacuumingOptions *vacopts,
                     bool analyze_in_stages,
-                    const char *maintenance_db, const char *host,
-                    const char *port, const char *username,
-                    enum trivalue prompt_password,
                     int concurrentCons,
                     const char *progname, bool echo, bool quiet)
 {
    PGconn     *conn;
    PGresult   *result;
-   PQExpBufferData connstr;
    int         stage;
    int         i;
 
-   conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-                                     prompt_password, progname, echo);
+   conn = connectMaintenanceDatabase(cparams, progname, echo);
    result = executeQuery(conn,
                          "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;",
                          progname, echo);
    PQfinish(conn);
 
-   initPQExpBuffer(&connstr);
    if (analyze_in_stages)
    {
        /*
@@ -784,14 +781,11 @@ vacuum_all_databases(vacuumingOptions *vacopts,
        {
            for (i = 0; i < PQntuples(result); i++)
            {
-               resetPQExpBuffer(&connstr);
-               appendPQExpBuffer(&connstr, "dbname=");
-               appendConnStrVal(&connstr, PQgetvalue(result, i, 0));
+               cparams->override_dbname = PQgetvalue(result, i, 0);
 
-               vacuum_one_database(connstr.data, vacopts,
+               vacuum_one_database(cparams, vacopts,
                                    stage,
                                    NULL,
-                                   host, port, username, prompt_password,
                                    concurrentCons,
                                    progname, echo, quiet);
            }
@@ -801,19 +795,15 @@ vacuum_all_databases(vacuumingOptions *vacopts,
    {
        for (i = 0; i < PQntuples(result); i++)
        {
-           resetPQExpBuffer(&connstr);
-           appendPQExpBuffer(&connstr, "dbname=");
-           appendConnStrVal(&connstr, PQgetvalue(result, i, 0));
+           cparams->override_dbname = PQgetvalue(result, i, 0);
 
-           vacuum_one_database(connstr.data, vacopts,
+           vacuum_one_database(cparams, vacopts,
                                ANALYZE_NO_STAGE,
                                NULL,
-                               host, port, username, prompt_password,
                                concurrentCons,
                                progname, echo, quiet);
        }
    }
-   termPQExpBuffer(&connstr);
 
    PQclear(result);
 }