From 1ed5e7320ef6862b46bc5e575d069f40f3e4322b Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Wed, 23 Nov 2016 18:20:11 -0800
Subject: [PATCH] codename needs to be the key to suites

---
 Debbugs/DB/Result/Suite.pm | 34 +++++++++++++++++++++++-----------
 sql/dbicdump_command.sh    |  1 +
 sql/debbugs_schema.sql     | 12 ++++++------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/Debbugs/DB/Result/Suite.pm b/Debbugs/DB/Result/Suite.pm
index 671a99e9..cf1d04a8 100644
--- a/Debbugs/DB/Result/Suite.pm
+++ b/Debbugs/DB/Result/Suite.pm
@@ -46,26 +46,26 @@ __PACKAGE__->table("suite");
 
 Suite id
 
-=head2 suite_name
+=head2 codename
 
   data_type: 'text'
   is_nullable: 0
 
-Suite name
+Suite codename (sid, squeeze, etc.)
 
-=head2 version
+=head2 suite_name
 
   data_type: 'text'
   is_nullable: 1
 
-Suite version; NULL if there is no appropriate version
+Suite name (testing, stable, etc.)
 
-=head2 codename
+=head2 version
 
   data_type: 'text'
   is_nullable: 1
 
-Suite codename
+Suite version; NULL if there is no appropriate version
 
 =head2 active
 
@@ -85,11 +85,11 @@ __PACKAGE__->add_columns(
     is_nullable       => 0,
     sequence          => "suite_id_seq",
   },
-  "suite_name",
+  "codename",
   { data_type => "text", is_nullable => 0 },
-  "version",
+  "suite_name",
   { data_type => "text", is_nullable => 1 },
-  "codename",
+  "version",
   { data_type => "text", is_nullable => 1 },
   "active",
   { data_type => "boolean", default_value => \"true", is_nullable => 1 },
@@ -109,6 +109,18 @@ __PACKAGE__->set_primary_key("id");
 
 =head1 UNIQUE CONSTRAINTS
 
+=head2 C<suite_idx_codename>
+
+=over 4
+
+=item * L</codename>
+
+=back
+
+=cut
+
+__PACKAGE__->add_unique_constraint("suite_idx_codename", ["codename"]);
+
 =head2 C<suite_suite_name_key>
 
 =over 4
@@ -169,8 +181,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2014-11-30 21:56:51
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3csVa5t/HsPdWr0/Nmr7WA
+# Created by DBIx::Class::Schema::Loader v0.07045 @ 2016-11-23 18:13:51
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:32GH2trGMuarLv+EjO1l8w
 
 
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
diff --git a/sql/dbicdump_command.sh b/sql/dbicdump_command.sh
index 6aac4b77..c957f8f1 100755
--- a/sql/dbicdump_command.sh
+++ b/sql/dbicdump_command.sh
@@ -12,6 +12,7 @@ fi;
 dbicdump -I. -o dump_directory=. \
     -o components='["InflateColumn::DateTime","TimeStamp"]' \
     -o preserve_case=1 \
+    -o skip_load_external=1 \
     -o exclude='qr/^dbix_class_deploymenthandler_versions$/' \
     Debbugs::DB dbi:Pg:service=$DEBBUGS_SERVICE '' '';
 
diff --git a/sql/debbugs_schema.sql b/sql/debbugs_schema.sql
index 02529ed2..e0f52278 100644
--- a/sql/debbugs_schema.sql
+++ b/sql/debbugs_schema.sql
@@ -390,18 +390,18 @@ CREATE VIEW binary_versions (src_pkg, src_ver, bin_pkg, arch, bin_ver) AS
 
 CREATE TABLE suite (
        id SERIAL PRIMARY KEY,
-       suite_name TEXT NOT NULL,
+       codename TEXT NOT NULL,
+       suite_name TEXT,
        version TEXT,
-       codename TEXT,
        active BOOLEAN DEFAULT TRUE);
+CREATE UNIQUE INDEX suite_idx_codename ON suite(codename);
 CREATE UNIQUE INDEX suite_suite_name_key ON suite(suite_name);
-CREATE INDEX suite_idx_codename ON suite(codename);
-CREATE INDEX suite_idx_version ON suite(version);
+CREATE UNIQUE INDEX suite_idx_version ON suite(version);
 INSERT INTO table_comments VALUES ('suite','Debian Release Suite (stable, testing, etc.)');
 INSERT INTO column_comments VALUES ('suite','id','Suite id');
-INSERT INTO column_comments VALUES ('suite','suite_name','Suite name');
+INSERT INTO column_comments VALUES ('suite','suite_name','Suite name (testing, stable, etc.)');
 INSERT INTO column_comments VALUES ('suite','version','Suite version; NULL if there is no appropriate version');
-INSERT INTO column_comments VALUES ('suite','codename','Suite codename');
+INSERT INTO column_comments VALUES ('suite','codename','Suite codename (sid, squeeze, etc.)');
 INSERT INTO column_comments VALUES ('suite','active','TRUE if the suite is still accepting uploads');
 
 CREATE TABLE bin_associations (
-- 
2.39.5