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

Modified Files:
	README ddl_update_part2.sql generate_dml.sh individual_ddl.sh 
	init_add_tables.ik init_schema.sql init_subscribe_set.ik 
Log Message:
Applied changes made in 1.2 branch to fix "EXECUTE SCRIPT" only on a specified
node to HEAD.

Also fixed up a bunch of tests that were using TABLE ADD KEY (no longer
supported in HEAD).


Index: ddl_update_part2.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/ddl_update_part2.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ddl_update_part2.sql	30 Mar 2007 22:44:05 -0000	1.2
--- ddl_update_part2.sql	18 Apr 2007 19:26:54 -0000	1.3
***************
*** 4,5 ****
--- 4,6 ----
  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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** generate_dml.sh	30 Mar 2007 22:44:05 -0000	1.7
--- generate_dml.sh	18 Apr 2007 19:26:54 -0000	1.8
***************
*** 23,27 ****
  generate_initdata()
  {
!   numrows=$(random_number 50 1000)
    i=0;
    trippoint=`expr $numrows / 20`
--- 23,27 ----
  generate_initdata()
  {
!   numrows=$(random_number 150 350)
    i=0;
    trippoint=`expr $numrows / 20`
***************
*** 93,97 ****
        init_preamble
        sh ${testname}/individual_ddl.sh ${testname} ${node} >> ${SCRIPT}
!       status "execute DDL script only on node ${node}"
        do_ik
    done
--- 93,97 ----
        init_preamble
        sh ${testname}/individual_ddl.sh ${testname} ${node} >> ${SCRIPT}
!       status "execute DDL script on node ${node}"
        do_ik
    done

Index: individual_ddl.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/individual_ddl.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** individual_ddl.sh	2 Apr 2007 18:52:18 -0000	1.3
--- individual_ddl.sh	18 Apr 2007 19:26:54 -0000	1.4
***************
*** 5,9 ****
         SET ID = 1,
         FILENAME = '${testname}/ddl_update_part2.sql',
!        EVENT NODE = 1,
         EXECUTE ONLY ON = ${node}
      );
--- 5,9 ----
         SET ID = 1,
         FILENAME = '${testname}/ddl_update_part2.sql',
!        EVENT NODE = ${node},
         EXECUTE ONLY ON = ${node}
      );

Index: init_add_tables.ik
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/init_add_tables.ik,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** init_add_tables.ik	9 Jan 2006 20:12:56 -0000	1.2
--- init_add_tables.ik	18 Apr 2007 19:26:54 -0000	1.3
***************
*** 1,6 ****
  set add table (id=1, set id=1, origin=1, fully qualified name = 'public.table1', comment='accounts table');
  set add table (id=2, set id=1, origin=1, fully qualified name = 'public.table2', key='table2_id_key');
! table add key (node id = 1, fully qualified name = 'public.table3');
! set add table (id=3, set id=1, origin=1, fully qualified name = 'public.table3', key = SERIAL);
  set add table (id=4, set id=1, origin=1, fully qualified name = 'public.table4');
  set add table (id=5, set id=1, origin=1, fully qualified name = 'public.billing_discount');
--- 1,5 ----
  set add table (id=1, set id=1, origin=1, fully qualified name = 'public.table1', comment='accounts table');
  set add table (id=2, set id=1, origin=1, fully qualified name = 'public.table2', key='table2_id_key');
! set add table (id=3, set id=1, origin=1, fully qualified name = 'public.table3');
  set add table (id=4, set id=1, origin=1, fully qualified name = 'public.table4');
  set add table (id=5, set id=1, origin=1, fully qualified name = 'public.billing_discount');

Index: init_schema.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/init_schema.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** init_schema.sql	9 Jan 2006 20:12:56 -0000	1.2
--- init_schema.sql	18 Apr 2007 19:26:54 -0000	1.3
***************
*** 17,21 ****
    mod_date	TIMESTAMPTZ	NOT NULL DEFAULT now(),
    data		FLOAT		NOT NULL DEFAULT random()
!   CONSTRAINT table3_date_check	CHECK (mod_date <= now())
  ); 
  
--- 17,22 ----
    mod_date	TIMESTAMPTZ	NOT NULL DEFAULT now(),
    data		FLOAT		NOT NULL DEFAULT random()
!   CONSTRAINT table3_date_check	CHECK (mod_date <= now()),
!   primary key(id)
  ); 
  

Index: README
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/testddl/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	18 Nov 2005 17:15:21 -0000	1.1
--- README	18 Apr 2007 19:26:54 -0000	1.2
***************
*** 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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** init_subscribe_set.ik	30 Mar 2007 22:44:05 -0000	1.2
--- init_subscribe_set.ik	18 Apr 2007 19:26:54 -0000	1.3
***************
*** 1,2 ****
--- 1,4 ----
+ echo 'sleep a couple seconds';
+ sleep (seconds = 2);
  subscribe set ( id = 1, provider = 1, receiver = 2, forward = no);
  sync(id=1);