Skip to content

P
Postgres FD Implementation
Commit a0aab48f authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Okay, that should put us back in sync. These two patches (src & doc) are 

against the sources from one hour ago and contain all the portable and
up
to date stuff.

A few other CVS "householding" things you might want to take care of:

* Remove the src/bin/cleardbdir directory

* Remove the file src/bin/psql/sql_help.h from the repository, as it is
a derived file and is build by the release_prep.

Peter Eisentraut
parent 54847b25
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 361 additions and 196 deletions
doc/src/sgml/install.sgml
View file @ a0aab48f
...@@ -808,7 +808,7 @@ $ nohup postmaster -i > pgserver.log 2>&1 & ...@@ -808,7 +808,7 @@ $ nohup postmaster -i > pgserver.log 2>&1 &
<para> <para>
Create a database by typing Create a database by typing
<ProgramListing> <ProgramListing>
$ createdb $ createdb test
</ProgramListing> </ProgramListing>
</para> </para>
</step> </step>
...@@ -816,7 +816,7 @@ $ createdb ...@@ -816,7 +816,7 @@ $ createdb
<para> <para>
Connect to the new database: Connect to the new database:
<ProgramListing> <ProgramListing>
$ psql $ psql test
</ProgramListing> </ProgramListing>
</para> </para>
</step> </step>
...@@ -840,7 +840,7 @@ postgres=> \q ...@@ -840,7 +840,7 @@ postgres=> \q
<para> <para>
Remove the test database (unless you will want to use it later for other tests): Remove the test database (unless you will want to use it later for other tests):
<ProgramListing> <ProgramListing>
$ destroydb $ dropdb test
</ProgramListing> </ProgramListing>
</para> </para>
</step> </step>
...@@ -1028,7 +1028,7 @@ For example, ...@@ -1028,7 +1028,7 @@ For example,
After running the regression tests, type After running the regression tests, type
<ProgramListing> <ProgramListing>
$ destroydb regression $ dropdb regression
$ cd /usr/src/pgsql/postgresql-6.5.3/src/test/regress $ cd /usr/src/pgsql/postgresql-6.5.3/src/test/regress
$ gmake clean $ gmake clean
</ProgramListing> </ProgramListing>
...@@ -1241,7 +1241,7 @@ Create the database foo: ...@@ -1241,7 +1241,7 @@ Create the database foo:
<ProgramListing> <ProgramListing>
template1=> create database foo; template1=> create database foo;
CREATEDB CREATE DATABASE
</ProgramListing> </ProgramListing>
(Get in the habit of including those SQL semicolons. Psql won't execute (Get in the habit of including those SQL semicolons. Psql won't execute
......
doc/src/sgml/manage-ag.sgml
View file @ a0aab48f
...@@ -143,7 +143,7 @@ You are currently connected to the database: <replaceable>dbname</replaceable> ...@@ -143,7 +143,7 @@ You are currently connected to the database: <replaceable>dbname</replaceable>
mydb, you can destroy it using the following Unix command: mydb, you can destroy it using the following Unix command:
<programlisting> <programlisting>
% destroydb <replaceable class="parameter">dbname</replaceable> % dropdb <replaceable class="parameter">dbname</replaceable>
</programlisting> </programlisting>
This action physically removes all of the Unix files This action physically removes all of the Unix files
......
doc/src/sgml/manage.sgml
View file @ a0aab48f
...@@ -283,7 +283,7 @@ TBD ...@@ -283,7 +283,7 @@ TBD
If you are the database administrator for the database If you are the database administrator for the database
<Database>mydb</Database>, you can destroy it using the following Unix command: <Database>mydb</Database>, you can destroy it using the following Unix command:
<ProgramListing> <ProgramListing>
% destroydb mydb % dropdb mydb
</ProgramListing> </ProgramListing>
This action physically removes all of the Unix files This action physically removes all of the Unix files
associated with the database and cannot be undone, so associated with the database and cannot be undone, so
......
doc/src/sgml/ref/createdb.sgml
View file @ a0aab48f
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.7 1999/12/04 04:53:15 momjian Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.8 1999/12/07 22:41:41 momjian Exp $
Postgres documentation Postgres documentation
--> -->
...@@ -96,7 +96,7 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c ...@@ -96,7 +96,7 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>-D, --dbpath <replaceable class="parameter">datadir</replaceable></term> <term>-D, --location <replaceable class="parameter">datadir</replaceable></term>
<listitem> <listitem>
<para> <para>
Specifies the alternate database location for this database installation. Specifies the alternate database location for this database installation.
...@@ -120,7 +120,7 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c ...@@ -120,7 +120,7 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c
<listitem> <listitem>
<para> <para>
Specifies the name of the database to be created. The name must be Specifies the name of the database to be created. The name must be
unique among all <productname>Postgres</productname> databases in this installation. unique among all <productname>PostgreSQL</productname> databases in this installation.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
...@@ -167,7 +167,7 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c ...@@ -167,7 +167,7 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><computeroutput>createdb: Comment creation failed.</computeroutput></term> <term><computeroutput>createdb: Comment creation failed. (Database was created.)</computeroutput></term>
<listitem> <listitem>
<para> <para>
The comment/description for the database could not be created. The comment/description for the database could not be created.
...@@ -235,11 +235,11 @@ CREATE DATABASE ...@@ -235,11 +235,11 @@ CREATE DATABASE
<para> <para>
To create the database <literal>demo</literal> To create the database <literal>demo</literal>
using the postmaster on host eden, port 5000, using the <literal>LATIN1</literal> using the postmaster on host eden, port 5000, using the <literal>LATIN1</literal>
encoding scheme and look at the underlying query: encoding scheme with a look at the underlying query:
<programlisting> <programlisting>
$ <userinput>createdb -p 5000 -h eden -E LATIN1 -e demo</userinput> $ <userinput>createdb -p 5000 -h eden -E LATIN1 -e demo</userinput>
QUERY: CREATE DATABASE "demo" WITH ENCODING = 'LATIN1' CREATE DATABASE "demo" WITH ENCODING = 'LATIN1'
CREATE DATABASE CREATE DATABASE
</programlisting> </programlisting>
</para> </para>
......
doc/src/sgml/ref/createuser.sgml
View file @ a0aab48f
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.6 1999/12/04 04:53:15 momjian Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.7 1999/12/07 22:41:41 momjian Exp $
Postgres documentation Postgres documentation
--> -->
...@@ -125,6 +125,16 @@ createuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceab ...@@ -125,6 +125,16 @@ createuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceab
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>-i, --sysid <replaceable class="parameter">uid</replaceable></term>
<listitem>
<para>
Allows you to pick a non-default user id for the new user. This is not
necessary, but some people like it.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><replaceable class="parameter">username</replaceable></term> <term><replaceable class="parameter">username</replaceable></term>
<listitem> <listitem>
...@@ -142,11 +152,9 @@ createuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceab ...@@ -142,11 +152,9 @@ createuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceab
<para> <para>
The options <literal>-h</literal>, <literal>-p</literal>, and <literal>-e</literal>, The options <literal>-h</literal>, <literal>-p</literal>, and <literal>-e</literal>,
are passed on literally to <xref linkend="APP-PSQL" endterm="APP-PSQL-title">. If you are passed on literally to <xref linkend="APP-PSQL" endterm="APP-PSQL-title">. The
need the <application>psql</application> options <literal>-U</literal> and <application>psql</application> options <literal>-U</literal> and <literal>-W</literal>
<literal>-W</literal> as well, you can uncomment the are available as well, but their use can be confusing in this context.
respective lines in the source. They are disabled by default because of the potential
conceptual confusion between existing and new users.
</para> </para>
</refsect2> </refsect2>
...@@ -243,7 +251,7 @@ CREATE USER ...@@ -243,7 +251,7 @@ CREATE USER
<programlisting> <programlisting>
$ <userinput>createuser -p 5000 -h eden -D -A -e joe</userinput> $ <userinput>createuser -p 5000 -h eden -D -A -e joe</userinput>
QUERY: CREATE USER "joe" NOCREATEDB NOCREATEUSER CREATE USER "joe" NOCREATEDB NOCREATEUSER
CREATE USER CREATE USER
</programlisting> </programlisting>
</para> </para>
......
doc/src/sgml/ref/drop_user.sgml
View file @ a0aab48f
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.8 1999/12/04 04:53:15 momjian Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.9 1999/12/07 22:41:41 momjian Exp $
Postgres documentation Postgres documentation
--> -->
...@@ -94,9 +94,7 @@ ERROR: removeUser: user "<replaceable class="parameter">name</replaceable>" does ...@@ -94,9 +94,7 @@ ERROR: removeUser: user "<replaceable class="parameter">name</replaceable>" does
user from the database, user from the database,
along with any databases owned by the user. It along with any databases owned by the user. It
does not remove tables, views, or triggers owned by the does not remove tables, views, or triggers owned by the
named user in databases not owned by the user. This statement named user in databases not owned by the user.
can be used in place of the <application>dropuser</application>
script, regardless of how the user was created.
</para> </para>
<refsect2 id="R2-SQL-DROPUSER-3"> <refsect2 id="R2-SQL-DROPUSER-3">
......
doc/src/sgml/ref/dropdb.sgml
View file @ a0aab48f
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.1 1999/12/04 04:53:15 momjian Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.2 1999/12/07 22:41:41 momjian Exp $
Postgres documentation Postgres documentation
--> -->
...@@ -207,7 +207,7 @@ DROP DATABASE ...@@ -207,7 +207,7 @@ DROP DATABASE
$ <userinput>dropdb -p 5000 -h eden -i -e demo</userinput> $ <userinput>dropdb -p 5000 -h eden -i -e demo</userinput>
Database "demo" will be permanently deleted. Database "demo" will be permanently deleted.
Are you sure? (y/n) <userinput>y</userinput> Are you sure? (y/n) <userinput>y</userinput>
QUERY: DROP DATABASE "demo" DROP DATABASE "demo"
DROP DATABASE DROP DATABASE
</programlisting> </programlisting>
</para> </para>
......
doc/src/sgml/ref/dropuser.sgml
View file @ a0aab48f
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.1 1999/12/04 04:53:15 momjian Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.2 1999/12/07 22:41:41 momjian Exp $
Postgres documentation Postgres documentation
--> -->
...@@ -101,11 +101,9 @@ dropuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceable ...@@ -101,11 +101,9 @@ dropuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceable
<para> <para>
The options <literal>-h</literal>, <literal>-p</literal>, and <literal>-e</literal>, The options <literal>-h</literal>, <literal>-p</literal>, and <literal>-e</literal>,
are passed on literally to <xref linkend="APP-PSQL" endterm="APP-PSQL-title">. If you are passed on literally to <xref linkend="APP-PSQL" endterm="APP-PSQL-title">. The
need the <application>psql</application> options <literal>-U</literal> and <application>psql</application> options <literal>-U</literal> and <literal>-W</literal>
<literal>-W</literal> as well, you can uncomment the are available as well, but they can be confusing in this context.
respective lines in the source. They are disabled by default because of the potential
conceptual confusion between existing and new users.
</para> </para>
</refsect2> </refsect2>
...@@ -201,7 +199,7 @@ DROP USER ...@@ -201,7 +199,7 @@ DROP USER
$ <userinput>dropuser -p 5000 -h eden -i -e joe</userinput> $ <userinput>dropuser -p 5000 -h eden -i -e joe</userinput>
User "joe" and any owned databases will be permanently deleted. User "joe" and any owned databases will be permanently deleted.
Are you sure? (y/n) <userinput>y</userinput> Are you sure? (y/n) <userinput>y</userinput>
QUERY: DROP USER "joe" DROP USER "joe"
DROP USER DROP USER
</programlisting> </programlisting>
</para> </para>
......
doc/src/sgml/ref/vacuum.sgml
View file @ a0aab48f
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.6 1999/11/28 02:17:04 tgl Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.7 1999/12/07 22:41:41 momjian Exp $
Postgres documentation Postgres documentation
--> -->
...@@ -24,7 +24,7 @@ Postgres documentation ...@@ -24,7 +24,7 @@ Postgres documentation
</refsynopsisdivinfo> </refsynopsisdivinfo>
<synopsis> <synopsis>
VACUUM [ VERBOSE ] [ ANALYZE ] [ <replaceable class="PARAMETER">table</replaceable> ] VACUUM [ VERBOSE ] [ ANALYZE ] [ <replaceable class="PARAMETER">table</replaceable> ]
VACUUM [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">ER">t</replaceable>BLE> [ (<replaceable class="PARAMETER">column</replaceable> [, ...] ) ] ] VACUUM [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">table</replaceable> [ (<replaceable class="PARAMETER">column</replaceable> [, ...] ) ] ]
</synopsis> </synopsis>
<refsect2 id="R2-SQL-VACUUM-1"> <refsect2 id="R2-SQL-VACUUM-1">
......
doc/src/sgml/ref/vacuumdb.sgml
View file @ a0aab48f
This diff is collapsed.
doc/src/sgml/regress.sgml
View file @ a0aab48f
...@@ -246,7 +246,7 @@ The runtime path is /usr/local/pgsql (other paths are possible). ...@@ -246,7 +246,7 @@ The runtime path is /usr/local/pgsql (other paths are possible).
<Para> <Para>
After running the tests and examining the results, type After running the tests and examining the results, type
<ProgramListing> <ProgramListing>
destroydb regression dropdb regression
cd /usr/src/pgsql/src/test/regress cd /usr/src/pgsql/src/test/regress
gmake clean gmake clean
</ProgramListing> </ProgramListing>
......
doc/src/sgml/start-ag.sgml
View file @ a0aab48f
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<para> <para>
<application>createuser</application> enables specific users to access <application>createuser</application> enables specific users to access
<productname>Postgres</productname>. <productname>Postgres</productname>.
<application>destroyuser</application> removes users and <application>dropuser</application> removes users and
prevents them from accessing <productname>Postgres</productname>. prevents them from accessing <productname>Postgres</productname>.
</para> </para>
...@@ -115,7 +115,7 @@ Creating Postgres database system directory /home/postgres/data/base ...@@ -115,7 +115,7 @@ Creating Postgres database system directory /home/postgres/data/base
<programlisting> <programlisting>
% createdb -D PGDATA2 test % createdb -D PGDATA2 test
% destroydb test % dropdb test
</programlisting> </programlisting>
</para> </para>
......
doc/src/sgml/start.sgml
View file @ a0aab48f
...@@ -305,7 +305,7 @@ mydb=> \q ...@@ -305,7 +305,7 @@ mydb=> \q
If you are the database administrator for the database If you are the database administrator for the database
<Database>mydb</Database>, you can destroy it using the following Unix command: <Database>mydb</Database>, you can destroy it using the following Unix command:
<ProgramListing> <ProgramListing>
% destroydb mydb % dropdb mydb
</ProgramListing> </ProgramListing>
This action physically removes all of the Unix files This action physically removes all of the Unix files
associated with the database and cannot be undone, so associated with the database and cannot be undone, so
......
src/bin/scripts/createdb
View file @ a0aab48f
#!/bin/sh #!/bin/sh
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# createdb.sh-- # createdb--
# create a postgres database # create a postgres database
# #
# This program runs psql with the "-c" option to create # This program runs psql with the "-c" option to create
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.1 1999/12/04 04:53:21 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.2 1999/12/07 22:41:44 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -21,6 +21,7 @@ MB= ...@@ -21,6 +21,7 @@ MB=
PSQLOPT= PSQLOPT=
dbname= dbname=
dbcomment= dbcomment=
dbpath=
while [ $# -gt 0 ] while [ $# -gt 0 ]
do do
...@@ -33,12 +34,33 @@ do ...@@ -33,12 +34,33 @@ do
--host|-h) --host|-h)
PSQLOPT="$PSQLOPT -h $2" PSQLOPT="$PSQLOPT -h $2"
shift;; shift;;
-h*)
PSQLOPT="$PSQLOPT $1"
;;
--host=*)
PSQLOPT="$PSQLOPT -h "`echo $1 | sed 's/^--host=//'`
;;
--port|-p) --port|-p)
PSQLOPT="$PSQLOPT -p $2" PSQLOPT="$PSQLOPT -p $2"
shift;; shift;;
-p*)
PSQLOPT="$PSQLOPT $1"
;;
--port=*)
PSQLOPT="$PSQLOPT -p "`echo $1 | sed 's/^--port=//'`
;;
--user|--username|-U) --user|--username|-U)
PSQLOPT="$PSQLOPT -U $2" PSQLOPT="$PSQLOPT -U '$2'"
shift;; shift;;
-U*)
PSQLOPT="$PSQLOPT $1"
;;
--user=*)
PSQLOPT="$PSQLOPT -U "`echo $1 | sed 's/^--user=//'`
;;
--username=*)
PSQLOPT="$PSQLOPT -U "`echo $1 | sed 's/^--username=//'`
;;
--password|-W) --password|-W)
PSQLOPT="$PSQLOPT -W" PSQLOPT="$PSQLOPT -W"
;; ;;
...@@ -49,18 +71,24 @@ do ...@@ -49,18 +71,24 @@ do
PSQLOPT="$PSQLOPT -o /dev/null" PSQLOPT="$PSQLOPT -o /dev/null"
;; ;;
# options converted into SQL command # options converted into SQL command
--dbpath|-D) --location|-D)
dbpath="$2" dbpath="$2"
shift;; shift;;
-D*)
dbpath=`echo $1 | sed 's/^-D//'`
;;
--location=*)
dbpath=`echo $1 | sed 's/^--location=//'`
;;
--encoding|-E) --encoding|-E)
MB=$2 MB=$2
shift shift;;
if [ -z `pg_encoding $MB` ]; then -E*)
echo "$CMDNAME: $MB is not a valid encoding name" MB=`echo $1 | sed 's/^-E//'`
exit 1 ;;
fi --encoding=*)
;; MB=`echo $1 | sed 's/^--encoding=//'`
;;
-*) -*)
echo "$CMDNAME: Unrecognized option: $1. Try -? for help." echo "$CMDNAME: Unrecognized option: $1. Try -? for help."
exit 1 exit 1
...@@ -78,17 +106,26 @@ done ...@@ -78,17 +106,26 @@ done
if [ "$usage" ]; then if [ "$usage" ]; then
echo "Usage: $CMDNAME [-h <server>] [-p <port>] [-D <path>] \\" echo "Usage: $CMDNAME [-h server] [-p port] [-D path] \\"
echo " [-E <encoding>] [-U <username>] [-W] dbname [description]" echo " [-E encoding] [-U username] dbname [description]"
exit 0 exit 0
fi fi
if [ "$MB" -a -z "`pg_encoding '$MB'`" ]; then
echo "$CMDNAME: \"$MB\" is not a valid encoding name."
exit 1
fi
if [ -z "$dbname" ]; then if [ -z "$dbname" ]; then
echo "$CMDNAME: Missing required argument database name. Try -? for help." echo "$CMDNAME: Missing required argument database name. Try -? for help."
exit 1 exit 1
fi fi
dbpath=`echo $dbpath | sed "s/'/\\\\\'/g"`
dbname=`echo $dbname | sed 's/\"/\\\"/g'`
withstring= withstring=
[ "$dbpath" ] && withstring="$withstring LOCATION = '$dbpath'" [ "$dbpath" ] && withstring="$withstring LOCATION = '$dbpath'"
[ "$MB" ] && withstring="$withstring ENCODING = '$MB'" [ "$MB" ] && withstring="$withstring ENCODING = '$MB'"
...@@ -103,10 +140,12 @@ fi ...@@ -103,10 +140,12 @@ fi
# Insert comment as well, if requested # Insert comment as well, if requested
[ -z "$dbcomment" ] && exit 0 [ -z "$dbcomment" ] && exit 0
psql $PSQLOPT -d template1 -c "COMMENT ON DATABASE \"$dbname\" IS \'$dbcomment\'" dbcomment=`echo $dbcomment | sed "s/'/\\\\\'/g"`
psql $PSQLOPT -d template1 -c "COMMENT ON DATABASE \"$dbname\" IS '$dbcomment'"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "$CMDNAME: Comment creation failed." echo "$CMDNAME: Comment creation failed. (Database was created.)"
exit 1 exit 1
fi fi
exit 0 exit 0
\ No newline at end of file
src/bin/scripts/createlang.sh
View file @ a0aab48f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.1 1999/12/05 20:02:48 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.2 1999/12/07 22:41:44 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
......
src/bin/scripts/createuser
View file @ a0aab48f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.2 1999/12/05 20:52:54 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.3 1999/12/07 22:41:44 momjian Exp $
# #
# Note - this should NOT be setuid. # Note - this should NOT be setuid.
# #
...@@ -35,6 +35,7 @@ else ...@@ -35,6 +35,7 @@ else
ECHO_C='\c' ECHO_C='\c'
fi fi
while [ $# -gt 0 ] while [ $# -gt 0 ]
do do
case "$1" in case "$1" in
...@@ -46,17 +47,38 @@ do ...@@ -46,17 +47,38 @@ do
--host|-h) --host|-h)
PSQLOPT="$PSQLOPT -h $2" PSQLOPT="$PSQLOPT -h $2"
shift;; shift;;
-h*)
PSQLOPT="$PSQLOPT $1"
;;
--host=*)
PSQLOPT="$PSQLOPT -h "`echo $1 | sed 's/^--host=//'`
;;
--port|-p) --port|-p)
PSQLOPT="$PSQLOPT -p $2" PSQLOPT="$PSQLOPT -p $2"
shift;; shift;;
# Uncomment these lines if you need the -U and -W options. -p*)
# They are confusing in this context, however. PSQLOPT="$PSQLOPT $1"
# --user|--username|-U) ;;
# PSQLOPT="$PSQLOPT -U $2" --port=*)
# shift;; PSQLOPT="$PSQLOPT -p "`echo $1 | sed 's/^--port=//'`
# --password|-W) ;;
# PSQLOPT="$PSQLOPT -W" # Note: These two specify the user to connect as (like in psql),
# ;; # not the user you're creating.
--user|--username|-U)
PSQLOPT="$PSQLOPT -U '$2'"
shift;;
-U*)
PSQLOPT="$PSQLOPT $1"
;;
--user=*)
PSQLOPT="$PSQLOPT -U "`echo $1 | sed 's/^--user=//'`
;;
--username=*)
PSQLOPT="$PSQLOPT -U "`echo $1 | sed 's/^--username=//'`
;;
--password|-W)
PSQLOPT="$PSQLOPT -W"
;;
--echo|-e) --echo|-e)
PSQLOPT="$PSQLOPT -e" PSQLOPT="$PSQLOPT -e"
;; ;;
...@@ -76,6 +98,15 @@ do ...@@ -76,6 +98,15 @@ do
--no-adduser|-A) --no-adduser|-A)
CanAddUser=f CanAddUser=f
;; ;;
--sysid|-i)
SysID=$2
shift;;
--sysid=*)
SysID=`echo $1 | sed 's/^--sysid=//'`
;;
-i*)
SysID=`echo $1 | sed 's/^-i//'`
;;
--pwprompt|--pw|-P) --pwprompt|--pw|-P)
PwPrompt=t PwPrompt=t
;; ;;
...@@ -94,11 +125,18 @@ done ...@@ -94,11 +125,18 @@ done
# Help # Help
if [ "$usage" ]; then if [ "$usage" ]; then
echo "Usage: $CMDNAME [-h <server>] [-p <port>] [-d|-D] [-a|-A] [-P] [username]" echo "Usage: $CMDNAME [-h server] [-p port] [-d|-D] [-a|-A] [-P] [-i id] [username]"
exit 0 exit 0
fi fi
if [ "$SysID" ]; then
if [ "$SysID" != "`echo $SysID | sed 's/[^0-9]//g'`" ]; then
echo "$CMDNAME: User sysid must be a positive number."
exit 1
fi
fi
# Get missing user attributes # Get missing user attributes
if [ -z "$NewUser" ]; then if [ -z "$NewUser" ]; then
...@@ -108,12 +146,12 @@ if [ -z "$NewUser" ]; then ...@@ -108,12 +146,12 @@ if [ -z "$NewUser" ]; then
fi fi
if [ "$PwPrompt" ]; then if [ "$PwPrompt" ]; then
$ECHO_N "Enter password for user $NewUser: "$ECHO_C $ECHO_N "Enter password for user \"$NewUser\": "$ECHO_C
read Password read Password
fi fi
if [ -z "$CanCreateDb" ]; then if [ -z "$CanCreateDb" ]; then
$ECHO_N "Is the new user allowed to create databases? (y/n) "$ECHO_C $ECHO_N "Shall the new user be allowed to create databases? (y/n) "$ECHO_C
read REPLY read REPLY
[ $? -ne 0 ] && exit 1 [ $? -ne 0 ] && exit 1
if [ $REPLY = "y" -o $REPLY = "Y" ]; then if [ $REPLY = "y" -o $REPLY = "Y" ]; then
...@@ -138,9 +176,16 @@ fi ...@@ -138,9 +176,16 @@ fi
# #
# build SQL command # build SQL command
# #
NewUser=`echo $NewUser | sed 's/\"/\\\"/g'`
Password=`echo $Password | sed 's/\"/\\\"/g'`
QUERY="CREATE USER \"$NewUser\"" QUERY="CREATE USER \"$NewUser\""
[ "$Password" ] && QUERY="$QUERY WITH PASSWORD \"$Password\"" SUBQUERY=
[ "$SysID" ] && SUBQUERY="$SUBQUERY SYSID $SysID"
[ "$Password" ] && SUBQUERY="$SUBQUERY PASSWORD \"$Password\""
[ "$SUBQUERY" ] && QUERY="$QUERY WITH $SUBQUERY"
[ "$CanCreateDb" = t ] && QUERY="$QUERY CREATEDB" [ "$CanCreateDb" = t ] && QUERY="$QUERY CREATEDB"
[ "$CanCreateDb" = f ] && QUERY="$QUERY NOCREATEDB" [ "$CanCreateDb" = f ] && QUERY="$QUERY NOCREATEDB"
[ "$CanAddUser" = t ] && QUERY="$QUERY CREATEUSER" [ "$CanAddUser" = t ] && QUERY="$QUERY CREATEUSER"
......
src/bin/scripts/dropdb
View file @ a0aab48f
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropdb,v 1.2 1999/12/05 20:52:54 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropdb,v 1.3 1999/12/07 22:41:44 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -31,6 +31,7 @@ else ...@@ -31,6 +31,7 @@ else
ECHO_C='\c' ECHO_C='\c'
fi fi
while [ $# -gt 0 ] while [ $# -gt 0 ]
do do
case "$1" in case "$1" in
...@@ -42,12 +43,33 @@ do ...@@ -42,12 +43,33 @@ do
--host|-h) --host|-h)
PSQLOPT="$PSQLOPT -h $2" PSQLOPT="$PSQLOPT -h $2"
shift;; shift;;
-h*)
PSQLOPT="$PSQLOPT $1"
;;
--host=*)
PSQLOPT="$PSQLOPT -h "`echo $1 | sed 's/^--host=//'`
;;
--port|-p) --port|-p)
PSQLOPT="$PSQLOPT -p $2" PSQLOPT="$PSQLOPT -p $2"
shift;; shift;;
-p*)
PSQLOPT="$PSQLOPT $1"
;;
--port=*)
PSQLOPT="$PSQLOPT -p "`echo $1 | sed 's/^--port=//'`
;;
--user|--username|-U) --user|--username|-U)
PSQLOPT="$PSQLOPT -U $2" PSQLOPT="$PSQLOPT -U '$2'"
shift;; shift;;
-U*)
PSQLOPT="$PSQLOPT $1"
;;
--user=*)
PSQLOPT="$PSQLOPT -U "`echo $1 | sed 's/^--user=//'`
;;
--username=*)
PSQLOPT="$PSQLOPT -U "`echo $1 | sed 's/^--username=//'`
;;
--password|-W) --password|-W)
PSQLOPT="$PSQLOPT -W" PSQLOPT="$PSQLOPT -W"
;; ;;
...@@ -74,7 +96,7 @@ done ...@@ -74,7 +96,7 @@ done
if [ "$usage" ]; then if [ "$usage" ]; then
echo "Usage: $CMDNAME [-h <server>] [-p <port>] [-U <username>] [-W] [-i] dbname" echo "Usage: $CMDNAME [-h server] [-p port] [-U username] [-i] dbname"
exit 0 exit 0
fi fi
...@@ -94,6 +116,8 @@ if [ "$forcedel" = f ]; then ...@@ -94,6 +116,8 @@ if [ "$forcedel" = f ]; then
fi fi
dbname=`echo $dbname | sed 's/\"/\\\"/g'`
psql $PSQLOPT -d template1 -c "DROP DATABASE \"$dbname\"" psql $PSQLOPT -d template1 -c "DROP DATABASE \"$dbname\""
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "$CMDNAME: Database removal failed." echo "$CMDNAME: Database removal failed."
......
src/bin/scripts/droplang
View file @ a0aab48f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.2 1999/12/05 20:52:54 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.3 1999/12/07 22:41:44 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -20,6 +20,17 @@ langname= ...@@ -20,6 +20,17 @@ langname=
echo= echo=
list= list=
# Check for echo -n vs echo \c
if echo '\c' | grep -s c >/dev/null 2>&1
then
ECHO_N="echo -n"
ECHO_C=""
else
ECHO_N="echo"
ECHO_C='\c'
fi
# ---------- # ----------
# Get options, language name and dbname # Get options, language name and dbname
......
src/bin/scripts/dropuser
View file @ a0aab48f
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# dropuser-- # dropuser--
# Utility for remocing a user from the PostgreSQL database. # Utility for removing a user from the PostgreSQL database.
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.2 1999/12/05 20:52:54 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.3 1999/12/07 22:41:44 momjian Exp $
# #
# Note - this should NOT be setuid. # Note - this should NOT be setuid.
# #
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
CMDNAME=`basename $0` CMDNAME=`basename $0`
PSQLOPT= PSQLOPT=
forcedel=t forcedel=t
DelUser=
# Check for echo -n vs echo \c # Check for echo -n vs echo \c
...@@ -29,6 +30,7 @@ else ...@@ -29,6 +30,7 @@ else
ECHO_C='\c' ECHO_C='\c'
fi fi
while [ $# -gt 0 ] while [ $# -gt 0 ]
do do
case "$1" in case "$1" in
...@@ -40,17 +42,38 @@ do ...@@ -40,17 +42,38 @@ do
--host|-h) --host|-h)
PSQLOPT="$PSQLOPT -h $2" PSQLOPT="$PSQLOPT -h $2"
shift;; shift;;
-h*)
PSQLOPT="$PSQLOPT $1"
;;
--host=*)
PSQLOPT="$PSQLOPT -h "`echo $1 | sed 's/^--host=//'`
;;
--port|-p) --port|-p)
PSQLOPT="$PSQLOPT -p $2" PSQLOPT="$PSQLOPT -p $2"
shift;; shift;;
# Uncomment these lines if you need the -U and -W options. -p*)
# They are confusing in this context, however. PSQLOPT="$PSQLOPT $1"
# --user|--username|-U) ;;
# PSQLOPT="$PSQLOPT -U $2" --port=*)
# shift;; PSQLOPT="$PSQLOPT -p "`echo $1 | sed 's/^--port=//'`
# --password|-W) ;;
# PSQLOPT="$PSQLOPT -W" # Note: These two specify the user to connect as (like in psql),
# ;; # not the user you're dropping.
--user|--username|-U)
PSQLOPT="$PSQLOPT -U '$2'"
shift;;
-U*)
PSQLOPT="$PSQLOPT $1"
;;
--user=*)
PSQLOPT="$PSQLOPT -U "`echo $1 | sed 's/^--user=//'`
;;
--username=*)
PSQLOPT="$PSQLOPT -U "`echo $1 | sed 's/^--username=//'`
;;
--password|-W)
PSQLOPT="$PSQLOPT -W"
;;
--echo|-e) --echo|-e)
PSQLOPT="$PSQLOPT -e" PSQLOPT="$PSQLOPT -e"
;; ;;
...@@ -76,7 +99,7 @@ done ...@@ -76,7 +99,7 @@ done
# Help # Help
if [ "$usage" ]; then if [ "$usage" ]; then
echo "Usage: $CMDNAME [-h <server>] [-p <port>] [-i] [username]" echo "Usage: $CMDNAME [-h server] [-p port] [-i] [username]"
exit 0 exit 0
fi fi
...@@ -84,7 +107,7 @@ fi ...@@ -84,7 +107,7 @@ fi
if [ -z "$DelUser" ]; then if [ -z "$DelUser" ]; then
$ECHO_N "Enter name of user to delete: "$ECHO_C $ECHO_N "Enter name of user to delete: "$ECHO_C
read NewUser read DelUser
[ $? -ne 0 ] && exit 1 [ $? -ne 0 ] && exit 1
fi fi
...@@ -99,6 +122,8 @@ if [ "$forcedel" = f ]; then ...@@ -99,6 +122,8 @@ if [ "$forcedel" = f ]; then
fi fi
DelUser=`echo $DelUser | sed 's/\"/\\\"/g'`
psql $PSQLOPT -d template1 -c "DROP USER \"$DelUser\"" psql $PSQLOPT -d template1 -c "DROP USER \"$DelUser\""
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
......
src/bin/scripts/vacuumdb
View file @ a0aab48f
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/vacuumdb,v 1.2 1999/12/05 20:02:49 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/scripts/Attic/vacuumdb,v 1.3 1999/12/07 22:41:44 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -21,6 +21,7 @@ PSQLOPT= ...@@ -21,6 +21,7 @@ PSQLOPT=
verbose= verbose=
analyze= analyze=
table= table=
dbname=
while [ $# -gt 0 ] while [ $# -gt 0 ]
do do
...@@ -33,12 +34,33 @@ do ...@@ -33,12 +34,33 @@ do
--host|-h) --host|-h)
PSQLOPT="$PSQLOPT -h $2" PSQLOPT="$PSQLOPT -h $2"
shift;; shift;;
-h*)
PSQLOPT="$PSQLOPT $1"
;;
--host=*)
PSQLOPT="$PSQLOPT -h "`echo $1 | sed 's/^--host=//'`
;;
--port|-p) --port|-p)
PSQLOPT="$PSQLOPT -p $2" PSQLOPT="$PSQLOPT -p $2"
shift;; shift;;
-p*)
PSQLOPT="$PSQLOPT $1"
;;
--port=*)
PSQLOPT="$PSQLOPT -p "`echo $1 | sed 's/^--port=//'`
;;
--user|--username|-U) --user|--username|-U)
PSQLOPT="$PSQLOPT -U $2" PSQLOPT="$PSQLOPT -U '$2'"
shift;; shift;;
-U*)
PSQLOPT="$PSQLOPT $1"
;;
--user=*)
PSQLOPT="$PSQLOPT -U "`echo $1 | sed 's/^--user=//'`
;;
--username=*)
PSQLOPT="$PSQLOPT -U "`echo $1 | sed 's/^--username=//'`
;;
--password|-W) --password|-W)
PSQLOPT="$PSQLOPT -W" PSQLOPT="$PSQLOPT -W"
;; ;;
...@@ -48,6 +70,9 @@ do ...@@ -48,6 +70,9 @@ do
--quiet|-q) --quiet|-q)
PSQLOPT="$PSQLOPT -o /dev/null" PSQLOPT="$PSQLOPT -o /dev/null"
;; ;;
--dbname|--database|-d)
dbname="$2"
shift;;
-d*) -d*)
dbname=`echo $1 | sed 's/^-d//'` dbname=`echo $1 | sed 's/^-d//'`
;; ;;
...@@ -59,21 +84,26 @@ do ...@@ -59,21 +84,26 @@ do
;; ;;
# options converted into SQL command # options converted into SQL command
--analyze|-z) --analyze|-z)
analyze="analyze" analyze="ANALYZE "
;; ;;
--table|-t) --table|-t)
table=$2 table="$2"
shift;; shift;;
-t*)
table=`echo $1 | sed 's/^-t//'`
;;
--table=*)
table=`echo $1 | sed 's/^--table=//'`
;;
--verbose|-v) --verbose|-v)
verbose="verbose" verbose="VERBOSE "
;; ;;
-*) -*)
echo "$CMDNAME: Unrecognized option: $1. Try -? for help." echo "$CMDNAME: Unrecognized option: $1. Try -? for help."
exit 1 exit 1
;; ;;
*)
*)
dbname="$1" dbname="$1"
;; ;;
esac esac
...@@ -82,7 +112,7 @@ done ...@@ -82,7 +112,7 @@ done
if [ "$usage" ]; then if [ "$usage" ]; then
echo "Usage: $CMDNAME [-h <server>] [-p <port>] [-U <username>] [-W] [-d <dbname>] \\" echo "Usage: $CMDNAME [-h server] [-p port] [-U username] [-d dbname] \\"
echo " [-z|--analyze] [-v|--verbose] [-t|--table 'table[(columns)]'] [dbname]" echo " [-z|--analyze] [-v|--verbose] [-t|--table 'table[(columns)]'] [dbname]"
exit 0 exit 0
fi fi
...@@ -92,10 +122,10 @@ if [ -z "$dbname" ]; then ...@@ -92,10 +122,10 @@ if [ -z "$dbname" ]; then
exit 1 exit 1
fi fi
psql $PSQLOPT -d "$dbname" -c "VACUUM $verbose $analyze $table" psql $PSQLOPT -d "$dbname" -c "VACUUM $verbose$analyze$table"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "$CMDNAME: Database vacuum failed." echo "$CMDNAME: Vacuum failed."
exit 1 exit 1
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment