Merge branch 'psycopg2' into content_generation

[dak.git] / dak / dakdb / update2.py

diff --git a/dak/dakdb/update2.py b/dak/dakdb/update2.py
old mode 100644 (file)
new mode 100755 (executable)
index bddf0a7..e411662
--- a/dak/dakdb/update2.py
+++ b/dak/dakdb/update2.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # coding=utf8
 
-# Debian Archive Kit Database Update Script
+""" Database Update Script - debversion """
 # Copyright © 2008  Michael Casadevall <mcasadevall@debian.org>
 # Copyright © 2008  Roger Leigh <rleigh@debian.org>
 
@@ -26,12 +26,21 @@ import psycopg2, time
 ################################################################################
 
 def do_update(self):
-    print "Note the PL/Perl (plperl) procedural language must be enabled first."
-    print "Run 'createlang plpgsql projectb' to add it."
+vvvvvvvvvvvvvvvvvvvv
+    print "Note: to be able to enable the the PL/Perl (plperl) procedural language, we do"
+    print "need postgresql-plperl-$postgres-version installed. Make sure that this is the"
+    print "case before you continue. Interrupt if it isn't, sleeping 5 seconds now."
+    print "(We need to be database superuser for this to work!)"
+    time.sleep (5)
+^^^^^^^^^^^^^^^^^^^^
 
     try:
         c = self.db.cursor()
 
+        print "Enabling PL/Perl language"
+        c.execute("CREATE LANGUAGE plperl;")
+        c.execute("CREATE LANGUAGE plpgsql;")
+
         print "Adding debversion type to database."
 
 # Not present in all databases, maybe PL/Perl version-dependent?
@@ -378,7 +387,7 @@ $$
         c.execute("ALTER TABLE source ALTER COLUMN version TYPE debversion;")
         c.execute("ALTER TABLE binaries ALTER COLUMN version TYPE debversion;")
 
-        c.execute("UPDATE config SET value = '1' WHERE name = 'db_revision'")
+        c.execute("UPDATE config SET value = '2' WHERE name = 'db_revision'")
 
         self.db.commit()