diff options
| author | Marko Kreen | 2010-06-01 14:20:49 +0000 |
|---|---|---|
| committer | Marko Kreen | 2010-06-09 14:51:06 +0000 |
| commit | 8b444ad7d6d0898b0d8a55cb36e14c27dcb16fa8 (patch) | |
| tree | 6c25db3433fe17835b55ef37be0be10c5d197bc7 | |
| parent | 37816d9db2278887808ba153a5f4ce84bea7f17b (diff) | |
pgq,londite: support install over skytools 2
| -rw-r--r-- | python/londiste/setup.py | 12 | ||||
| -rw-r--r-- | python/pgq/cascade/admin.py | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/python/londiste/setup.py b/python/londiste/setup.py index 6b832fc5..20101e2a 100644 --- a/python/londiste/setup.py +++ b/python/londiste/setup.py @@ -13,8 +13,18 @@ __all__ = ['LondisteSetup'] class LondisteSetup(CascadeAdmin): """Londiste-specific admin commands.""" initial_db_name = 'node_db' - extra_objs = [ skytools.DBSchema("londiste", sql_file="londiste.sql") ] provider_location = None + + def install_code(self, db): + fn = skytools.installer_find_file('londiste.sql') + main_sql = open(fn, 'r').read() + noschema_sql = main_sql.replace('create schema', '-- create schema') + self.extra_objs = [ + skytools.DBSchema("londiste", sql_file = 'londiste.sql'), + skytools.DBFunction("londiste.global_add_table", 2, sql = noschema_sql), + ] + CascadeAdmin.install_code(self, db) + def __init__(self, args): """Londiste setup init.""" CascadeAdmin.__init__(self, 'londiste3', 'db', args, worker_setup = True) diff --git a/python/pgq/cascade/admin.py b/python/pgq/cascade/admin.py index 5f42a324..5f493d0f 100644 --- a/python/pgq/cascade/admin.py +++ b/python/pgq/cascade/admin.py @@ -310,6 +310,7 @@ class CascadeAdmin(skytools.AdminScript): skytools.DBLanguage("plpgsql"), skytools.DBFunction("txid_current_snapshot", 0, sql_file="txid.sql"), skytools.DBSchema("pgq", sql_file="pgq.sql"), + skytools.DBFunction("pgq.get_batch_cursor", 3, sql_file = "pgq.upgrade.2to3.sql"), skytools.DBSchema("pgq_ext", sql_file="pgq_ext.sql"), # not needed actually skytools.DBSchema("pgq_node", sql_file="pgq_node.sql"), ] |