Merge remote-tracking branch 'ansgar/pu/multiarchive-2'

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

diff --git a/dak/dakdb/update15.py b/dak/dakdb/update15.py
index 10812226d519c581c9fe8d78983e0ede28268399..7d6b52e7588e3988d52cba08b6e9729e1e92152b 100644 (file)
--- a/dak/dakdb/update15.py
+++ b/dak/dakdb/update15.py
@@ -43,7 +43,7 @@ def do_update(self):
             CREATE TABLE src_format (
                     id SERIAL PRIMARY KEY,
                     format_name TEXT NOT NULL,
-                    unique (format_name)
+                    UNIQUE (format_name)
             )
         """)
         c.execute("INSERT INTO src_format (format_name) VALUES('1.0')")
@@ -52,9 +52,9 @@ def do_update(self):
 
         c.execute("""
             CREATE TABLE suite_src_formats (
-                    suite INT4 NOT NULL,
-                    src_format INT4 NOT NULL,
-                    unique (suite, src_format)
+                    suite INT4 NOT NULL REFERENCES suite(id),
+                    src_format INT4 NOT NULL REFERENCES src_format(id),
+                    PRIMARY KEY (suite, src_format)
             )
         """)
 
@@ -79,6 +79,6 @@ def do_update(self):
         c.execute("UPDATE config SET value = '15' WHERE name = 'db_revision'")
         self.db.commit()
 
-    except psycopg2.ProgrammingError, msg:
+    except psycopg2.ProgrammingError as msg:
         self.db.rollback()
-        raise DBUpdateError, "Unable to apply source format update 15, rollback issued. Error message : %s" % (str(msg))
+        raise DBUpdateError("Unable to apply source format update 15, rollback issued. Error message : %s" % (str(msg)))