Drop all txid install code.

It's obsolete since 8.3.  Drop it.

diff --git a/python/pgq/cascade/admin.py b/python/pgq/cascade/admin.py
index 964af08195521edd3b742e15efb31c1fe487faaf..517cac21262ee351cca184f0f975bdf78d7ee12c 100644 (file)
--- a/python/pgq/cascade/admin.py
+++ b/python/pgq/cascade/admin.py
@@ -318,7 +318,7 @@ class CascadeAdmin(skytools.AdminScript):
         """Install cascading code to db."""
         objs = [
             skytools.DBLanguage("plpgsql"),
-            skytools.DBFunction("txid_current_snapshot", 0, sql_file="txid.sql"),
+            #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

diff --git a/python/pgqadm.py b/python/pgqadm.py
index 7fdfdc3b693b60639cd7c48be903b6b42e7a237f..32591250d15fb02602099da83657875296862e21 100755 (executable)
--- a/python/pgqadm.py
+++ b/python/pgqadm.py
@@ -131,7 +131,7 @@ class PGQAdmin(skytools.DBScript):
     def installer(self):
         objs = [
             skytools.DBLanguage("plpgsql"),
-            skytools.DBFunction("txid_current_snapshot", 0, sql_file="txid.sql"),
+            #skytools.DBFunction("txid_current_snapshot", 0, sql_file="txid.sql"),
             skytools.DBSchema("pgq", sql_file="pgq.sql"),
         ]
 

diff --git a/python/qadmin.py b/python/qadmin.py
index 608de5cd819b9a2caa583f3399a56b9c80adb34c..839b3a35872f0434f73e8f7e2b5cb871ca782090 100755 (executable)
--- a/python/qadmin.py
+++ b/python/qadmin.py
@@ -1112,7 +1112,7 @@ class AdminConsole:
     def cmd_install(self, params):
         pgq_objs = [
             skytools.DBLanguage("plpgsql"),
-            skytools.DBFunction("txid_current_snapshot", 0, sql_file="txid.sql"),
+            #skytools.DBFunction("txid_current_snapshot", 0, sql_file="txid.sql"),
             skytools.DBSchema("pgq", sql_file="pgq.sql"),
             skytools.DBSchema("pgq_ext", sql_file="pgq_ext.sql"),
             skytools.DBSchema("pgq_node", sql_file="pgq_node.sql"),

diff --git a/sql/londiste/sql/londiste_install.sql b/sql/londiste/sql/londiste_install.sql
index 20b0987fe0f6f5ed2afc2c8fec71f37481a069e9..c11550cf312c155323ef5538ec141d960654bb03 100644 (file)
--- a/sql/londiste/sql/londiste_install.sql
+++ b/sql/londiste/sql/londiste_install.sql
@@ -5,7 +5,7 @@ set client_min_messages = 'fatal';
 create language plpgsql;
 set client_min_messages = 'warning';
 
-\i ../txid/txid.sql
+-- \i ../txid/txid.sql
 \i ../pgq/pgq.sql
 \i ../pgq_node/pgq_node.sql
 

diff --git a/sql/pgq/sql/pgq_init.sql b/sql/pgq/sql/pgq_init.sql
index d14cf6ef181ddbf2468e38bee1bd78d42ad5a149..18a6344bbed6d896201e3e747e837643809eead4 100644 (file)
--- a/sql/pgq/sql/pgq_init.sql
+++ b/sql/pgq/sql/pgq_init.sql
@@ -1,6 +1,6 @@
 
 \set ECHO none
-\i ../txid/txid.sql
+-- \i ../txid/txid.sql
 -- \i pgq.sql
 \i structure/install.sql