From 6b0e166644cd33e96bbb907190592ec1e88d644b Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Wed, 16 Oct 2002 03:44:28 +0000 Subject: [PATCH] Improve appearance of SET command. --- src/bin/scripts/clusterdb | 4 ++-- src/bin/scripts/createdb | 6 +++--- src/bin/scripts/createlang.sh | 8 ++++---- src/bin/scripts/createuser | 4 ++-- src/bin/scripts/dropdb | 4 ++-- src/bin/scripts/droplang | 6 +++--- src/bin/scripts/dropuser | 4 ++-- src/bin/scripts/vacuumdb | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/bin/scripts/clusterdb b/src/bin/scripts/clusterdb index c2b8b4e143c..1b2bd6c0b30 100644 --- a/src/bin/scripts/clusterdb +++ b/src/bin/scripts/clusterdb @@ -11,7 +11,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/clusterdb,v 1.5 2002/10/16 03:24:09 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/clusterdb,v 1.6 2002/10/16 03:44:28 momjian Exp $ # #------------------------------------------------------------------------- @@ -176,7 +176,7 @@ do idx=`echo $tabs | cut -d: -f3` query="$query CLUSTER $idx ON $nspc.$tab;" done - ${PATHNAME}psql $PSQLOPT $ECHOOPT -c "SET autocommit = 'on';$query" -d $db + ${PATHNAME}psql $PSQLOPT $ECHOOPT -c "SET autocommit TO 'on';$query" -d $db if [ "$?" -ne 0 ] then echo "$CMDNAME: While clustering $db, the following failed: $query" 1>&2 diff --git a/src/bin/scripts/createdb b/src/bin/scripts/createdb index ad837191200..e951ed40a0d 100644 --- a/src/bin/scripts/createdb +++ b/src/bin/scripts/createdb @@ -12,7 +12,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.26 2002/10/16 03:24:09 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.27 2002/10/16 03:44:28 momjian Exp $ # #------------------------------------------------------------------------- @@ -189,7 +189,7 @@ withstring= [ "$TEMPLATE" ] && withstring="$withstring TEMPLATE = \"$TEMPLATE\"" [ "$withstring" ] && withstring=" WITH$withstring" -${PATHNAME}psql $PSQLOPT -d template1 -c "SET autocommit = 'on';CREATE DATABASE \"$dbname\"$withstring" +${PATHNAME}psql $PSQLOPT -d template1 -c "SET autocommit TO 'on';CREATE DATABASE \"$dbname\"$withstring" if [ "$?" -ne 0 ]; then echo "$CMDNAME: database creation failed" 1>&2 exit 1 @@ -200,7 +200,7 @@ fi dbcomment=`echo "$dbcomment" | sed "s/'/\\\\\'/g"` -${PATHNAME}psql $PSQLOPT -d "$dbname" -c "SET autocommit = 'on';COMMENT ON DATABASE \"$dbname\" IS '$dbcomment'" +${PATHNAME}psql $PSQLOPT -d "$dbname" -c "SET autocommit TO 'on';COMMENT ON DATABASE \"$dbname\" IS '$dbcomment'" if [ "$?" -ne 0 ]; then echo "$CMDNAME: comment creation failed (database was created)" 1>&2 exit 1 diff --git a/src/bin/scripts/createlang.sh b/src/bin/scripts/createlang.sh index 0c408553c68..5ef9fffe4b7 100644 --- a/src/bin/scripts/createlang.sh +++ b/src/bin/scripts/createlang.sh @@ -7,7 +7,7 @@ # Portions Copyright (c) 1996-2002, 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.40 2002/10/16 03:24:09 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.41 2002/10/16 03:44:28 momjian Exp $ # #------------------------------------------------------------------------- @@ -270,7 +270,7 @@ fi # Create the call handler and the language # ---------- if [ "$handlerexists" = no ]; then - sqlcmd="SET autocommit = 'on';CREATE FUNCTION \"$handler\" () RETURNS LANGUAGE_HANDLER AS '$PGLIB/${object}' LANGUAGE C;" + sqlcmd="SET autocommit TO 'on';CREATE FUNCTION \"$handler\" () RETURNS LANGUAGE_HANDLER AS '$PGLIB/${object}' LANGUAGE C;" if [ "$showsql" = yes ]; then echo "$sqlcmd" fi @@ -281,7 +281,7 @@ if [ "$handlerexists" = no ]; then fi fi -sqlcmd="SET autocommit = 'on';CREATE ${trusted}LANGUAGE \"$langname\" HANDLER \"$handler\";" +sqlcmd="SET autocommit TO 'on';CREATE ${trusted}LANGUAGE \"$langname\" HANDLER \"$handler\";" if [ "$showsql" = yes ]; then echo "$sqlcmd" fi @@ -297,7 +297,7 @@ fi # seems best to disable public USAGE for an untrusted one. # ---------- if test -z "$trusted"; then - sqlcmd="SET autocommit = 'on';REVOKE ALL ON LANGUAGE \"$langname\" FROM PUBLIC;" + sqlcmd="SET autocommit TO 'on';REVOKE ALL ON LANGUAGE \"$langname\" FROM PUBLIC;" if [ "$showsql" = yes ]; then echo "$sqlcmd" fi diff --git a/src/bin/scripts/createuser b/src/bin/scripts/createuser index 83b48e5599a..ee758bdb872 100644 --- a/src/bin/scripts/createuser +++ b/src/bin/scripts/createuser @@ -9,7 +9,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.27 2002/10/16 03:24:09 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.28 2002/10/16 03:44:28 momjian Exp $ # # Note - this should NOT be setuid. # @@ -253,7 +253,7 @@ SUBQUERY= [ "$CanAddUser" = t ] && QUERY="$QUERY CREATEUSER" [ "$CanAddUser" = f ] && QUERY="$QUERY NOCREATEUSER" -${PATHNAME}psql -c "SET autocommit = 'on';$QUERY" -d template1 $PSQLOPT +${PATHNAME}psql -c "SET autocommit TO 'on';$QUERY" -d template1 $PSQLOPT if [ "$?" -ne 0 ]; then echo "$CMDNAME: creation of user \"$NewUser\" failed" 1>&2 exit 1 diff --git a/src/bin/scripts/dropdb b/src/bin/scripts/dropdb index 9ad1b40ebab..92892f6d1cd 100644 --- a/src/bin/scripts/dropdb +++ b/src/bin/scripts/dropdb @@ -11,7 +11,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropdb,v 1.17 2002/10/16 03:24:09 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropdb,v 1.18 2002/10/16 03:44:28 momjian Exp $ # #------------------------------------------------------------------------- @@ -138,7 +138,7 @@ fi dbname=`echo "$dbname" | sed 's/\"/\\\"/g'` -${PATHNAME}psql $PSQLOPT -d template1 -c "SET autocommit = 'on';DROP DATABASE \"$dbname\"" +${PATHNAME}psql $PSQLOPT -d template1 -c "SET autocommit TO 'on';DROP DATABASE \"$dbname\"" if [ "$?" -ne 0 ]; then echo "$CMDNAME: database removal failed" 1>&2 exit 1 diff --git a/src/bin/scripts/droplang b/src/bin/scripts/droplang index f4b2d4748ce..8d90250c5d9 100644 --- a/src/bin/scripts/droplang +++ b/src/bin/scripts/droplang @@ -7,7 +7,7 @@ # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.25 2002/10/16 03:24:09 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.26 2002/10/16 03:44:28 momjian Exp $ # #------------------------------------------------------------------------- @@ -229,7 +229,7 @@ fi # ---------- # Drop the language # ---------- -sqlcmd="SET autocommit = 'on';DROP LANGUAGE \"$langname\";" +sqlcmd="SET autocommit TO 'on';DROP LANGUAGE \"$langname\";" if [ "$showsql" = yes ]; then echo "$sqlcmd" fi @@ -256,7 +256,7 @@ if [ "$?" -ne 0 ]; then exit 1 fi -sqlcmd="SET autocommit = 'on';DROP FUNCTION \"$handler\" ();" +sqlcmd="SET autocommit TO 'on';DROP FUNCTION \"$handler\" ();" if [ "$showsql" = yes ]; then echo "$sqlcmd" fi diff --git a/src/bin/scripts/dropuser b/src/bin/scripts/dropuser index 907a9152d0c..49cbf7fc639 100644 --- a/src/bin/scripts/dropuser +++ b/src/bin/scripts/dropuser @@ -9,7 +9,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.19 2002/10/16 03:24:09 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.20 2002/10/16 03:44:28 momjian Exp $ # # Note - this should NOT be setuid. # @@ -148,7 +148,7 @@ fi DelUser=`echo "$DelUser" | sed 's/\"/\\\"/g'` -${PATHNAME}psql $PSQLOPT -d template1 -c "SET autocommit = 'on';DROP USER \"$DelUser\"" +${PATHNAME}psql $PSQLOPT -d template1 -c "SET autocommit TO 'on';DROP USER \"$DelUser\"" if [ "$?" -ne 0 ]; then echo "$CMDNAME: deletion of user \"$DelUser\" failed" 1>&2 diff --git a/src/bin/scripts/vacuumdb b/src/bin/scripts/vacuumdb index 8ff52e6de61..b1ac81f489e 100644 --- a/src/bin/scripts/vacuumdb +++ b/src/bin/scripts/vacuumdb @@ -12,7 +12,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/vacuumdb,v 1.24 2002/10/16 03:24:09 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/vacuumdb,v 1.25 2002/10/16 03:44:28 momjian Exp $ # #------------------------------------------------------------------------- @@ -169,7 +169,7 @@ fi for db in $dbname do [ "$alldb" -a "$quiet" -ne 1 ] && echo "Vacuuming $db" - ${PATHNAME}psql $PSQLOPT $ECHOOPT -c "SET autocommit = 'on';VACUUM $full $verbose $analyze $table" -d $db + ${PATHNAME}psql $PSQLOPT $ECHOOPT -c "SET autocommit TO 'on';VACUUM $full $verbose $analyze $table" -d $db if [ "$?" -ne 0 ]; then echo "$CMDNAME: vacuum $table $db failed" 1>&2 exit 1