X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdakdb%2Fupdate20.py;h=f4e34cb96b56428791918a43642d4fa8f932e071;hb=94b406d8543e05b1d3233b7f0e0d104344378396;hp=61497c21faa5265171a080fd54965d88f80ebe73;hpb=773b13f6248c740676ef5326c88dfa319ca53b83;p=dak.git

diff --git a/dak/dakdb/update20.py b/dak/dakdb/update20.py
index 61497c21..f4e34cb9 100755
--- a/dak/dakdb/update20.py
+++ b/dak/dakdb/update20.py
@@ -80,14 +80,15 @@ def do_update(self):
         c.execute("ALTER TABLE known_changes ADD COLUMN approved_for INT4 REFERENCES queue(id) DEFAULT NULL")
 
         print "Adding policy queue column to suite table"
-        c.execute("ALTER TABLE suite ADD COLUMN policy_queue INT4 REFERENCES queue(id) DEFAULT NULL")
+        c.execute("ALTER TABLE suite DROP COLUMN policy_engine")
+        c.execute("ALTER TABLE suite ADD COLUMN policy_queue_id INT4 REFERENCES queue(id) DEFAULT NULL")
         # Handle some of our common cases automatically
         if seenqueues.has_key('proposedupdates'):
-            c.execute("""UPDATE suite SET policy_queue = (SELECT id FROM queue WHERE queue_name = 'proposedupdates')
+            c.execute("""UPDATE suite SET policy_queue_id = (SELECT id FROM queue WHERE queue_name = 'proposedupdates')
                                       WHERE suite_name = 'proposed-updates'""")
 
         if seenqueues.has_key('oldproposedupdates'):
-            c.execute("""UPDATE suite SET policy_queue = (SELECT id FROM queue WHERE queue_name = 'oldproposedupdates')
+            c.execute("""UPDATE suite SET policy_queue_id = (SELECT id FROM queue WHERE queue_name = 'oldproposedupdates')
                                       WHERE suite_name = 'oldstable-proposed-updates'""")
 
         print "Committing"