From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 16 Apr 2017 03:32:00 +0000 (-0700)
Subject: fix var typo and add in missing correspondent index
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5f1d9a928985aa2263e2a65b45684c32fb7b0633;p=debbugs.git

fix var typo and add in missing correspondent index
---

diff --git a/Debbugs/DB/Result/BinVer.pm b/Debbugs/DB/Result/BinVer.pm
index 5c113da0..30be6c24 100644
--- a/Debbugs/DB/Result/BinVer.pm
+++ b/Debbugs/DB/Result/BinVer.pm
@@ -196,7 +196,7 @@ __PACKAGE__->belongs_to(
 
 sub sqlt_deploy_hook {
     my ($self, $sqlt_table) = @_;
-    for my $idx (qw(var bin_pkg src_ver)) {
+    for my $idx (qw(ver bin_pkg src_ver)) {
 	$sqlt_table->add_index(name => 'bin_ver_'.$idx.'_id_idx',
 			       fields => [$idx]);
     }
diff --git a/Debbugs/DB/Result/BugVer.pm b/Debbugs/DB/Result/BugVer.pm
index f50cf623..472a1dff 100644
--- a/Debbugs/DB/Result/BugVer.pm
+++ b/Debbugs/DB/Result/BugVer.pm
@@ -241,7 +241,7 @@ sub sqlt_deploy_hook {
 			       fields => [$idx]);
     }
     $sqlt_table->add_index(name => 'bug_ver_src_pkg_id_src_ver_id_idx',
-			   fields => [qw(src_pkg src_var)],
+			   fields => [qw(src_pkg src_ver)],
 			  );
 }
 1;
diff --git a/Debbugs/DB/Result/CorrespondentFullName.pm b/Debbugs/DB/Result/CorrespondentFullName.pm
index c5a28ec5..a5be2839 100644
--- a/Debbugs/DB/Result/CorrespondentFullName.pm
+++ b/Debbugs/DB/Result/CorrespondentFullName.pm
@@ -117,8 +117,8 @@ __PACKAGE__->belongs_to(
 
 sub sqlt_deploy_hook {
     my ($self, $sqlt_table) = @_;
-    for my $idx (qw(correspondent message)) {
-	$sqlt_table->add_index(name => 'message_correspondent_idx'.$idx,
+    for my $idx (qw(full_name last_seen)) {
+	$sqlt_table->add_index(name => 'correspondent_full_name_idx_'.$idx,
 			       fields => [$idx]);
     }
 }
diff --git a/Debbugs/DB/Result/MessageCorrespondent.pm b/Debbugs/DB/Result/MessageCorrespondent.pm
index 16550aa0..ddc79d11 100644
--- a/Debbugs/DB/Result/MessageCorrespondent.pm
+++ b/Debbugs/DB/Result/MessageCorrespondent.pm
@@ -139,5 +139,12 @@ __PACKAGE__->belongs_to(
 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:kIhya7skj4ZNM3DkC+gAPw
 
 
-# You can replace this text with custom code or comments, and it will be preserved on regeneration
+sub sqlt_deploy_hook {
+    my ($self, $sqlt_table) = @_;
+    for my $idx (qw(correspondent message)) {
+	$sqlt_table->add_index(name => 'message_correspondent_idx'.$idx,
+			       fields => [$idx]);
+    }
+}
+
 1;
diff --git a/sql/PostgreSQL/deploy/6/001-auto.sql b/sql/PostgreSQL/deploy/6/001-auto.sql
index a28dc2a2..3b4b1220 100644
--- a/sql/PostgreSQL/deploy/6/001-auto.sql
+++ b/sql/PostgreSQL/deploy/6/001-auto.sql
@@ -1,6 +1,6 @@
 -- 
 -- Created by SQL::Translator::Producer::PostgreSQL
--- Created on Fri Apr 14 20:22:11 2017
+-- Created on Sat Apr 15 20:14:22 2017
 -- 
 ;
 --
@@ -150,8 +150,8 @@ CREATE TABLE "correspondent_full_name" (
   CONSTRAINT "correspondent_full_name_correspondent_full_name_idx" UNIQUE ("correspondent", "full_name")
 );
 CREATE INDEX "correspondent_full_name_idx_correspondent" on "correspondent_full_name" ("correspondent");
-CREATE INDEX "message_correspondent_idxcorrespondent" on "correspondent_full_name" ("correspondent");
-CREATE INDEX "message_correspondent_idxmessage" on "correspondent_full_name" ("message");
+CREATE INDEX "correspondent_full_name_idx_full_name" on "correspondent_full_name" ("full_name");
+CREATE INDEX "correspondent_full_name_idx_last_seen" on "correspondent_full_name" ("last_seen");
 
 ;
 --
@@ -246,6 +246,8 @@ CREATE TABLE "message_correspondent" (
 );
 CREATE INDEX "message_correspondent_idx_correspondent" on "message_correspondent" ("correspondent");
 CREATE INDEX "message_correspondent_idx_message" on "message_correspondent" ("message");
+CREATE INDEX "message_correspondent_idxcorrespondent" on "message_correspondent" ("correspondent");
+CREATE INDEX "message_correspondent_idxmessage" on "message_correspondent" ("message");
 
 ;
 --
diff --git a/sql/PostgreSQL/upgrade/5-6/001-auto.sql b/sql/PostgreSQL/upgrade/5-6/001-auto.sql
index bf02e7ba..0e6fe494 100644
--- a/sql/PostgreSQL/upgrade/5-6/001-auto.sql
+++ b/sql/PostgreSQL/upgrade/5-6/001-auto.sql
@@ -28,7 +28,10 @@ CREATE INDEX bug_message_idx_bug_message_number on bug_message (bug, message_num
 CREATE INDEX bug_ver_src_pkg_id_src_ver_id_idx on bug_ver (src_pkg, src_ver);
 
 ;
-CREATE INDEX message_correspondent_idxmessage on correspondent_full_name (message);
+CREATE INDEX correspondent_full_name_idx_full_name on correspondent_full_name (full_name);
+
+;
+CREATE INDEX correspondent_full_name_idx_last_seen on correspondent_full_name (last_seen);
 
 ;
 CREATE INDEX message_msgid_idx on message (msgid);
diff --git a/sql/_source/deploy/6/001-auto.yml b/sql/_source/deploy/6/001-auto.yml
index 20528a01..a480db43 100644
--- a/sql/_source/deploy/6/001-auto.yml
+++ b/sql/_source/deploy/6/001-auto.yml
@@ -2009,13 +2009,13 @@ schema:
           options: []
           type: NORMAL
         - fields:
-            - correspondent
-          name: message_correspondent_idxcorrespondent
+            - full_name
+          name: correspondent_full_name_idx_full_name
           options: []
           type: NORMAL
         - fields:
-            - message
-          name: message_correspondent_idxmessage
+            - last_seen
+          name: correspondent_full_name_idx_last_seen
           options: []
           type: NORMAL
       name: correspondent_full_name
@@ -2351,6 +2351,16 @@ schema:
           name: message_correspondent_idx_message
           options: []
           type: NORMAL
+        - fields:
+            - correspondent
+          name: message_correspondent_idxcorrespondent
+          options: []
+          type: NORMAL
+        - fields:
+            - message
+          name: message_correspondent_idxmessage
+          options: []
+          type: NORMAL
       name: message_correspondent
       options: []
       order: 16