mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-03 07:56:49 +02:00
Fix pg_upgrade to notice if psql fails to execute the given
script, and not proceed with the update if so. Also add #!/bin/sh header line.
This commit is contained in:
parent
30b2d287fb
commit
a7cdfdf022
@ -1,4 +1,8 @@
|
|||||||
:
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# pg_upgrade: update a database without needing a full dump/reload cycle
|
||||||
|
# CAUTION: read the manual page before trying to use this!
|
||||||
|
|
||||||
trap "rm -f /tmp/$$" 0 1 2 3 15
|
trap "rm -f /tmp/$$" 0 1 2 3 15
|
||||||
|
|
||||||
if [ "$#" -eq 0 ]
|
if [ "$#" -eq 0 ]
|
||||||
@ -67,6 +71,11 @@ cat $INPUT | awk ' {
|
|||||||
|
|
||||||
psql "template1" <"/tmp/$$"
|
psql "template1" <"/tmp/$$"
|
||||||
|
|
||||||
|
if [ $? -ne 0 ]
|
||||||
|
then echo "psql failed to execute $INPUT script." 1>&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
for DIR in data/base/*
|
for DIR in data/base/*
|
||||||
do
|
do
|
||||||
BASEDIR="`basename $DIR`"
|
BASEDIR="`basename $DIR`"
|
||||||
@ -86,4 +95,4 @@ done
|
|||||||
mv $OLDDIR/pg_log data
|
mv $OLDDIR/pg_log data
|
||||||
mv $OLDDIR/pg_variable data
|
mv $OLDDIR/pg_variable data
|
||||||
|
|
||||||
echo "You may removed the $OLDDIR directory with 'rm -r $OLDDIR'."
|
echo "You may remove the $OLDDIR directory with 'rm -r $OLDDIR'."
|
||||||
|
Loading…
Reference in New Issue
Block a user