[Dbconfig-common-devel] dbconfig-common/internal mysql,1.2,1.3 pgsql,1.3,1.4
seanius@haydn.debian.org
seanius@haydn.debian.org
Update of /cvsroot/dbconfig-common/dbconfig-common/internal
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv18864/internal
Modified Files:
mysql pgsql
Log Message:
see the changelog for details. 1.6 done and uploaded to experimental
Index: mysql
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/internal/mysql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mysql 7 Feb 2005 14:17:04 -0000 1.2
+++ mysql 18 Apr 2005 03:48:42 -0000 1.3
@@ -59,7 +59,7 @@
## note this is done without passing any sensitive info on the cmdline
##
dbc_mysql_exec_file(){
- local l_sqlfile
+ local l_sqlfile l_retval l_error
l_sqlfile=$1
if [ ! "$l_sqlfile" ]; then
@@ -69,8 +69,13 @@
fi
mycnf=`_dbc_generate_mycnf`
- mysql --defaults-extra-file="$mycnf" $dbc_dbname < $l_sqlfile
+ l_error=`mysql --defaults-extra-file="$mycnf" $dbc_dbname < $l_sqlfile 2>&1`
+ l_retval=$?
rm -f $mycnf
+ if [ $l_retval -ne 0 ]; then
+ dbc_error="mysql said: $l_error"
+ return $l_retval
+ fi
}
##
Index: pgsql
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/internal/pgsql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pgsql 23 Feb 2005 05:39:59 -0000 1.3
+++ pgsql 18 Apr 2005 03:48:42 -0000 1.4
@@ -36,7 +36,7 @@
if [ "$dbc_ssl" ]; then PGSSLMODE="require"; fi
if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
- dbc_dberror=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' psql -q $extra $*" 2>&1` || retval=$?
+ dbc_error=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' psql --set "ON_ERROR_STOP=1" -q $extra $*" 2>&1` || retval=$?
_dbc_psql_cmd_cleanup
return $retval
}
@@ -49,7 +49,7 @@
if [ "$dbc_ssl" ]; then PGSSLMODE="require"; fi
if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
- dbc_dberror=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' createdb -q -O $dbc_dbuser $extra $*" 2>&1` || retval=$?
+ dbc_error=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' createdb -q -O $dbc_dbuser $extra $*" 2>&1` || retval=$?
_dbc_psql_cmd_cleanup
return $retval
}
@@ -62,7 +62,7 @@
if [ "$dbc_ssl" ]; then PGSSLMODE="require"; fi
if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
- dbc_dberror=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' dropdb -q $extra $*" 2>&1` || retval=$?
+ dbc_error=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' dropdb -q $extra $*" 2>&1` || retval=$?
_dbc_psql_cmd_cleanup
return $retval
}
@@ -79,7 +79,7 @@
dbc_dbname="template1" _dbc_pgsql_exec_command "CREATE USER \"$dbc_dbuser\" WITH PASSWORD '$dbc_dbpass'"
retval=$?
else
- dbc_dberror=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' createuser -A -D -q $extra $dbc_dbuser" 2>&1` || retval=$?
+ dbc_error=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' createuser -A -D -q $extra $dbc_dbuser" 2>&1` || retval=$?
fi
_dbc_psql_cmd_cleanup
return $retval
@@ -93,7 +93,7 @@
if [ "$dbc_ssl" ]; then PGSSLMODE="require"; fi
if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
- dbc_dberror=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' dropuser -q $extra $*" 2>&1` || retval=$?
+ dbc_error=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' dropuser -q $extra $*" 2>&1` || retval=$?
_dbc_psql_cmd_cleanup
return $retval
}
@@ -106,7 +106,7 @@
if [ "$dbc_ssl" ]; then PGSSLMODE="require"; fi
if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
- dbc_dberror=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' pg_dump $extra $*" 2>&1` || retval=$?
+ dbc_error=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' pg_dump $extra $*" 2>&1` || retval=$?
_dbc_psql_cmd_cleanup
return $retval
}
@@ -117,12 +117,7 @@
_dbc_pgsql_check_connect(){
local constat
constat="bad"
- _dbc_psql template1 < /dev/null && constat=good
- if [ "$constat" = "bad" ]; then
- dbc_error="Error when trying to connect to the postgresql
- database. This error can occur if you have no database
- to connect to, or if the password was incorrect. use:
- dpkg-reconfigure -plow packagename to reconfigure. $dbc_dberror"
+ if ! _dbc_psql template1 < /dev/null; then
dbc_logline "unable to connect to postgresql server"
return 1
fi
@@ -159,8 +154,7 @@
cat << EOF > $l_sqlfile
$statement
EOF
- _dbc_psql $dbc_dbname < $l_sqlfile
- retval=$?
+ _dbc_psql $dbc_dbname < $l_sqlfile || retval=$?
rm -f $l_sqlfile
return $retval
}
@@ -182,9 +176,10 @@
## not only does the user exist, but that it should be able to connect
##
_dbc_pgsql_check_user(){
- local extra dbc_dbname
- dbc_dbname=template1 extra="-A" _dbc_pgsql_exec_command "select usename from pg_user where usename='$dbc_dbuser'" | grep -q "^$dbc_dbuser\$"
- return $?
+ local dbc_dbname l_retval
+ dbc_dbname=template1 _dbc_pgsql_exec_command "ALTER USER \"$dbc_dbuser\""
+ l_retval=$?
+ return $l_retval
}
###
@@ -206,7 +201,6 @@
dbc_pgsql_createdb(){
dbc_status=error
- dbc_error=''
_dbc_sanity_check dbname dbadmin psql dbuser createdb || return 1
_dbc_pgsql_check_connect || return 1
@@ -221,14 +215,12 @@
dbc_logline "success"
dbc_logpart "verifying database $dbc_dbname exists:"
if ! _dbc_pgsql_check_database "$dbc_dbname"; then
- dbc_error="unable to create database $dbc_dbname."
dbc_logline "failed"
else
dbc_status=create
dbc_logline "success"
fi
else
- dbc_error="unable to create database, pgsql exit status $?"
dbc_logline "failed"
fi
fi
@@ -246,7 +238,6 @@
dbc_pgsql_dropdb(){
dbc_status=error
- dbc_error=""
_dbc_sanity_check dbname dbadmin dropdb || return 1
_dbc_pgsql_check_connect || return 1
@@ -259,13 +250,11 @@
dbc_logpart "verifying database $dbc_dbname was dropped:"
if _dbc_pgsql_check_database "$dbc_dbname"; then
dbc_logline "failed"
- dbc_error="could not drop database $dbc_dbname"
else
dbc_logline "success"
dbc_status=drop
fi
else
- dbc_error="unable to drop database, dropdb exit code $?"
dbc_logline "does not exist"
fi
else
@@ -291,7 +280,6 @@
dbc_dbname=template1
dbc_status=error
- dbc_error=""
_dbc_sanity_check dbuser dbadmin createuser || return 1
_dbc_pgsql_check_connect || return 1
@@ -316,7 +304,6 @@
if _dbc_pgsql_exec_command "ALTER USER \"$dbc_dbuser\" WITH PASSWORD '$dbc_dbpass'"; then
dbc_logline "success"
else
- dbc_error="unable to reset pass for $dbc_dbuser"
dbc_logline "failed"
return 1
fi
@@ -325,7 +312,6 @@
dbc_logline "success"
dbc_logpart "verifying creation of user:"
if ! _dbc_pgsql_check_user ; then
- dbc_error="unable to create user $dbc_dbuser."
dbc_logline "failed"
return 1
else
@@ -333,7 +319,6 @@
dbc_logline "success"
fi
else
- dbc_error="unable to grant privileges to $dbc_dbuser, createuser error $?"
dbc_logline "failed"
return 1
fi
@@ -354,7 +339,6 @@
local l_dballow
dbc_status=error
- dbc_error=""
_dbc_sanity_check dbuser dbname dbadmin dropuser || return 1
_dbc_pgsql_check_connect || return 1
@@ -378,7 +362,6 @@
dbc_status=drop
dbc_logline "success"
else
- dbc_error="unable to revoke privileges, pgsql error $?."
dbc_logline "failed"
fi
fi