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

Modified Files:
	generate_dml.sh init_add_tables.ik settings.ik init_schema.sql 
	schema.diff README 
Log Message:
Per bug #18 (http://www.slony.info/bugzilla/show_bug.cgi?id=18)
change HEAD to strip trailing "v's" from the attribute info passed to
the logtrigger function.

This includes adding a test case where we make sure that the primary key
has bits of it separated by non-key attributes.



Index: settings.ik
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/test1/settings.ik,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** settings.ik	7 Sep 2007 19:50:10 -0000	1.4
--- settings.ik	15 Jul 2008 22:25:44 -0000	1.5
***************
*** 3,5 ****
  ORIGINNODE=1
  WORKERS=${WORKERS:-"1"}
- SLONCONF2=true
\ No newline at end of file
--- 3,4 ----

Index: init_add_tables.ik
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/test1/init_add_tables.ik,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** init_add_tables.ik	18 Apr 2007 15:03:51 -0000	1.9
--- init_add_tables.ik	15 Jul 2008 22:25:44 -0000	1.10
***************
*** 11,13 ****
  }
  
! set add table (id=4, set id=1, origin=1, fully qualified name = 'public.table4', comment='a table of many types');
\ No newline at end of file
--- 11,15 ----
  }
  
! set add table (id=4, set id=1, origin=1, fully qualified name = 'public.table4', comment='a table of many types');
! 
! set add table (id=5, set id=1, origin=1, fully qualified name = 'public.table5', comment='a table with composite PK strewn across the table');
\ No newline at end of file

Index: generate_dml.sh
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/test1/generate_dml.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** generate_dml.sh	13 Feb 2008 18:39:17 -0000	1.16
--- generate_dml.sh	15 Jul 2008 22:25:44 -0000	1.17
***************
*** 46,50 ****
      echo "INSERT INTO table2(table1_id,data) SELECT id, '${txtb}' FROM table1 WHERE data='${txta}';" >> $GENDATA
      echo "INSERT INTO table3(table2_id) SELECT id FROM table2 WHERE data ='${txtb}';" >> $GENDATA
!     echo "INSERT INTO table5(numcol,realcol,ptcol,pathcol,polycol,circcol,ipcol,maccol,bitcol) values ('${ra}${rb}.${rc}','${ra}.${rb}${rc}','(${ra},${rb})','((${ra},${ra}),(${rb},${rb}),(${rc},${rc}),(${ra},${rc}))','((${ra},${rb}),(${rc},${ra}),(${rb},${rc}),(${rc},${rb}))','<(${ra},${rb}),${rc}>','192.168.${ra}.${rb}${rc}','08:00:2d:0${ra}:0${rb}:0${rc}',X'${ra}${rb}${rc}');" >> $GENDATA
      if [ ${i} -ge ${numrows} ]; then
        break;
--- 46,51 ----
      echo "INSERT INTO table2(table1_id,data) SELECT id, '${txtb}' FROM table1 WHERE data='${txta}';" >> $GENDATA
      echo "INSERT INTO table3(table2_id) SELECT id FROM table2 WHERE data ='${txtb}';" >> $GENDATA
!     echo "INSERT INTO table4(numcol,realcol,ptcol,pathcol,polycol,circcol,ipcol,maccol,bitcol) values ('${ra}${rb}.${rc}','${ra}.${rb}${rc}','(${ra},${rb})','((${ra},${ra}),(${rb},${rb}),(${rc},${rc}),(${ra},${rc}))','((${ra},${rb}),(${rc},${ra}),(${rb},${rc}),(${rc},${rb}))','<(${ra},${rb}),${rc}>','192.168.${ra}.${rb}${rc}','08:00:2d:0${ra}:0${rb}:0${rc}',X'${ra}${rb}${rc}');" >> $GENDATA
!     echo "INSERT INTO table5(d1,d2,d3,d4,d5,d6,d7,d8,d9,d10,d11) values ('${txta}${ra}','${txta}${rb}','${txta}${rc}','${txtb}${ra}','${txtb}${rb}','${txtb}${rc}','${txtb}${ra}','${txtb}${rb}','${txtb}${rc}','${txtb}${ra}','${txtb}${rb}');" >> $GENDATA
      if [ ${i} -ge ${numrows} ]; then
        break;

Index: init_schema.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/test1/init_schema.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** init_schema.sql	18 Apr 2007 15:03:51 -0000	1.6
--- init_schema.sql	15 Jul 2008 22:25:44 -0000	1.7
***************
*** 30,31 ****
--- 30,49 ----
    bitcol bit varying(20)  -- X'123' 
  );
+ 
+ create table table5 (
+   id serial,
+   d1 text,
+   d2 text,
+   id2 serial,
+   d3 text,
+   d4 text,
+   d5 text,
+   d6 text,
+   id3 serial,
+   d7 text,
+   d8 text,
+   d9 text,
+   d10 text,
+   d11 text,
+   primary key(id, id2, id3)
+ );
\ No newline at end of file

Index: schema.diff
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/test1/schema.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** schema.diff	18 Apr 2007 15:03:51 -0000	1.4
--- schema.diff	15 Jul 2008 22:25:44 -0000	1.5
***************
*** 1,3 ****
  SELECT id,data FROM table1 ORDER BY id
  SELECT id,table1_id,data FROM table2 ORDER BY id
! SELECT id,numcol,realcol,ptcol,pathcol,polycol,circcol,ipcol,maccol, bitcol from table4 order by id;
--- 1,4 ----
  SELECT id,data FROM table1 ORDER BY id
  SELECT id,table1_id,data FROM table2 ORDER BY id
! SELECT id,numcol,realcol,ptcol,pathcol,polycol,circcol,ipcol,maccol, bitcol from table4 order by id
! SELECT id,d1,d2,id2,d3,d4,d5,d6,id3,d7,d8,d9,d10,d11 from table5 order by id,id2,id3
\ No newline at end of file

Index: README
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tests/test1/README,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** README	13 Feb 2008 18:39:17 -0000	1.12
--- README	15 Jul 2008 22:25:44 -0000	1.13
***************
*** 6,10 ****
  them from one database to another.
    
! The three tables are of the three interesting types:
    
  1.  table1 has a formal primary key
--- 6,10 ----
  them from one database to another.
    
! The tables are of the several interesting types:
    
  1.  table1 has a formal primary key
***************
*** 22,25 ****
--- 22,30 ----
  replicate properly.
  
+ 5.1  table5 has a composite primary key (on id1,id2,id3) where
+ the primary key attributes are strewn throughout the table.  This is
+ to make sure we have a case that exercises the logic that changed with
+ bug #18.
+ 
  6.  It does a test of the function generate_sync_event() to make sure
  that it works as expected