Update of /home/cvsd/slony1/slony1-engine/tests/testddl
In directory main.slony.info:/tmp/cvs-serv26559

Modified Files:
      Tag: REL_1_2_STABLE
	README generate_dml.sh init_subscribe_set.ik settings.ik 
Added Files:
      Tag: REL_1_2_STABLE
	ddl_update_part2.sql individual_ddl.sh 
Log Message:
Augment DDL test with an "EXECUTE ONLY ON" case.


Index: settings.ik
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/settings.ik,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** settings.ik	18 Nov 2005 17:15:21 -0000	1.1
--- settings.ik	30 Mar 2007 22:43:04 -0000	1.1.4.1
***************
*** 1,4 ****
  NUMCLUSTERS=${NUMCLUSTERS:-"1"}
! NUMNODES=${NUMNODES:-"2"}
  ORIGINNODE=1
  WORKERS=${WORKERS:-"1"}
--- 1,4 ----
  NUMCLUSTERS=${NUMCLUSTERS:-"1"}
! NUMNODES=${NUMNODES:-"3"}
  ORIGINNODE=1
  WORKERS=${WORKERS:-"1"}

--- NEW FILE: ddl_update_part2.sql ---
create sequence t1seq;
alter table table1 add column seqed integer;
alter table table1 alter column seqed set default nextval('t1seq');
update table1 set seqed = nextval('t1seq');
alter table table1 add constraint seqed_unique UNIQUE(seqed);

Index: generate_dml.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/generate_dml.sh,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -d -r1.3.2.3 -r1.3.2.4
*** generate_dml.sh	22 Mar 2007 20:46:12 -0000	1.3.2.3
--- generate_dml.sh	30 Mar 2007 22:43:04 -0000	1.3.2.4
***************
*** 31,34 ****
--- 31,36 ----
    percent=`expr $j \* 5`
    status "$percent %"
+   GENDATA="$mktmp/generate.data"
+   echo "" > ${GENDATA}
    while : ; do
      txtalen=$(random_number 1 100)
***************
*** 38,42 ****
      txtb=$(random_string ${txtblen})
      txtb=`echo ${txtb} | sed -e "s/\\\\\\\/\\\\\\\\\\\\\\/g" -e "s/'/''/g"`
-     GENDATA="$mktmp/generate.data"
      echo "INSERT INTO table1(data) VALUES ('${txta}');" >> $GENDATA
      echo "INSERT INTO table2(table1_id,data) SELECT id, '${txtb}' FROM table1 WHERE data='${txta}';" >> $GENDATA
--- 40,43 ----
***************
*** 87,90 ****
--- 88,107 ----
    $pgbindir/psql -h $host -p $port -U $user -d $db < $mktmp/generate.data 1> $LOG 2> $LOG
    wait_for_catchup
+ 
+   status "Execute a script on each node, one by one"
+   for node in 1 2 3; do
+       init_preamble
+       sh ${testname}/individual_ddl.sh ${testname} ${node} >> ${SCRIPT}
+       status "execute DDL script only on node ${node}"
+       do_ik
+   done
+ 
+   status "Generate still more data"
+   generate_initdata
+   eval db=\$DB${originnode}
+   status "loading extra data to node $db"
+   $pgbindir/psql -h $host -p $port -U $user -d $db < $mktmp/generate.data 1> $LOG 2> $LOG
+   wait_for_catchup
+ 
    status "done"
  }

--- NEW FILE: individual_ddl.sh ---
testname=$1
node=$2
echo "
  EXECUTE SCRIPT (
       SET ID = 1,
       FILENAME = '${testname}/ddl_update_part2.sql',
       EVENT NODE = 1
       EXECUTE ONLY ON = ${node}
    );
"

Index: README
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/README,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** README	18 Nov 2005 17:15:21 -0000	1.1
--- README	30 Mar 2007 22:43:04 -0000	1.1.4.1
***************
*** 10,11 ****
--- 10,14 ----
  4.  Inserting new data as part of the script
  5.  Updating data as part of the script
+ 
+ 2007-03-31 - Add in a third node, and add in a series of "EXECUTE ONLY
+ ON" clauses.

Index: init_subscribe_set.ik
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/init_subscribe_set.ik,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** init_subscribe_set.ik	18 Nov 2005 17:15:21 -0000	1.1
--- init_subscribe_set.ik	30 Mar 2007 22:43:04 -0000	1.1.4.1
***************
*** 1 ****
--- 1,6 ----
  subscribe set ( id = 1, provider = 1, receiver = 2, forward = no);
+ sync(id=1);
+ wait for event (origin=1, confirmed=2);
+ echo 'sleep a couple seconds';
+ sleep (seconds = 2);
+ subscribe set ( id = 1, provider = 1, receiver = 3, forward = no);