we currently don't need Helper::ResultSet

[debbugs.git] / Debbugs / DB / ResultSet / BugStatusCache.pm

diff --git a/Debbugs/DB/ResultSet/BugStatusCache.pm b/Debbugs/DB/ResultSet/BugStatusCache.pm
index 18edf0c8df28188137af18c3de3b7493900eb131..d47f467829bef926c19320299d9c4ab8ef957228 100644 (file)
--- a/Debbugs/DB/ResultSet/BugStatusCache.pm
+++ b/Debbugs/DB/ResultSet/BugStatusCache.pm
@@ -23,7 +23,6 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::ResultSet';
-__PACKAGE__->load_components('Helper::ResultSet');
 
 use Debbugs::DB::Util qw(select_one);
 
@@ -54,7 +53,7 @@ sub update_bug_status {
 INSERT INTO bug_status_cache AS bsc
 (bug,suite,arch,status,modified,asof)
 VALUES (?,?,?,?,NOW(),NOW())
-ON CONFLICT (bug,suite,arch) DO
+ON CONFLICT (bug,COALESCE(suite,0),COALESCE(arch,0)) DO
 UPDATE
  SET asof=NOW(),modified=CASE WHEN bsc.status=? THEN bsc.modified ELSE NOW() END
 RETURNING status;