Merge ~twom/launchpad:drop-not-null-on-git-path into launchpad:master

[Tom Wardill]

Just drop the NOT NULL on OCIRecipe.git_path

We can't do this and add the constraint at the same time, it needs a code deploy between.

Unmerged commits

c6ef810... by Tom Wardill on 2020-02-28

Just drop the NOT NULL on OCIRecipe.git_path

0975e9f... by Tom Wardill on 2020-02-28

Allow OCIRecipe.git_path to be null and add constraints

b0e4283... by Patch Queue Manager <email address hidden> on 2020-02-28

Automatic merge from stable up to 570cfa5300ab

98f2d37... by Patch Queue Manager <email address hidden> on 2020-02-28

Automatic merge from stable up to e0878392dc79

0959d6d... by Patch Queue Manager <email address hidden> on 2020-02-28

Automatic merge from stable up to 6d551d7844b4

c9dfa9b... by Patch Queue Manager <email address hidden> on 2020-02-28

Automatic merge from stable up to 299fb27ad847

015757f... by Tom Wardill on 2020-02-27

Revert "Make git_repository column required in OCIRecipe"

Merged from https://code.launchpad.net/~twom/launchpad/+git/launchpad/+merge/379978

b1038be... by Tom Wardill on 2020-02-27

Revert "Make git_repository column required in OCIRecipe"

This reverts commit 0d202b5d487579f8b02ed72e603a87f4be867aa5.

ce5c638... by Tom Wardill on 2020-02-27

Make git_repository column required in OCIRecipe

Merged from https://code.launchpad.net/~twom/launchpad/+git/launchpad/+merge/379960

0d202b5... by Tom Wardill on 2020-02-27

Make git_repository column required in OCIRecipe

diff --git a/database/schema/patch-2210-03-0.sql b/database/schema/patch-2210-03-0.sql
new file mode 100644
index 0000000..bd83973
--- /dev/null
+++ b/database/schema/patch-2210-03-0.sql
@@ -0,0 +1,15 @@
+-- Copyright 2019-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;
+
+ALTER TABLE DistributionMirror
+    ADD COLUMN https_base_url text,
+    ADD CONSTRAINT distributionmirror_https_base_url_key UNIQUE (https_base_url),
+    ADD CONSTRAINT valid_https_base_url CHECK (valid_absolute_url(https_base_url)),
+    DROP CONSTRAINT one_or_more_urls,
+    ADD CONSTRAINT one_or_more_urls CHECK (http_base_url IS NOT NULL OR https_base_url IS NOT NULL OR ftp_base_url IS NOT NULL OR rsync_base_url IS NOT NULL);
+
+COMMENT ON COLUMN DistributionMirror.https_base_url IS 'The HTTPS URL used to access the mirror.';
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2210, 3, 0);
diff --git a/database/schema/patch-2210-08-4.sql b/database/schema/patch-2210-08-4.sql
new file mode 100644
index 0000000..c2ca3fb
--- /dev/null
+++ b/database/schema/patch-2210-08-4.sql
@@ -0,0 +1,6 @@
+-- Copyright 2020 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+ALTER TABLE OCIRecipe ALTER COLUMN git_path DROP NOT NULL;
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2210, 08, 4);