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

[Colin Watson]

Merge db-stable d1437a257a (Add constraint to OCIRecipe.git_repository and git_path)

[Colin Watson (cjwatson)]

Deployed to the production database today.

review: Approve

diff --git a/database/schema/patch-2210-08-5.sql b/database/schema/patch-2210-08-5.sql
new file mode 100644
index 0000000..7d5cef4
--- /dev/null
+++ b/database/schema/patch-2210-08-5.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 ADD CONSTRAINT consistent_git_ref CHECK ((git_repository IS NULL) = (git_path IS NULL));
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2210, 08, 5);