Add -g as synonmym for --globals-only in pg_dumpall. Add info about

-c,--clean option to manual page.

diff --git a/HISTORY b/HISTORY
index e1a5eecc869c1af2bbb003b6aa1a1915a7602f2e..ba079e1b98999bab255e161c16d823d1ead9c214 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -159,7 +159,6 @@ Allow postmaster to listen on a specific IP address (David J. MacKenzie)
 Allow socket path name to be specified in hostname by using leading slash
     (David J. MacKenzie)
 Allow CREATE DATABASE to specify template database (Tom)
-New pg_dump --globals-only option (Peter E)
 New utility to convert MySQL schema dumps to SQL92 and PostgreSQL (Thomas)
 New /contrib/rserv replication toolkit (Vadim)
 New file format for COPY BINARY (Tom)

diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 5dcabbf33e7a9050073eca541fcf9e7142ab498e..c1198db73ff41501f49567605db36a8124e84a3b 100644 (file)
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -25,7 +25,7 @@ Postgres documentation
    <group><arg>-c</arg><arg>--clean</arg></group>
    <arg>-h <replaceable>host</replaceable></arg>
    <arg>-p <replaceable>port</replaceable></arg>
-   <arg>--globals-only</arg>
+   <group><arg>-g</arg><arg>--globals-only</arg></group>
   </cmdsynopsis>
  </refsynopsisdiv>
 
@@ -71,6 +71,16 @@ Postgres documentation
     <application>pg_dumpall</application> accepts the following
     command line arguments:
 
+    <variablelist>
+     <varlistentry>
+      <term>-c, --clean</term>
+      <listitem>
+       <para>
+       Clean (drop) database before creating schema.
+       </para>
+      </listitem>
+     </varlistentry>
+
     <variablelist>
      <varlistentry>
       <term>-h <replaceable>host</replaceable></term>
@@ -97,7 +107,7 @@ Postgres documentation
      </varlistentry>
 
      <varlistentry>
-      <term>--globals-only</term>
+      <term>-g, --globals-only</term>
       <listitem>
        <para>
        Only dump global objects (users and groups), no databases.

diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index b8d566dace8aae3a8efb0a634a72a03c644e037a..4e7fcd4e0e263c1995232f381571a14ea58ba784 100644 (file)
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -235,7 +235,6 @@ Allow postmaster to listen on a specific IP address (David J. MacKenzie)
 Allow socket path name to be specified in hostname by using leading slash
     (David J. MacKenzie)
 Allow CREATE DATABASE to specify template database (Tom)
-New pg_dump --globals-only option (Peter E)
 New utility to convert MySQL schema dumps to SQL92 and PostgreSQL (Thomas)
 New /contrib/rserv replication toolkit (Vadim)
 New file format for COPY BINARY (Tom)

diff --git a/src/bin/pg_dump/pg_dumpall.sh b/src/bin/pg_dump/pg_dumpall.sh
index c966552e52cdc06eb17ef00ac1ef831465e96f23..88729bb76f08b929251d0efeee1222e4a944ca9c 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.sh
+++ b/src/bin/pg_dump/pg_dumpall.sh
@@ -75,7 +75,8 @@ cleanschema=
 globals_only=
 
 #
-# Scan options. We're interested in the -h (host), -p (port), and -c (clean) options.
+# Scan options. We're interested in the -h (host), -p (port),
+# -c (clean), and -g (global) options.
 # The rest we pass to pg_dump, which may or may not be useful.
 #
 while [ $# -gt 0 ] ; do
@@ -110,7 +111,7 @@ while [ $# -gt 0 ] ; do
                 cleanschema=yes
                 pgdumpextraopts="$pgdumpextraopts -c"
                 ;;
-        --globals-only)
+        -g|--globals-only)
                 globals_only=yes
                 ;;
         *)
@@ -125,13 +126,13 @@ if [ "$usage" ] ; then
     echo "$CMDNAME extracts a PostgreSQL database cluster into an SQL script file."
     echo
     echo "Usage:"
-    echo "  $CMDNAME [ -c ] [ -h HOSTNAME ] [ -p PORT ] [ --globals-only ]"
+    echo "  $CMDNAME [ -c ] [ -h HOSTNAME ] [ -p PORT ] [ -g ]"
     echo
     echo "Options:"
     echo "  -c, --clean            Clean (drop) schema prior to create"
     echo "  -h, --host=HOSTNAME    Server host name"
     echo "  -p, --port=PORT        Server port number"
-    echo "  --globals-only         Only dump global objects, no databases"
+    echo "  -g, --globals-only     Only dump global objects, no databases"
     echo "Any extra options will be passed to pg_dump."
     echo
     echo "Report bugs to <pgsql-bugs@postgresql.org>."