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

[Colin Watson]

Merge db-stable aa275df447 (Add CharmBase and CharmBaseArch tables)

[Colin Watson (cjwatson)]

Deployed to the production database today.

review: Approve

diff --git a/database/schema/patch-2210-33-2.sql b/database/schema/patch-2210-33-2.sql
new file mode 100644
index 0000000..4e50eac
--- /dev/null
+++ b/database/schema/patch-2210-33-2.sql
@@ -0,0 +1,33 @@
+-- Copyright 2021 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 CharmBase (
+    id serial PRIMARY KEY,
+    date_created timestamp without time zone DEFAULT (CURRENT_TIMESTAMP AT TIME ZONE 'UTC') NOT NULL,
+    registrant integer NOT NULL REFERENCES person,
+    distro_series integer NOT NULL REFERENCES distroseries,
+    build_snap_channels jsonb NOT NULL
+);
+
+CREATE INDEX charmbase__registrant__idx ON CharmBase (registrant);
+CREATE UNIQUE INDEX charmbase__distro_series__key ON CharmBase (distro_series);
+
+COMMENT ON TABLE CharmBase IS 'A base for charms.';
+COMMENT ON COLUMN CharmBase.date_created IS 'The date on which this base was created in Launchpad.';
+COMMENT ON COLUMN CharmBase.registrant IS 'The user who registered this base.';
+COMMENT ON COLUMN CharmBase.distro_series IS 'The distro series for this base.';
+COMMENT ON COLUMN CharmBase.build_snap_channels IS 'A dictionary mapping snap names to channels to use when building charm recipes that specify this base.';
+
+CREATE TABLE CharmBaseArch (
+    charm_base integer NOT NULL REFERENCES charmbase,
+    processor integer NOT NULL REFERENCES processor,
+    PRIMARY KEY (charm_base, processor)
+);
+
+COMMENT ON TABLE CharmBaseArch IS 'The architectures that a charm base supports.';
+COMMENT ON COLUMN CharmBaseArch.charm_base IS 'The charm base for which a supported architecture is specified.';
+COMMENT ON COLUMN CharmBaseArch.processor IS 'A supported architecture for this charm base.';
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2210, 33, 2);
diff --git a/database/schema/security.cfg b/database/schema/security.cfg
index 8779ef9..f664a4a 100644
--- a/database/schema/security.cfg
+++ b/database/schema/security.cfg
@@ -154,6 +154,8 @@ public.bugtrackercomponentgroup         = SELECT, INSERT, UPDATE
 public.bugtrackerperson                 = SELECT, UPDATE
 public.bugwatchactivity                 = SELECT, INSERT, UPDATE
 public.buildfarmjob                     = DELETE
+public.charmbase                        = SELECT, INSERT, UPDATE, DELETE
+public.charmbasearch                    = SELECT, INSERT, DELETE
 public.charmfile                        = SELECT, INSERT, UPDATE, DELETE
 public.charmrecipe                      = SELECT, INSERT, UPDATE, DELETE
 public.charmrecipebuild                 = SELECT, INSERT, UPDATE, DELETE
@@ -2322,6 +2324,7 @@ public.bugtracker                       = SELECT, UPDATE
 public.bugtrackerperson                 = SELECT, UPDATE
 public.bugwatch                         = SELECT, UPDATE
 public.builder                          = SELECT, UPDATE
+public.charmbase                        = SELECT, UPDATE
 public.charmrecipe                      = SELECT, UPDATE
 public.charmrecipebuild                 = SELECT, UPDATE
 public.codeimport                       = SELECT, UPDATE
@@ -2816,6 +2819,8 @@ public.archive                          = SELECT
 public.builder                          = SELECT
 public.buildfarmjob                     = SELECT, INSERT
 public.buildqueue                       = SELECT, INSERT, UPDATE
+public.charmbase                        = SELECT
+public.charmbasearch                    = SELECT
 public.charmfile                        = SELECT
 public.charmrecipe                      = SELECT, UPDATE
 public.charmrecipebuild                 = SELECT, INSERT, UPDATE