Remove gratuitous response messages from utility programs.

(Possibly release notes material, lest users be confused.)

The --quiet option is now obsolete and without effect in createdb,
createuser, dropdb, dropuser; kept for compatibility but marked for
removal in 8.4.

Progress messages when acting on all databases now go to stdout instead
of stderr, since they are not in fact errors.

Ordered options in reindexdb reference page alphabetically, like in
other programs' pages.

diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index b75fef1e00e83bf9e41b82d386f1d21e683b1558..fa62349cdb2f63bf32a8ccf0ecaa5144aa1bcdbf 100644 (file)
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -102,7 +102,7 @@ PostgreSQL documentation
       <term><option>--quiet</></term>
       <listitem>
        <para>
-        Do not display a response.
+        Do not display progress messages.
        </para>
       </listitem>
      </varlistentry>

diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 4b9e2a05126c5fbb066da15d79dd35ec71899212..71faa27d0919fe071d7254cc8ba13ccbcc587d6e 100644 (file)
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -129,16 +129,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
-      <listitem>
-       <para>
-        Do not display a response.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>-T <replaceable class="parameter">template</replaceable></></term>
       <term><option>--template <replaceable class="parameter">template</replaceable></></term>

diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index be0f82af701be124cbf1e497b9e785a4ff290af7..8d22fc065345073337bdfa7c7408a4fa7eb6fcc8 100644 (file)
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -242,16 +242,6 @@ PostgreSQL documentation
        </para>
       </listitem>
      </varlistentry>
-
-     <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
-      <listitem>
-       <para>
-        Do not display a response.
-       </para>
-      </listitem>
-     </varlistentry>
     </variablelist>
   </para>
 

diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml
index 9f7914b5326d928e9a5a287e67fe58c6e2d1d9d9..66735651cc956a089a339b567ea22f0ac3c87bc2 100644 (file)
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -85,16 +85,6 @@ PostgreSQL documentation
        </para>
       </listitem>
      </varlistentry>
-
-     <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
-      <listitem>
-       <para>
-        Do not display a response.
-       </para>
-      </listitem>
-     </varlistentry>
     </variablelist>
   </para>
 

diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml
index 72d2e9a80e069ffe349c47371b0dfbf4454517dd..2aa1f5f008f89b83e2ac81ae89d3652a674dba65 100644 (file)
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -87,16 +87,6 @@ PostgreSQL documentation
        </para>
       </listitem>
      </varlistentry>
-
-     <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
-      <listitem>
-       <para>
-        Do not display a response.
-       </para>
-      </listitem>
-     </varlistentry>
     </variablelist>
   </para>
 

diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index 657930d9e5293374bfd203253800a82ab7fdb2a6..e4469bb12effd7bb54d084beff109d8fdd4610b8 100644 (file)
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -75,21 +75,27 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-s</></term>
-      <term><option>--system</></term>
+      <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
+      <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
       <listitem>
        <para>
-        Reindex database's system catalogs.
+        Specifies the name of the database to be reindexed.
+        If this is not specified and <option>-a</option> (or
+        <option>--all</option>) is not used, the database name is read
+        from the environment variable <envar>PGDATABASE</envar>.  If
+        that is not set, the user name specified for the connection is
+        used.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-t <replaceable class="parameter">table</replaceable></></term>
-      <term><option>--table <replaceable class="parameter">table</replaceable></></term>
+      <term><option>-e</></term>
+      <term><option>--echo</></term>
       <listitem>
        <para>
-        Reindex <replaceable class="parameter">table</replaceable> only.
+        Echo the commands that <application>reindexdb</application> generates
+        and sends to the server.
        </para>
       </listitem>
      </varlistentry>
@@ -105,41 +111,34 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
-      <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>-q</></term>
+      <term><option>--quiet</></term>
       <listitem>
        <para>
-        Specifies the name of the database to be reindexed.
-        If this is not specified and <option>-a</option> (or
-        <option>--all</option>) is not used, the database name is read
-        from the environment variable <envar>PGDATABASE</envar>.  If
-        that is not set, the user name specified for the connection is
-        used.
+        Do not display progress messages.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-e</></term>
-      <term><option>--echo</></term>
+      <term><option>-s</></term>
+      <term><option>--system</></term>
       <listitem>
        <para>
-        Echo the commands that <application>reindexdb</application> generates
-        and sends to the server.
+        Reindex database's system catalogs.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
+      <term><option>-t <replaceable class="parameter">table</replaceable></></term>
+      <term><option>--table <replaceable class="parameter">table</replaceable></></term>
       <listitem>
        <para>
-        Do not display a response.
+        Reindex <replaceable class="parameter">table</replaceable> only.
        </para>
       </listitem>
      </varlistentry>
-
     </variablelist>
    </para>
 

diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index ad90a00ef767b0cf69c7aec47f744eeabcdba1ef..6b6493ef9605eea42dfa14330915744eee65c085 100644 (file)
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -119,7 +119,7 @@ PostgreSQL documentation
       <term><option>--quiet</></term>
       <listitem>
        <para>
-        Do not display a response.
+        Do not display progress messages.
        </para>
       </listitem>
      </varlistentry>

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index a4c8949bc33e3851034adf5a1aa370ca235ee245..2422693ef0ac738fa1562824c9cb92a8807c8f1d 100644 (file)
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -17,7 +17,7 @@
 static void cluster_one_database(const char *dbname, const char *table,
                                         const char *host, const char *port,
                                         const char *username, bool password,
-                                        const char *progname, bool echo, bool quiet);
+                                        const char *progname, bool echo);
 static void cluster_all_databases(const char *host, const char *port,
                                          const char *username, bool password,
                                          const char *progname, bool echo, bool quiet);
@@ -145,7 +145,7 @@ main(int argc, char *argv[])
 
                cluster_one_database(dbname, table,
                                                         host, port, username, password,
-                                                        progname, echo, quiet);
+                                                        progname, echo);
        }
 
        exit(0);
@@ -156,7 +156,7 @@ static void
 cluster_one_database(const char *dbname, const char *table,
                                         const char *host, const char *port,
                                         const char *username, bool password,
-                                        const char *progname, bool echo, bool quiet)
+                                        const char *progname, bool echo)
 {
        PQExpBufferData sql;
 
@@ -183,12 +183,6 @@ cluster_one_database(const char *dbname, const char *table,
        }
        PQfinish(conn);
        termPQExpBuffer(&sql);
-
-       if (!quiet)
-       {
-               puts("CLUSTER");
-               fflush(stdout);
-       }
 }
 
 
@@ -210,11 +204,14 @@ cluster_all_databases(const char *host, const char *port,
                char       *dbname = PQgetvalue(result, i, 0);
 
                if (!quiet)
-                       fprintf(stderr, _("%s: clustering database \"%s\"\n"), progname, dbname);
+               {
+                       printf(_("%s: clustering database \"%s\"\n"), progname, dbname);
+                       fflush(stdout);
+               }
 
                cluster_one_database(dbname, NULL,
                                                         host, port, username, password,
-                                                        progname, echo, quiet);
+                                                        progname, echo);
        }
 
        PQclear(result);

diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 00d55207e8491029014d93ca2db53739e4ecc106..8a8bcd8504671fe8e5d7085aaf2f501ec11e8075 100644 (file)
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -48,7 +48,6 @@ main(int argc, char *argv[])
        char       *username = NULL;
        bool            password = false;
        bool            echo = false;
-       bool            quiet = false;
        char       *owner = NULL;
        char       *tablespace = NULL;
        char       *template = NULL;
@@ -84,7 +83,7 @@ main(int argc, char *argv[])
                                echo = true;
                                break;
                        case 'q':
-                               quiet = true;
+                               /* obsolete; remove in 8.4 */
                                break;
                        case 'O':
                                owner = optarg;
@@ -175,12 +174,6 @@ main(int argc, char *argv[])
        PQclear(result);
        PQfinish(conn);
 
-       if (!quiet)
-       {
-               puts("CREATE DATABASE");
-               fflush(stdout);
-       }
-
        if (comment)
        {
                conn = connectDatabase(dbname, host, port, username, password, progname);
@@ -203,11 +196,6 @@ main(int argc, char *argv[])
 
                PQclear(result);
                PQfinish(conn);
-               if (!quiet)
-               {
-                       puts("COMMENT");
-                       fflush(stdout);
-               }
        }
 
        exit(0);
@@ -226,7 +214,6 @@ help(const char *progname)
        printf(_("  -O, --owner=OWNER            database user to own the new database\n"));
        printf(_("  -T, --template=TEMPLATE      template database to copy\n"));
        printf(_("  -e, --echo                   show the commands being sent to the server\n"));
-       printf(_("  -q, --quiet                  don't write any messages\n"));
        printf(_("  --help                       show this help, then exit\n"));
        printf(_("  --version                    output version information, then exit\n"));
        printf(_("\nConnection options:\n"));

diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index d6e63311747378d31edc5707e33e8195b5270828..db89ff725a771d555ae2fd0074d75e3a9980c7e5 100644 (file)
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -63,7 +63,6 @@ main(int argc, char *argv[])
        char       *username = NULL;
        bool            password = false;
        bool            echo = false;
-       bool            quiet = false;
        char       *conn_limit = NULL;
        bool            pwprompt = false;
        char       *newpassword = NULL;
@@ -107,7 +106,7 @@ main(int argc, char *argv[])
                                echo = true;
                                break;
                        case 'q':
-                               quiet = true;
+                               /* obsolete; remove in 8.4 */
                                break;
                        case 'd':
                                createdb = TRI_YES;
@@ -297,11 +296,6 @@ main(int argc, char *argv[])
 
        PQclear(result);
        PQfinish(conn);
-       if (!quiet)
-       {
-               puts("CREATE ROLE");
-               fflush(stdout);
-       }
        exit(0);
 }
 
@@ -329,7 +323,6 @@ help(const char *progname)
        printf(_("  -E, --encrypted           encrypt stored password\n"));
        printf(_("  -N, --unencrypted         do not encrypt stored password\n"));
        printf(_("  -e, --echo                show the commands being sent to the server\n"));
-       printf(_("  -q, --quiet               don't write any messages\n"));
        printf(_("  --help                    show this help, then exit\n"));
        printf(_("  --version                 output version information, then exit\n"));
        printf(_("\nConnection options:\n"));

diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index b678c887c5a084ab7128664d65c8448da50c76ee..88d508c67a6d877847ca47bb6f5d7a01ddec0581 100644 (file)
--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -42,7 +42,6 @@ main(int argc, char *argv[])
        char       *username = NULL;
        bool            password = false;
        bool            echo = false;
-       bool            quiet = false;
        bool            interactive = false;
 
        PQExpBufferData sql;
@@ -75,7 +74,7 @@ main(int argc, char *argv[])
                                echo = true;
                                break;
                        case 'q':
-                               quiet = true;
+                               /* obsolete; remove in 8.4 */
                                break;
                        case 'i':
                                interactive = true;
@@ -130,11 +129,6 @@ main(int argc, char *argv[])
 
        PQclear(result);
        PQfinish(conn);
-       if (!quiet)
-       {
-               puts("DROP DATABASE");
-               fflush(stdout);
-       }
        exit(0);
 }
 
@@ -148,7 +142,6 @@ help(const char *progname)
        printf(_("\nOptions:\n"));
        printf(_("  -e, --echo                show the commands being sent to the server\n"));
        printf(_("  -i, --interactive         prompt before deleting anything\n"));
-       printf(_("  -q, --quiet               don't write any messages\n"));
        printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
        printf(_("  -p, --port=PORT           database server port\n"));
        printf(_("  -U, --username=USERNAME   user name to connect as\n"));

diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 2ac4a1f9a3454a3dd3422d728ff2ebdae94fb284..cf6d02236656610dac38e505061f15466913d1c5 100644 (file)
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -42,7 +42,6 @@ main(int argc, char *argv[])
        char       *username = NULL;
        bool            password = false;
        bool            echo = false;
-       bool            quiet = false;
        bool            interactive = false;
 
        PQExpBufferData sql;
@@ -75,7 +74,7 @@ main(int argc, char *argv[])
                                echo = true;
                                break;
                        case 'q':
-                               quiet = true;
+                               /* obsolete; remove in 8.4 */
                                break;
                        case 'i':
                                interactive = true;
@@ -129,11 +128,6 @@ main(int argc, char *argv[])
 
        PQclear(result);
        PQfinish(conn);
-       if (!quiet)
-       {
-               puts("DROP ROLE");
-               fflush(stdout);
-       }
        exit(0);
 }
 
@@ -147,7 +141,6 @@ help(const char *progname)
        printf(_("\nOptions:\n"));
        printf(_("  -e, --echo                show the commands being sent to the server\n"));
        printf(_("  -i, --interactive         prompt before deleting anything\n"));
-       printf(_("  -q, --quiet               don't write any messages\n"));
        printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
        printf(_("  -p, --port=PORT           database server port\n"));
        printf(_("  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"));

diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index 196c7a1ef3baa19d2b14ff5c2608b1e02101faac..c88c24d07d5ba52698de941a5497b5052203b2cb 100644 (file)
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -18,7 +18,7 @@ static void reindex_one_database(const char *name, const char *dbname,
                                         const char *type, const char *host,
                                         const char *port, const char *username,
                                         bool password, const char *progname,
-                                        bool echo, bool quiet);
+                                        bool echo);
 static void reindex_all_databases(const char *host, const char *port,
                                          const char *username, bool password,
                                          const char *progname, bool echo,
@@ -26,8 +26,7 @@ static void reindex_all_databases(const char *host, const char *port,
 static void reindex_system_catalogs(const char *dbname,
                                                const char *host, const char *port,
                                                const char *username, bool password,
-                                               const char *progname, bool echo,
-                                               bool quiet);
+                                               const char *progname, bool echo);
 static void help(const char *progname);
 
 int
@@ -178,7 +177,7 @@ main(int argc, char *argv[])
                }
 
                reindex_system_catalogs(dbname, host, port, username, password,
-                                                               progname, echo, quiet);
+                                                               progname, echo);
        }
        else
        {
@@ -194,14 +193,14 @@ main(int argc, char *argv[])
 
                if (index)
                        reindex_one_database(index, dbname, "INDEX", host, port,
-                                                                username, password, progname, echo, quiet);
+                                                                username, password, progname, echo);
                if (table)
                        reindex_one_database(table, dbname, "TABLE", host, port,
-                                                                username, password, progname, echo, quiet);
+                                                                username, password, progname, echo);
                /* reindex database only if index or table is not specified */
                if (index == NULL && table == NULL)
                        reindex_one_database(dbname, dbname, "DATABASE", host, port,
-                                                                username, password, progname, echo, quiet);
+                                                                username, password, progname, echo);
        }
 
        exit(0);
@@ -210,8 +209,7 @@ main(int argc, char *argv[])
 static void
 reindex_one_database(const char *name, const char *dbname, const char *type,
                                         const char *host, const char *port, const char *username,
-                                        bool password, const char *progname, bool echo,
-                                        bool quiet)
+                                        bool password, const char *progname, bool echo)
 {
        PQExpBufferData sql;
 
@@ -247,12 +245,6 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
 
        PQfinish(conn);
        termPQExpBuffer(&sql);
-
-       if (!quiet)
-       {
-               puts("REINDEX");
-               fflush(stdout);
-       }
 }
 
 static void
@@ -273,10 +265,13 @@ reindex_all_databases(const char *host, const char *port,
                char       *dbname = PQgetvalue(result, i, 0);
 
                if (!quiet)
-                       fprintf(stderr, _("%s: reindexing database \"%s\"\n"), progname, dbname);
+               {
+                       printf(_("%s: reindexing database \"%s\"\n"), progname, dbname);
+                       fflush(stdout);
+               }
 
                reindex_one_database(dbname, dbname, "DATABASE", host, port, username,
-                                                        password, progname, echo, quiet);
+                                                        password, progname, echo);
        }
 
        PQclear(result);
@@ -285,7 +280,7 @@ reindex_all_databases(const char *host, const char *port,
 static void
 reindex_system_catalogs(const char *dbname, const char *host, const char *port,
                                                const char *username, bool password,
-                                               const char *progname, bool echo, bool quiet)
+                                               const char *progname, bool echo)
 {
        PQExpBufferData sql;
 
@@ -305,12 +300,6 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port,
        }
        PQfinish(conn);
        termPQExpBuffer(&sql);
-
-       if (!quiet)
-       {
-               puts("REINDEX");
-               fflush(stdout);
-       }
 }
 
 static void

diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 181e43c5a7c082580085ea3190c17a23c10af2d2..501179a6eac18c385e812095ef105d478a6803cb 100644 (file)
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -18,7 +18,7 @@ static void vacuum_one_database(const char *dbname, bool full, bool verbose, boo
                                        const char *table,
                                        const char *host, const char *port,
                                        const char *username, bool password,
-                                       const char *progname, bool echo, bool quiet);
+                                       const char *progname, bool echo);
 static void vacuum_all_databases(bool full, bool verbose, bool analyze,
                                         const char *host, const char *port,
                                         const char *username, bool password,
@@ -163,7 +163,7 @@ main(int argc, char *argv[])
 
                vacuum_one_database(dbname, full, verbose, analyze, table,
                                                        host, port, username, password,
-                                                       progname, echo, quiet);
+                                                       progname, echo);
        }
 
        exit(0);
@@ -175,7 +175,7 @@ vacuum_one_database(const char *dbname, bool full, bool verbose, bool analyze,
                                        const char *table,
                                        const char *host, const char *port,
                                        const char *username, bool password,
-                                       const char *progname, bool echo, bool quiet)
+                                       const char *progname, bool echo)
 {
        PQExpBufferData sql;
 
@@ -208,12 +208,6 @@ vacuum_one_database(const char *dbname, bool full, bool verbose, bool analyze,
        }
        PQfinish(conn);
        termPQExpBuffer(&sql);
-
-       if (!quiet)
-       {
-               puts("VACUUM");
-               fflush(stdout);
-       }
 }
 
 
@@ -236,11 +230,14 @@ vacuum_all_databases(bool full, bool verbose, bool analyze,
                char       *dbname = PQgetvalue(result, i, 0);
 
                if (!quiet)
-                       fprintf(stderr, _("%s: vacuuming database \"%s\"\n"), progname, dbname);
+               {
+                       printf(_("%s: vacuuming database \"%s\"\n"), progname, dbname);
+                       fflush(stdout);
+               }
 
                vacuum_one_database(dbname, full, verbose, analyze, NULL,
                                                        host, port, username, password,
-                                                       progname, echo, quiet);
+                                                       progname, echo);
        }
 
        PQclear(result);