From b483ad84f80c38fedef2396fbc5db56cf409b7a0 Mon Sep 17 00:00:00 2001 From: Bruce Momjian <bruce@momjian.us> Date: Fri, 9 Feb 2001 17:16:57 +0000 Subject: [PATCH] Add -g as synonmym for --globals-only in pg_dumpall. Add info about -c,--clean option to manual page. --- HISTORY | 1 - doc/src/sgml/ref/pg_dumpall.sgml | 16 +++++++++++++--- doc/src/sgml/release.sgml | 3 +-- src/bin/pg_dump/pg_dumpall.sh | 11 ++++++----- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/HISTORY b/HISTORY index e1a5eecc869..ba079e1b989 100644 --- 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 2e270b6dc60..35f786aaa58 100644 --- a/doc/src/sgml/ref/pg_dumpall.sgml +++ b/doc/src/sgml/ref/pg_dumpall.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.18 2000/12/25 23:15:26 petere Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.19 2001/02/09 17:16:57 momjian Exp $ Postgres documentation --> @@ -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 8bb07cfb78a..18b66a53d01 100644 --- a/doc/src/sgml/release.sgml +++ b/doc/src/sgml/release.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.76 2001/02/03 21:50:45 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.77 2001/02/09 17:16:56 momjian Exp $ --> <appendix id="release"> @@ -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 a3b80fe251d..708e165bfea 100644 --- a/src/bin/pg_dump/pg_dumpall.sh +++ b/src/bin/pg_dump/pg_dumpall.sh @@ -6,7 +6,7 @@ # and "pg_group" tables, which belong to the whole installation rather # than any one individual database. # -# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.10 2001/01/25 17:28:15 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.11 2001/02/09 17:16:57 momjian Exp $ CMDNAME=`basename $0` @@ -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>." -- GitLab