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

[Colin Watson]

Merge db-stable 466ed9d4c4 (Add affirmed column to signedcodeofconduct)

[Colin Watson (cjwatson)]

Deployed to the production database today.

review: Approve

diff --git a/database/schema/patch-2210-34-0.sql b/database/schema/patch-2210-34-0.sql
new file mode 100644
index 0000000..fe97a37
--- /dev/null
+++ b/database/schema/patch-2210-34-0.sql
@@ -0,0 +1,15 @@
+-- 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;
+
+ALTER TABLE signedcodeofconduct
+    ADD COLUMN affirmed boolean,
+    ADD COLUMN version text;
+
+ALTER TABLE signedcodeofconduct ADD CONSTRAINT only_one_method CHECK (NOT affirmed OR signing_key_fingerprint IS NULL);
+
+COMMENT ON COLUMN signedcodeofconduct.affirmed IS 'Code of conduct was affirmed via website interaction.';
+COMMENT ON COLUMN signedcodeofconduct.version IS 'Version of the Code of Conduct that was signed.';
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2210, 34, 0);