tiny fixes

diff --git a/python/londiste/setup.py b/python/londiste/setup.py
index 90c47463e45b8e35cf67308f69f926371b617dea..5cbf792e0fd1b36cdf7ed7c91ffe8e5a4e6797f5 100644 (file)
--- a/python/londiste/setup.py
+++ b/python/londiste/setup.py
@@ -16,15 +16,15 @@ class LondisteSetup(skytools.DBScript):
         self.set_name = self.cf.get("set_name")
         self.consumer_id = self.cf.get("pgq_consumer_id", self.job_name)
 
-        if len(self.args) < 3:
-            self.log.error("need subcommand")
+        if len(self.args) < 2:
+            self.log.error("need command")
             sys.exit(1)
 
     def run(self):
-        cmd = self.args[2]
+        cmd = self.args[1]
         fname = "cmd_" + cmd.replace('-', '_')
         if hasattr(self, fname):
-            getattr(self, fname)(self, self.args[3:])
+            getattr(self, fname)(self.args[2:])
         else:
             self.log.error('bad subcommand')
             sys.exit(1)

diff --git a/sql/pgq/expected/logutriga.out b/sql/pgq/expected/logutriga.out
index 324a239b459b268753597b8667ae5255a14e6810..c8ff9e4ae9447bf932d1e85a8ed38c04c6c049b7 100644 (file)
--- a/sql/pgq/expected/logutriga.out
+++ b/sql/pgq/expected/logutriga.out
@@ -16,7 +16,7 @@ create trigger utest AFTER insert or update or delete ON udata
 for each row execute procedure pgq.logutriga('udata_que');
 insert into udata (txt) values ('text1');
 NOTICE:  insert_event(udata_que, I:id, id=1&txt=text1&bin, public.udata)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 insert into udata (bin) values (E'bi\tn\\000bin');
 NOTICE:  insert_event(udata_que, I:id, id=2&txt&bin=bi%5c011n%5c000bin, public.udata)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"

diff --git a/sql/pgq/expected/sqltriga.out b/sql/pgq/expected/sqltriga.out
index 37bc2ec16d016e55f1f896e851ac1940730da42e..d712881e9f4877a1c06a8c77084e32ef30ef16ec 100644 (file)
--- a/sql/pgq/expected/sqltriga.out
+++ b/sql/pgq/expected/sqltriga.out
@@ -9,40 +9,40 @@ for each row execute procedure pgq.sqltriga('que');
 -- simple test
 insert into rtest values (1, 'value1');
 NOTICE:  insert_event(que, I, (id,dat) values ('1','value1'), public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 update rtest set dat = 'value2';
 NOTICE:  insert_event(que, U, dat='value2' where id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 delete from rtest;
 NOTICE:  insert_event(que, D, id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 -- test new fields
 alter table rtest add column dat2 text;
 insert into rtest values (1, 'value1');
 NOTICE:  insert_event(que, I, (id,dat,dat2) values ('1','value1',null), public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 update rtest set dat = 'value2';
 NOTICE:  insert_event(que, U, dat='value2' where id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 delete from rtest;
 NOTICE:  insert_event(que, D, id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 -- test field ignore
 drop trigger rtest_triga on rtest;
 create trigger rtest_triga after insert or update or delete on rtest
 for each row execute procedure pgq.sqltriga('que2', 'ignore=dat2');
 insert into rtest values (1, '666', 'newdat');
 NOTICE:  insert_event(que2, I, (id,dat) values ('1','666'), public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 update rtest set dat = 5, dat2 = 'newdat2';
 NOTICE:  insert_event(que2, U, dat='5' where id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 update rtest set dat = 6;
 NOTICE:  insert_event(que2, U, dat='6' where id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 delete from rtest;
 NOTICE:  insert_event(que2, D, id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 -- test hashed pkey
 -- drop trigger rtest_triga on rtest;
 -- create trigger rtest_triga after insert or update or delete on rtest
@@ -57,22 +57,22 @@ create trigger rtest_triga after insert or update or delete on rtest
 for each row execute procedure pgq.sqltriga('que3');
 insert into rtest values (1, 0, 'non-null');
 NOTICE:  insert_event(que3, I, (id,dat,dat2) values ('1','0','non-null'), public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 insert into rtest values (2, 0, NULL);
 NOTICE:  insert_event(que3, I, (id,dat,dat2) values ('2','0',null), public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 update rtest set dat2 = 'non-null2' where id=1;
 NOTICE:  insert_event(que3, U, dat2='non-null2' where id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 update rtest set dat2 = NULL where id=1;
 NOTICE:  insert_event(que3, U, dat2=NULL where id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 update rtest set dat2 = 'new-nonnull' where id=2;
 NOTICE:  insert_event(que3, U, dat2='new-nonnull' where id='2', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 delete from rtest where id=1;
 NOTICE:  insert_event(que3, D, id='1', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"
 delete from rtest where id=2;
 NOTICE:  insert_event(que3, D, id='2', public.rtest)
-CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, null, null, null)"
+CONTEXT:  SQL statement "select pgq.insert_event($1, $2, $3, $4, $5, null, null)"

diff --git a/tests/londiste/gendb.sh b/tests/londiste/gendb.sh
index 003e3c71fef24f26a28da976e8013280502a5cc9..b9acb84260cbd67e8a95b815a6c1b608a7fca2ce 100755 (executable)
--- a/tests/londiste/gendb.sh
+++ b/tests/londiste/gendb.sh
@@ -23,11 +23,14 @@ createdb $db
 
 londiste.py conf/w_root.ini init-root n_root "dbname=$db"
 
-exit 0
-
-pgqadm.py conf/ticker.ini install
+pgqadm.py conf/ticker_root.ini install
 psql -q $db -f data.sql
 
+londiste.py conf/w_root.ini add data1
+londiste.py conf/w_root.ini tables
+
+exit 0
+
 db=subscriber
 echo "creating database: $db"
 dropdb $db