mirror of https://github.com/postgres/postgres
Fix param handling of create* admin scripts as described months ago.
Properly handles default values.
This commit is contained in:
Bruce Momjian
parent
c9361a7a9c
commit
fbcc0d69e8
|
|
@ -1,5 +1,5 @@
|
|||
<!--
|
||||
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.20 2001/12/08 03:24:40 thomas Exp $
|
||||
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.21 2002/02/18 05:48:43 momjian Exp $
|
||||
PostgreSQL documentation
|
||||
-->
|
||||
|
||||
|
|
@ -23,13 +23,13 @@ PostgreSQL documentation
|
|||
<cmdsynopsis>
|
||||
<command>vacuumdb</command>
|
||||
<arg rep="repeat"><replaceable>connection-options</replaceable></arg>
|
||||
<arg><arg>-d</arg> <replaceable>dbname</replaceable></arg>
|
||||
<group><arg>--full</arg><arg>-f</arg></group>
|
||||
<group><arg>--verbose</arg><arg>-v</arg></group>
|
||||
<group><arg>--analyze</arg><arg>-z</arg></group>
|
||||
<arg>--table '<replaceable>table</replaceable>
|
||||
<arg>--table | -t '<replaceable>table</replaceable>
|
||||
<arg>( <replaceable class="parameter">column</replaceable> [,...] )</arg>'
|
||||
</arg>
|
||||
<arg><replaceable>dbname</replaceable></arg>
|
||||
<sbr>
|
||||
<command>vacuumdb</command>
|
||||
<arg rep="repeat"><replaceable>connection-options</replaceable></arg>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.18 2001/09/30 22:17:51 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.19 2002/02/18 05:48:44 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -104,11 +104,17 @@ do
|
|||
exit 1
|
||||
;;
|
||||
*)
|
||||
if [ -z "$dbname" ]; then
|
||||
dbname="$1"
|
||||
else
|
||||
if [ "$2" ]
|
||||
then
|
||||
shift
|
||||
dbcomment="$1"
|
||||
fi
|
||||
if [ "$#" -ne 1 ]; then
|
||||
echo "$CMDNAME: invalid option: $2" 1>&2
|
||||
echo "Try '$CMDNAME --help' for more information." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
|
|
@ -118,7 +124,7 @@ if [ "$usage" ]; then
|
|||
echo "$CMDNAME creates a PostgreSQL database."
|
||||
echo
|
||||
echo "Usage:"
|
||||
echo " $CMDNAME [options] dbname [description]"
|
||||
echo " $CMDNAME [options] [dbname] [description]"
|
||||
echo
|
||||
echo "Options:"
|
||||
echo " -D, --location=PATH Alternative place to store the database"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
# Portions Copyright (c) 1994, Regents of the University of California
|
||||
#
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.32 2002/01/03 05:30:04 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.33 2002/02/18 05:48:44 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -116,6 +116,11 @@ do
|
|||
fi
|
||||
else dbname="$1"
|
||||
fi
|
||||
if [ "$#" -ne 1 ]; then
|
||||
echo "$CMDNAME: invalid option: $2" 1>&2
|
||||
echo "Try '$CMDNAME --help' for more information." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.22 2001/09/30 22:17:51 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.23 2002/02/18 05:48:44 momjian Exp $
|
||||
#
|
||||
# Note - this should NOT be setuid.
|
||||
#
|
||||
|
|
@ -123,6 +123,11 @@ do
|
|||
;;
|
||||
*)
|
||||
NewUser="$1"
|
||||
if [ "$#" -ne 1 ]; then
|
||||
echo "$CMDNAME: invalid option: $2" 1>&2
|
||||
echo "Try '$CMDNAME --help' for more information." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
shift;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropdb,v 1.13 2001/09/30 22:17:51 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropdb,v 1.14 2002/02/18 05:48:44 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -89,6 +89,11 @@ do
|
|||
;;
|
||||
*)
|
||||
dbname="$1"
|
||||
if [ "$#" -ne 1 ]; then
|
||||
echo "$CMDNAME: invalid option: $2" 1>&2
|
||||
echo "Try '$CMDNAME --help' for more information." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
# Portions Copyright (c) 1994, Regents of the University of California
|
||||
#
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.20 2002/01/03 08:53:00 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.21 2002/02/18 05:48:44 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -105,6 +105,11 @@ do
|
|||
fi
|
||||
else dbname="$1"
|
||||
fi
|
||||
if [ "$#" -ne 1 ]; then
|
||||
echo "$CMDNAME: invalid option: $2" 1>&2
|
||||
echo "Try '$CMDNAME --help' for more information." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.14 2001/09/30 22:17:51 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.15 2002/02/18 05:48:45 momjian Exp $
|
||||
#
|
||||
# Note - this should NOT be setuid.
|
||||
#
|
||||
|
|
@ -91,6 +91,11 @@ do
|
|||
;;
|
||||
*)
|
||||
DelUser="$1"
|
||||
if [ "$#" -ne 1 ]; then
|
||||
echo "$CMDNAME: invalid option: $2" 1>&2
|
||||
echo "Try '$CMDNAME --help' for more information." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
shift;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/vacuumdb,v 1.19 2001/09/30 22:17:51 momjian Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/vacuumdb,v 1.20 2002/02/18 05:48:45 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
|
|
@ -112,6 +112,11 @@ do
|
|||
;;
|
||||
*)
|
||||
dbname="$1"
|
||||
if [ "$#" -ne 1 ]; then
|
||||
echo "$CMDNAME: invalid option: $2" 1>&2
|
||||
echo "Try '$CMDNAME --help' for more information." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
|
|
@ -151,9 +156,12 @@ if [ "$alldb" ]; then
|
|||
dbname=`${PATHNAME}psql $PSQLOPT -q -t -A -d template1 -c 'SELECT datname FROM pg_database WHERE datallowconn'`
|
||||
|
||||
elif [ -z "$dbname" ]; then
|
||||
echo "$CMDNAME: missing required argument: database name" 1>&2
|
||||
echo "Try '$CMDNAME -?' for help." 1>&2
|
||||
exit 1
|
||||
if [ "$PGUSER" ]; then
|
||||
dbname="$PGUSER"
|
||||
else
|
||||
dbname=`${PATHNAME}pg_id -u -n`
|
||||
fi
|
||||
[ "$?" -ne 0 ] && exit 1
|
||||
fi
|
||||
|
||||
for db in $dbname
|
||||
|
|
|
|||
Loading…
Reference in New Issue