Merge remote-tracking branch 'mhy/override-cs-db' into merge

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

diff --git a/dak/dakdb/update46.py b/dak/dakdb/update46.py
index 652a9656870e123d6cd6b7aca9edcca2b987a7a0..109a887aa93a0ceba459fd930d474e215c5aeb5f 100755 (executable)
--- a/dak/dakdb/update46.py
+++ b/dak/dakdb/update46.py
@@ -43,7 +43,9 @@ def do_update(self):
         c.execute("""
 CREATE TABLE metadata_keys (
     key_id       SERIAL NOT NULL UNIQUE,
-    key          TEXT NOT NULL UNIQUE
+    key          TEXT NOT NULL UNIQUE,
+
+    PRIMARY KEY (key_id)
 )
 """)
 
@@ -52,7 +54,8 @@ CREATE TABLE binaries_metadata (
     bin_id       INT4 NOT NULL REFERENCES binaries(id) ON DELETE CASCADE,
     key_id       INT4 NOT NULL REFERENCES metadata_keys(key_id),
     value        TEXT NOT NULL,
-    UNIQUE (bin_id, key_id)
+
+    PRIMARY KEY (bin_id, key_id)
 )
 """)
 
@@ -61,13 +64,14 @@ CREATE TABLE source_metadata (
     src_id       INT4 NOT NULL REFERENCES source(id) ON DELETE CASCADE,
     key_id       INT4 NOT NULL REFERENCES metadata_keys(key_id),
     value        TEXT NOT NULL,
-    UNIQUE (src_id, key_id)
+
+    PRIMARY KEY (src_id, key_id)
 )
 """)
 
         c.execute("UPDATE config SET value = '46' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, 'Unable to apply update 46, rollback issued. Error message : %s' % (str(msg))
+        raise DBUpdateError('Unable to apply update 46, rollback issued. Error message : %s' % (str(msg)))