Merge ~cjwatson/launchpad:merge-db-stable into launchpad:master

[Colin Watson]

Merge db-stable 640200fdc7 (Add BinarySourceReference and OCIRecipeJob tables)

[Colin Watson (cjwatson)]

Deployed to the production database today.

review: Approve

diff --git a/database/schema/patch-2210-13-0.sql b/database/schema/patch-2210-13-0.sql
new file mode 100644
index 0000000..0889468
--- /dev/null
+++ b/database/schema/patch-2210-13-0.sql
@@ -0,0 +1,25 @@
+-- Copyright 2020 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+CREATE TABLE BinarySourceReference (
+    id serial PRIMARY KEY,
+    binary_package_release integer NOT NULL REFERENCES binarypackagerelease,
+    source_package_release integer NOT NULL REFERENCES sourcepackagerelease,
+    reference_type integer NOT NULL
+);
+
+COMMENT ON TABLE BinarySourceReference IS 'A reference from a binary package release to a source package release.';
+COMMENT ON COLUMN BinarySourceReference.binary_package_release IS 'The referencing binary package release.';
+COMMENT ON COLUMN BinarySourceReference.source_package_release IS 'The referenced source package release.';
+COMMENT ON COLUMN BinarySourceReference.reference_type IS 'The type of the reference.';
+
+CREATE INDEX binarysourcereference__bpr__type__idx
+    ON BinarySourceReference (binary_package_release, reference_type);
+CREATE INDEX binarysourcereference__spr__type__idx
+    ON BinarySourceReference (source_package_release, reference_type);
+CREATE UNIQUE INDEX binarysourcereference__bpr__spr__type__key
+    ON BinarySourceReference (binary_package_release, source_package_release, reference_type);
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2210, 13, 0);
diff --git a/database/schema/patch-2210-15-0.sql b/database/schema/patch-2210-15-0.sql
new file mode 100644
index 0000000..9fd355b
--- /dev/null
+++ b/database/schema/patch-2210-15-0.sql
@@ -0,0 +1,22 @@
+-- Copyright 2020 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+CREATE TABLE OCIRecipeJob (
+    job integer PRIMARY KEY REFERENCES Job ON DELETE CASCADE NOT NULL,
+    recipe INTEGER NOT NULL REFERENCES OCIRecipe,
+    job_type INTEGER NOT NULL,
+    json_data jsonb NOT NULL
+);
+
+CREATE INDEX ocirecipejob__recipe__job_type__job__idx
+  ON OCIRecipeJob(recipe, job_type, job);
+
+COMMENT ON TABLE OCIRecipeJob IS 'Contains references to jobs that are executed for an OCI Recipe.';
+COMMENT ON COLUMN OCIRecipeJob.job IS 'A reference to a Job row that has all the common job details.';
+COMMENT ON COLUMN OCIRecipeJob.recipe IS 'The OCI recipe that this job is for.';
+COMMENT ON COLUMN OCIRecipeJob.job_type IS 'The type of a job, such as a build request.';
+COMMENT ON COLUMN OCIRecipeJob.json_data IS 'Data that is specific to a particular job type.';
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2210, 15, 0);
diff --git a/database/schema/security.cfg b/database/schema/security.cfg
index 55226e1..d36a542 100644
--- a/database/schema/security.cfg
+++ b/database/schema/security.cfg
@@ -250,6 +250,7 @@ public.ocirecipe                        = SELECT, INSERT, UPDATE, DELETE
 public.ocirecipearch                    = SELECT, INSERT, DELETE
 public.ocirecipebuild                   = SELECT, INSERT, UPDATE, DELETE
 public.ocirecipebuildjob                = SELECT, INSERT, UPDATE, DELETE
+public.ocirecipejob                     = SELECT, INSERT, UPDATE, DELETE
 public.ociregistrycredentials           = SELECT, INSERT, UPDATE, DELETE
 public.officialbugtag                   = SELECT, INSERT, UPDATE, DELETE
 public.openidconsumerassociation        = SELECT, INSERT, UPDATE, DELETE