Chris Browne cbbrowne at lists.slony.info
Tue Jul 28 15:20:50 PDT 2009
Update of /home/cvsd/slony1/slony1-engine/tests
In directory main.slony.info:/tmp/cvs-serv1404/tests

Modified Files:
      Tag: REL_1_2_STABLE
	run_test.sh 
Log Message:
Change createdb requests to draw from template0, so that the tests
work on PG 8.4, where this becomes needful in order to create databases
using UTF-8


Index: run_test.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/run_test.sh,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -C2 -d -r1.11.2.3 -r1.11.2.4
*** run_test.sh	7 Mar 2008 19:00:14 -0000	1.11.2.3
--- run_test.sh	28 Jul 2009 22:20:48 -0000	1.11.2.4
***************
*** 258,264 ****
  	if [ -n "${db}" -a "${host}" -a "${user}" ]; then
  	  status "creating origin DB: $user -h $host -U $user -p $port $db"
!   	  $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING $db 1> ${mktmp}/createdb.${originnode} 2> ${mktmp}/createdb.${originnode}
  	  if [ $? -ne 0 ]; then	   
! 	    err 3 "An error occured trying to $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING $db, ${mktmp}/createdb.${originnode} for details"
  	  fi
  	else
--- 258,264 ----
  	if [ -n "${db}" -a "${host}" -a "${user}" ]; then
  	  status "creating origin DB: $user -h $host -U $user -p $port $db"
!   	  $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING -T template0 $db 1> ${mktmp}/createdb.${originnode} 2> ${mktmp}/createdb.${originnode}
  	  if [ $? -ne 0 ]; then	   
! 	    err 3 "An error occured trying to $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING -T template0 $db, ${mktmp}/createdb.${originnode} for details"
  	  fi
  	else
***************
*** 293,297 ****
                if [ ${alias} -ne ${originnode} ]; then
  		status "creating subscriber ${alias} DB: $user -h $host -U $user -p $port $db"
! 	        $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING $db 1> ${mktmp}/createdb.${alias} 2> ${mktmp}/createdb.${alias}
  		status "add plpgsql to subscriber"
  		$pgbindir/createlang -h $host -U $user -p $port plpgsql $db
--- 293,297 ----
                if [ ${alias} -ne ${originnode} ]; then
  		status "creating subscriber ${alias} DB: $user -h $host -U $user -p $port $db"
! 	        $pgbindir/createdb -O $user -h $host -U $user -p $port --encoding $ENCODING -T template0 $db 1> ${mktmp}/createdb.${alias} 2> ${mktmp}/createdb.${alias}
  		status "add plpgsql to subscriber"
  		$pgbindir/createlang -h $host -U $user -p $port plpgsql $db



More information about the Slony1-commit mailing list