launchpad-reviewers team mailing list archive

[Jürgen Gmach <mp+472483@xxxxxxxxxxxxxxxxxx>]

Jürgen Gmach has proposed merging ~jugmac00/launchpad:fix-webhook-constraint into launchpad:db-devel.

Commit message:
Fix constraints for webhooks

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jugmac00/launchpad/+git/launchpad/+merge/472483
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~jugmac00/launchpad:fix-webhook-constraint into launchpad:db-devel.

diff --git a/database/schema/patch-2211-28-0.sql b/database/schema/patch-2211-28-0.sql
index a3aa9a7..eb7a09c 100644
--- a/database/schema/patch-2211-28-0.sql
+++ b/database/schema/patch-2211-28-0.sql
@@ -197,7 +197,11 @@ ALTER TABLE Webhook DROP CONSTRAINT one_target;
 ALTER TABLE Webhook
     ADD CONSTRAINT one_target CHECK (
         null_count(ARRAY[git_repository, branch, snap, livefs, oci_recipe,
+<<<<<<< database/schema/patch-2211-28-0.sql
                          rock_recipe]) = 5);
+=======
+                         charm_recipe, rock_recipe]) = 6);
+>>>>>>> database/schema/patch-2211-28-0.sql
 
 CREATE INDEX webhook__rock_recipe__id__idx
     ON Webhook (rock_recipe, id) WHERE rock_recipe IS NOT NULL;