launchpad-reviewers team mailing list archive

[Enrique Sánchez <mp+486195@xxxxxxxxxxxxxxxxxx>]

Enrique Sánchez has proposed merging ~enriqueesanchz/launchpad:merge-db-stable into launchpad:master.

Commit message:
Merge db-stable

Merge db-stable 129aaaad
Merge db-stable 19a3b536

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~enriqueesanchz/launchpad/+git/launchpad/+merge/486195
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~enriqueesanchz/launchpad:merge-db-stable into launchpad:master.

diff --git a/database/schema/patch-2211-35-1.sql b/database/schema/patch-2211-35-1.sql
new file mode 100644
index 0000000..862c374
--- /dev/null
+++ b/database/schema/patch-2211-35-1.sql
@@ -0,0 +1,14 @@
+-- Copyright 2025 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+ALTER TABLE bugpresence DROP COLUMN project;
+ALTER TABLE bugpresence ADD COLUMN product integer REFERENCES product;
+
+CREATE INDEX bugpresence__product__idx ON bugpresence (product);
+
+COMMENT ON COLUMN bugpresence.product IS 'The product that this bug presence
+ row is related to.';
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2211, 35, 1);
diff --git a/database/schema/patch-2211-40-0.sql b/database/schema/patch-2211-40-0.sql
new file mode 100644
index 0000000..32a95ff
--- /dev/null
+++ b/database/schema/patch-2211-40-0.sql
@@ -0,0 +1,15 @@
+-- Copyright 2025 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+ALTER TABLE BranchMergeProposal
+    ADD COLUMN merge_type integer DEFAULT 0 NOT NULL;
+
+-- 0: UNKNOWN (either not merged, or merged outside of Launchpad's API)
+-- 1: REGULAR_MERGE (regular merge with merge commit)
+
+COMMENT ON COLUMN BranchMergeProposal.merge_type
+    IS 'The type of merge used in proposal merged through launchpad API';
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2211, 40, 0);