Log Message:
-----------
Fixes to test scripts - per Seneca Cunningham

Seneca located numerous instances where tests' code needed to specify port
numbers in order to allow use of multiple backends.

Modified Files:
--------------
    slony1-engine/tests/testddl:
        ddl_updates.sql (r1.1 -> r1.2)
        generate_dml.sh (r1.2 -> r1.3)
        init_add_tables.ik (r1.1 -> r1.2)
        init_schema.sql (r1.1 -> r1.2)
    slony1-engine/tests/testschemanames:
        generate_dml.sh (r1.2 -> r1.3)
    slony1-engine/tests/testseqnames:
        generate_dml.sh (r1.2 -> r1.3)
    slony1-engine/tests/testtabnames:
        generate_dml.sh (r1.2 -> r1.3)
    slony1-engine/tests/testutf8:
        generate_dml.sh (r1.2 -> r1.3)

-------------- next part --------------
Index: init_add_tables.ik
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testddl/init_add_tables.ik,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltests/testddl/init_add_tables.ik -Ltests/testddl/init_add_tables.ik -u -w -r1.1 -r1.2
--- tests/testddl/init_add_tables.ik
+++ tests/testddl/init_add_tables.ik
@@ -3,3 +3,4 @@
 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');
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testddl/generate_dml.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ltests/testddl/generate_dml.sh -Ltests/testddl/generate_dml.sh -u -w -r1.2 -r1.3
--- tests/testddl/generate_dml.sh
+++ tests/testddl/generate_dml.sh
@@ -65,10 +65,11 @@
   eval db=\$DB${originnode}
   eval host=\$HOST${originnode}
   eval user=\$USER${originnode}
+  eval port=\$PORT${originnode}
   generate_initdata
   launch_poll
   status "loading data"
-  $pgbindir/psql -h $host -U $user -d $db < $mktmp/generate.data 1> $LOG 2> $LOG
+  $pgbindir/psql -h $host -p $port -U $user -d $db < $mktmp/generate.data 1> $LOG 2> $LOG
   if [ $? -ne 0 ]; then
     warn 3 "do_initdata failed, see $mktmp/initdata.log for details"
   fi
Index: init_schema.sql
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testddl/init_schema.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltests/testddl/init_schema.sql -Ltests/testddl/init_schema.sql -u -w -r1.1 -r1.2
--- tests/testddl/init_schema.sql
+++ tests/testddl/init_schema.sql
@@ -30,3 +30,21 @@
 insert into table4 (data) values ('HM Murdoch');
 insert into table4 (data) values ('Face');
 insert into table4 (data) values ('Hannibal');
\ No newline at end of file
+
+create sequence billing_discount_seq;
+
+CREATE TABLE billing_discount (
+discount_code character(2) NOT NULL,
+billing_object_type character varying(10) NOT NULL,
+billing_action_type character varying(10) NOT NULL,
+discount_amount numeric(7,2) NOT NULL,
+start_date timestamp with time zone NOT NULL,
+end_date timestamp with time zone NOT NULL,
+billing_discount_id integer DEFAULT nextval('billing_discount_seq'::text) NOT NULL,
+registrar_id integer,
+tld_id integer,
+zone_id integer
+);
+
+ALTER TABLE ONLY billing_discount
+    ADD CONSTRAINT billing_discount_pkey PRIMARY KEY (billing_discount_id);
Index: ddl_updates.sql
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testddl/ddl_updates.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltests/testddl/ddl_updates.sql -Ltests/testddl/ddl_updates.sql -u -w -r1.1 -r1.2
--- tests/testddl/ddl_updates.sql
+++ tests/testddl/ddl_updates.sql
@@ -3,3 +3,7 @@
 alter table table4 alter column newcol set default now();
 alter table table4 rename column id1 to col1;
 alter table table4 rename column id2 to col2;
+
+ALTER TABLE billing_discount ADD column "use_term" character(1);
+ALTER TABLE billing_discount ALTER column use_term set default 'n';
+ALTER TABLE billing_discount add constraint use_term_cons check (use_term in ('y','n'));
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testschemanames/generate_dml.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ltests/testschemanames/generate_dml.sh -Ltests/testschemanames/generate_dml.sh -u -w -r1.2 -r1.3
--- tests/testschemanames/generate_dml.sh
+++ tests/testschemanames/generate_dml.sh
@@ -66,10 +66,11 @@
   eval db=\$DB${originnode}
    eval host=\$HOST${originnode}
   eval user=\$USER${originnode}
+  eval port=\$PORT${originnode}
   generate_initdata
   launch_poll
   status "loading data"
-  $pgbindir/psql -h $host -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
+  $pgbindir/psql -h $host -p $port -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
   if [ $? -ne 0 ]; then
     warn 3 "do_initdata failed, see $mktmp/initdata.log for details"
   fi 
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testseqnames/generate_dml.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ltests/testseqnames/generate_dml.sh -Ltests/testseqnames/generate_dml.sh -u -w -r1.2 -r1.3
--- tests/testseqnames/generate_dml.sh
+++ tests/testseqnames/generate_dml.sh
@@ -64,10 +64,11 @@
   eval db=\$DB${originnode}
    eval host=\$HOST${originnode}
   eval user=\$USER${originnode}
+  eval port=\$PORT${originnode}
   generate_initdata
   launch_poll
   status "loading data"
-  $pgbindir/psql -h $host -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
+  $pgbindir/psql -h $host -p $port -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
   if [ $? -ne 0 ]; then
     warn 3 "do_initdata failed, see $mktmp/initdata.log for details"
   fi 
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testtabnames/generate_dml.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ltests/testtabnames/generate_dml.sh -Ltests/testtabnames/generate_dml.sh -u -w -r1.2 -r1.3
--- tests/testtabnames/generate_dml.sh
+++ tests/testtabnames/generate_dml.sh
@@ -65,10 +65,11 @@
   eval db=\$DB${originnode}
    eval host=\$HOST${originnode}
   eval user=\$USER${originnode}
+  eval port=\$PORT${originnode}
   generate_initdata
   launch_poll
   status "loading data"
-  $pgbindir/psql -h $host -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
+  $pgbindir/psql -h $host -p $port -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
   if [ $? -ne 0 ]; then
     warn 3 "do_initdata failed, see $mktmp/initdata.log for details"
   fi 
Index: generate_dml.sh
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tests/testutf8/generate_dml.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ltests/testutf8/generate_dml.sh -Ltests/testutf8/generate_dml.sh -u -w -r1.2 -r1.3
--- tests/testutf8/generate_dml.sh
+++ tests/testutf8/generate_dml.sh
@@ -68,10 +68,11 @@
   eval db=\$DB${originnode}
    eval host=\$HOST${originnode}
   eval user=\$USER${originnode}
+  eval port=\$PORT${originnode}
   generate_initdata
   launch_poll
   status "loading data from $mktmp/generate.data"
-  $pgbindir/psql -h $host -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
+  $pgbindir/psql -h $host -p $port -d $db -U $user < $mktmp/generate.data 1> $mktmp/initdata.log 2> $mktmp/initdata.log
   if [ $? -ne 0 ]; then
     warn 3 "do_initdata failed, see $mktmp/initdata.log for details"
   fi