srcpackage insertion was inverted; fix

[debbugs.git] / Debbugs / DB / Result / Bug.pm

diff --git a/Debbugs/DB/Result/Bug.pm b/Debbugs/DB/Result/Bug.pm
index d6e0f3d6e9cdb30910b5913b1a2b9a695be501ae..6e559d41b9485f95e90b4eb79ba056b9402eebe9 100644 (file)
--- a/Debbugs/DB/Result/Bug.pm
+++ b/Debbugs/DB/Result/Bug.pm
@@ -14,7 +14,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Core';
-use Carp;
 
 =head1 COMPONENTS LOADED
 
@@ -174,6 +173,14 @@ Individual who submitted this bug; empty if there is no submitter
 
 Package name if the package is not known
 
+=head2 unknown_affects
+
+  data_type: 'text'
+  default_value: (empty string)
+  is_nullable: 0
+
+Package name if the affected package is not known
+
 =cut
 
 __PACKAGE__->add_columns(
@@ -228,6 +235,8 @@ __PACKAGE__->add_columns(
   { data_type => "text", default_value => "", is_nullable => 0 },
   "unknown_packages",
   { data_type => "text", default_value => "", is_nullable => 0 },
+  "unknown_affects",
+  { data_type => "text", default_value => "", is_nullable => 0 },
 );
 
 =head1 PRIMARY KEY
@@ -515,8 +524,11 @@ __PACKAGE__->belongs_to(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07045 @ 2016-09-24 14:51:07
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:iaipVETTaokcFNrICfIEAw
+# Created by DBIx::Class::Schema::Loader v0.07048 @ 2018-04-11 13:06:55
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:qxkLXbv8JGoV9reebbOUEw
+
+use Carp;
+use List::AllUtils qw(uniq);
 
 __PACKAGE__->many_to_many(tags => 'bug_tags','tag');
 __PACKAGE__->many_to_many(user_tags => 'bug_user_tags','user_tag');
@@ -526,25 +538,70 @@ __PACKAGE__->many_to_many(affects_binpackages => 'bug_affects_binpackages','bin_
 __PACKAGE__->many_to_many(affects_srcpackages => 'bug_affects_srcpackages','src_pkg');
 __PACKAGE__->many_to_many(messages => 'bug_messages','message');
 
+sub sqlt_deploy_hook {
+    my ($self, $sqlt_table) = @_;
+    # CREATE INDEX bug_idx_owner ON bug(owner);
+    # CREATE INDEX bug_idx_submitter ON bug(submitter);
+    # CREATE INDEX bug_idx_done ON bug(done);
+    # CREATE INDEX bug_idx_forwarded ON bug(forwarded);
+    # CREATE INDEX bug_idx_last_modified ON bug(last_modified);
+    # CREATE INDEX bug_idx_severity ON bug(severity);
+    # CREATE INDEX bug_idx_creation ON bug(creation);
+    # CREATE INDEX bug_idx_log_modified ON bug(log_modified);
+    for my $idx (qw(owner submitter done forwarded last_modified),
+                qw(severity creation log_modified),
+               ) {
+       $sqlt_table->add_index(name => 'bug_idx'.$idx,
+                              fields => [$idx]);
+    }
+}
+
+=head1 Utility Functions
+
+=cut
+
+=head2 set_related_packages
+
+ $b->set_related_packages($relationship,
+                         \@packages,
+                         $package_cache ,
+                        );
+
+Set bug-related packages.
+
+=cut
+
 sub set_related_packages {
     my ($self,$relationship,$pkgs,$pkg_cache) = @_;
 
+    my @unset_packages;
     my @pkg_ids;
     if ($relationship =~ /binpackages/) {
         for my $pkg (@{$pkgs}) {
-            push @pkg_ids,
+           my $pkg_id =
               $self->result_source->schema->resultset('BinPkg')->
               get_bin_pkg_id($pkg);
+           if (not defined $pkg_id) {
+               push @unset_packages,$pkg;
+           } else {
+              push @pkg_ids, $pkg_id;
+           }
         }
     } elsif ($relationship =~ /srcpackages/) {
         for my $pkg (@{$pkgs}) {
-            push @pkg_ids,
+           my $pkg_id =
               $self->result_source->schema->resultset('SrcPkg')->
               get_src_pkg_id($pkg);
+           if (not defined $pkg_id) {
+               push @unset_packages,$pkg;
+           } else {
+               push @pkg_ids,$pkg_id;
+           }
         }
     } else {
         croak "Unsupported relationship $relationship";
     }
+    @pkg_ids = uniq @pkg_ids;
     if ($relationship eq 'binpackages') {
         $self->set_binpackages([map {{id => $_}} @pkg_ids]);
     } elsif ($relationship eq 'srcpackages') {
@@ -556,6 +613,7 @@ sub set_related_packages {
     } else {
         croak "Unsupported relationship $relationship";
     }
+    return @unset_packages
 }
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
 1;