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

Modified Files:
	SAMPLE 
Log Message:
Remove references to Slony-I-generated candidate PK as this functionality
has been dropped from version 2.


Index: SAMPLE
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/SAMPLE,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SAMPLE	18 Apr 2007 15:03:51 -0000	1.3
--- SAMPLE	22 Jun 2007 15:29:07 -0000	1.4
***************
*** 44,53 ****
  As of this writing Slony-I does not attempt to automatically copy the
  table definitions when a node subscribes to a data set.  Because of this,
! we have to create one full and one schema-only pgbench database.
  
  createdb -O $PGBENCH_USER -h $HOST1 $DBNAME1
  createdb -O $PGBENCH_USER -h $HOST2 $DBNAME2
  pgbench -i -s 1 -U $PGBENCH_USER -h $HOST1 $DBNAME1
! pg_dump -s -U postgres -h $HOST1 $DBNAME1 | psql -U postgres -h $HOST2 $DBNAME2
  
  From this moment on, the pgbench test program can be started to
--- 44,58 ----
  As of this writing Slony-I does not attempt to automatically copy the
  table definitions when a node subscribes to a data set.  Because of this,
! we have to create one full and one schema-only pgbench database.  Note
! that we alter the pgbench table, "history", to give it a primary key.
! All tables must have a primary key (or a candidate thereof) defined
! for Slony-I to use.  The pgbench history table lacks this, so we add
! one in
  
  createdb -O $PGBENCH_USER -h $HOST1 $DBNAME1
  createdb -O $PGBENCH_USER -h $HOST2 $DBNAME2
  pgbench -i -s 1 -U $PGBENCH_USER -h $HOST1 $DBNAME1
! psql -U $PGBENCH_USER -h $HOST1 -d $DBNAME1 -c "begin; alter table history add column id serial; update history set id = nextval('history_id_seq'); alter table history add primary key(id); commit"
! pg_dump -s -U $SLONY_USER -h $HOST1 $DBNAME1 | psql -U $SLONY_USER -h $HOST2 $DBNAME2
  
  From this moment on, the pgbench test program can be started to
***************
*** 112,125 ****
  
      # ----
-     # The pgbench table history does not have a primary key or
-     # any other unique constraint that could be used to identify
-     # a row.  The following command adds a bigint column named
-     # "_Slony-I_test1_rowID" to the table.  It will have a default
-     # value of nextval('"_test1".sl_rowid_seq'), be unique and not
-     # null.  All existing rows will be initialized with a number.
-     # ----
-     table add key ( node id = 1, fully qualified name = 'public.history' );
- 
-     # ----
      # The Slony replication system organizes tables in sets.  The
      # smallest unit another node can subscribe is a set.  Usually the
--- 117,120 ----
***************
*** 141,145 ****
      set add table ( set id = 1, origin = 1,
          id = 4, fully qualified name = 'public.history',
-         key = serial,
          comment = 'Table history' );
  
--- 136,139 ----
***************
*** 266,271 ****
          from tellers order by tid;
      select 'history:'::text, tid, bid, aid, delta, mtime, filler,
!         "_Slony-I_${CLUSTER}_rowID"
!         from history order by "_Slony-I_${CLUSTER}_rowID";
  _EOF_
  psql -U $PGBENCH_USER -h $HOST2 $DBNAME2 >dump.tmp.2.$$ <<_EOF_
--- 260,265 ----
          from tellers order by tid;
      select 'history:'::text, tid, bid, aid, delta, mtime, filler,
!         id
!         from history order by id;
  _EOF_
  psql -U $PGBENCH_USER -h $HOST2 $DBNAME2 >dump.tmp.2.$$ <<_EOF_
***************
*** 277,282 ****
          from tellers order by tid;
      select 'history:'::text, tid, bid, aid, delta, mtime, filler,
!         "_Slony-I_${CLUSTER}_rowID"
!         from history order by "_Slony-I_${CLUSTER}_rowID";
  _EOF_
  
--- 271,276 ----
          from tellers order by tid;
      select 'history:'::text, tid, bid, aid, delta, mtime, filler,
!         id
!         from history order by id;
  _EOF_