[Dbconfig-common-devel] dbconfig-common/internal pgsql,1.2,1.3

Update of /cvsroot/dbconfig-common/dbconfig-common/internal
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv26326/internal

Modified Files:
	pgsql 
Log Message:
the next version is underway.  i there's a bit more that needs to be
done, but there's been enough done that i want to get it into cvs
before i accidentally rm -rf something important.

as soon as i finish the support for include file generation, and give
everything a final go-through with testing, i'll make another upload
to experimental and an announcement to d-d.


Index: pgsql
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/internal/pgsql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3

--- pgsql	4 Feb 2005 06:26:07 -0000	1.2
+++ pgsql	23 Feb 2005 05:39:59 -0000	1.3
@@ -29,72 +29,84 @@
 }
 
 _dbc_psql(){
-	local extra retval
+	local extra retval PGSSLMODE
+	PGSSLMODE="prefer"
+	retval=0
 	_dbc_psql_cmd_setup
+	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
-	su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' psql -q $extra $*"
-	retval=$?
+	dbc_dberror=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' psql -q $extra $*" 2>&1` || retval=$?
 	_dbc_psql_cmd_cleanup
 	return $retval
 }
 
 _dbc_createdb(){
-	local extra retval
+	local extra retval PGSSLMODE
+	PGSSLMODE="prefer"
+	retval=0
 	_dbc_psql_cmd_setup
+	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
-	su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' createdb -q -O $dbc_dbuser $extra $*"
-	retval=$?
+	dbc_dberror=`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
 }
 
 _dbc_dropdb(){
-	local extra retval
+	local extra retval PGSSLMODE
+	PGSSLMODE="prefer"
+	retval=0
 	_dbc_psql_cmd_setup
+	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
-	su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' dropdb -q $extra $*"
-	retval=$?
+	dbc_dberror=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' dropdb -q $extra $*" 2>&1` || retval=$?
 	_dbc_psql_cmd_cleanup
 	return $retval
 }
 
 _dbc_createuser(){
-	local extra dbc_dbname retval
+	local extra dbc_dbname retval PGSSLMODE
+	PGSSLMODE="prefer"
+	retval=0
 	_dbc_psql_cmd_setup
+	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
 	if [ "$dbc_authmethod_user" != "ident" ]; then 
 		dbc_dbname="template1" _dbc_pgsql_exec_command "CREATE USER \"$dbc_dbuser\" WITH PASSWORD '$dbc_dbpass'"
 		retval=$?
 	else
-		su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' createuser -A -D -q $extra $dbc_dbuser"
-		retval=$?
+		dbc_dberror=`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
 }
 
 _dbc_dropuser(){
-	local extra retval
+	local extra retval PGSSLMODE
+	PGSSLMODE="prefer"
+	retval=0
 	_dbc_psql_cmd_setup
+	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
-	su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' dropuser -q $extra $*"
-	retval=$?
+	dbc_dberror=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' dropuser -q $extra $*" 2>&1` || retval=$?
 	_dbc_psql_cmd_cleanup
 	return $retval
 }
 
 _dbc_pg_dump(){
-	local extra retval
+	local extra retval PGSSLMODE
+	PGSSLMODE="prefer"
+	retval=0
 	_dbc_psql_cmd_setup
+	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
-	su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' pg_dump $extra $*"
-	retval=$?
+	dbc_dberror=`su - postgres -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' pg_dump $extra $*" 2>&1` || retval=$?
 	_dbc_psql_cmd_cleanup
 	return $retval
 }
@@ -110,7 +122,7 @@
 		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."
+		dpkg-reconfigure -plow packagename to reconfigure. $dbc_dberror"
 		dbc_logline "unable to connect to postgresql server"
 		return 1
 	fi



