include upgrade script in installation, add manpage for itskytools_2_1_6_rc2

4 files changed, 39 insertions, 3 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 2fd536dc..e6af9c54 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -15,7 +15,7 @@ HTMLS = londiste.cmdline.html londiste.config.html README.html INSTALL.html \
 
 SCRIPT_TXTS = walmgr.txt cube_dispatcher.txt table_dispatcher.txt \
 	      queue_mover.txt queue_splitter.txt bulk_loader.txt \
-	      scriptmgr.txt
+	      scriptmgr.txt skytools_upgrade.txt
 SCRIPT_MANS = $(SCRIPT_TXTS:.txt=.1)
 SCRIPT_HTMLS = $(SCRIPT_TXTS:.txt=.html)
 
diff --git a/doc/skytools_upgrade.txt b/doc/skytools_upgrade.txt
new file mode 100644
index 00000000..3189cb78
--- /dev/null
+++ b/doc/skytools_upgrade.txt
@@ -0,0 +1,33 @@
+= skytools_upgrade(1) =
+
+== NAME ==
+
+skytools_upgrade - utility for upgrading Skytools code in databases.
+
+== SYNOPSIS ==
+
+  skytools_upgrade.py connstr [connstr ..]
+
+== DESCRIPTION ==
+
+It connects to given database, then looks for following schemas:
+
+  pgq::
+    Main PgQ code.
+  pgq_ext::
+    PgQ batch/event tracking in remote database.
+  londiste::
+    Londiste replication.
+
+If schema exists, its version is detected by querying .version()
+function under schema.   If the function does not exists, there
+is some heiristics built in to differentiate between 2.1.4 and
+2.1.5 version of ther schemas.
+
+If detected that version is older that current, it is upgraded
+by applying upgrade scripts in order.
+
+== COMMAND LINE SWITCHES ==
+
+include::common.switches.txt[]
+
diff --git a/setup.py b/setup.py
index 913000dd..b3ad46eb 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,9 @@ setup(
     scripts = ['python/londiste.py', 'python/pgqadm.py', 'python/walmgr.py',
                'scripts/cube_dispatcher.py', 'scripts/queue_mover.py',
                'scripts/table_dispatcher.py', 'scripts/bulk_loader.py',
-               'scripts/scriptmgr.py', 'scripts/queue_splitter.py'],
+               'scripts/scriptmgr.py', 'scripts/queue_splitter.py',
+               'scripts/skytools_upgrade.py',
+              ],
     data_files = [
       ('share/doc/skytools/conf', [
         'python/conf/londiste.ini',
diff --git a/source.cfg b/source.cfg
index 873e5e55..b7ad3a7c 100644
--- a/source.cfg
+++ b/source.cfg
@@ -9,7 +9,8 @@ recursive-include python/conf *.ini
 recursive-include scripts *.py *.templ
 recursive-include debian changelog packages.in
 recursive-include doc Makefile *.py *.txt *.[1-9]
-recursive-include tests *
 include python/skytools/installer_config.py.in
 prune python/skytools/installer_config.py
 recursive-include upgrade *.sql Makefile
+recursive-include tests *.conf *.sh *.ini *.py Makefile data.sql install.sql v2*.sql *.conf
+prune fix*.sql