Add watchdog submissions DB table migration SQL. (#4376) (#4417)

- And the new 'abuse', 'usererror', and 'watchdog' block types. (#4347)

server/db-patches/patch-22-23.sql

@@ -0,0 +1,9 @@
+-- pg-patcher runs migrations in transactions. However, ALTER TYPE ... ADD VALUE
+-- cannot be executed inside a transaction block. We will swap out the enum type
+-- with a new one instead.
+ALTER TYPE shot_block_type RENAME TO old_shot_block_type;
+CREATE TYPE shot_block_type AS ENUM ('none', 'dmca', 'abuse', 'usererror', 'watchdog');
+ALTER TABLE data ALTER COLUMN block_type DROP DEFAULT;
+ALTER TABLE data ALTER COLUMN block_type TYPE shot_block_type USING block_type::text::shot_block_type;
+ALTER TABLE data ALTER COLUMN block_type SET DEFAULT 'none'::shot_block_type;
+DROP TYPE old_shot_block_type;

server/db-patches/patch-23-22.sql

@@ -0,0 +1,4 @@
+-- Records using the new enum values from 22-23 must be updated or deleted in
+-- order to update the enum type. Moreover, the entire `data` table must be
+-- updated to use a new enum type (see 22-23 for what's entailed).
+-- For those reasons, we refrain from removing the enum values in here.

server/db-patches/patch-23-24.sql

@@ -0,0 +1,12 @@
+CREATE TABLE watchdog_submissions (
+  id SERIAL,
+  shot_id CHARACTER VARYING(270) NOT NULL,
+  request_id CHARACTER(36) NOT NULL,
+  nonce CHARACTER(36) NOT NULL,
+  positive_result boolean,
+  CONSTRAINT watchdog_pkey PRIMARY KEY (id),
+  CONSTRAINT watchdog_shot_id_fkey FOREIGN KEY (shot_id)
+      REFERENCES data(id)
+      ON UPDATE NO ACTION
+      ON DELETE CASCADE
+);

server/db-patches/patch-24-23.sql

@@ -0,0 +1 @@
+DROP TABLE watchdog_submissions;

server/schema.sql

@@ -1,8 +1,10 @@
 CREATE TYPE shot_block_type AS ENUM (
     'none',
-    'dmca'
+    'dmca',
+    'abuse',
+    'usererror',
+    'watchdog'
 );
-ALTER TYPE shot_block_type OWNER TO ianbicking;
 CREATE TABLE accounts (
     id character varying(200) NOT NULL,
     token text,
@@ -58,6 +60,21 @@ CREATE TABLE states (
     state character varying(64) NOT NULL,
     deviceid character varying(200)
 );
+CREATE TABLE watchdog_submissions (
+    id integer NOT NULL,
+    shot_id character varying(270) NOT NULL,
+    request_id character(36) NOT NULL,
+    nonce character(36) NOT NULL,
+    positive_result boolean
+);
+CREATE SEQUENCE watchdog_submissions_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+ALTER SEQUENCE watchdog_submissions_id_seq OWNED BY watchdog_submissions.id;
+ALTER TABLE ONLY watchdog_submissions ALTER COLUMN id SET DEFAULT nextval('watchdog_submissions_id_seq'::regclass);
 ALTER TABLE ONLY accounts
     ADD CONSTRAINT accounts_pkey PRIMARY KEY (id);
 ALTER TABLE ONLY data
@@ -70,6 +87,8 @@ ALTER TABLE ONLY property
     ADD CONSTRAINT property_pkey PRIMARY KEY (key);
 ALTER TABLE ONLY states
     ADD CONSTRAINT states_pkey PRIMARY KEY (state);
+ALTER TABLE ONLY watchdog_submissions
+    ADD CONSTRAINT watchdog_pkey PRIMARY KEY (id);
 CREATE INDEX data_deviceid_idx ON data USING btree (deviceid);
 CREATE INDEX devices_accountid_idx ON devices USING btree (accountid);
 CREATE INDEX images_shotid_idx ON images USING btree (shotid);
@@ -83,4 +102,6 @@ ALTER TABLE ONLY images
     ADD CONSTRAINT images_shotid_fkey FOREIGN KEY (shotid) REFERENCES data(id) ON DELETE CASCADE;
 ALTER TABLE ONLY states
     ADD CONSTRAINT states_deviceid_fkey FOREIGN KEY (deviceid) REFERENCES devices(id) ON DELETE CASCADE;
--- pg-patch version: 20
+ALTER TABLE ONLY watchdog_submissions
+    ADD CONSTRAINT watchdog_shot_id_fkey FOREIGN KEY (shot_id) REFERENCES data(id) ON DELETE CASCADE;
+-- pg-patch version: 24

server/src/dbschema.js

@@ -7,7 +7,7 @@ const mozlog = require("./logging").mozlog("dbschema");
 
 // When updating the database, please also run ./bin/dumpschema --record
 // This updates schema.sql with the latest full database schema
-const MAX_DB_LEVEL = exports.MAX_DB_LEVEL = 22;
+const MAX_DB_LEVEL = exports.MAX_DB_LEVEL = 24;
 
 exports.forceDbVersion = function(version) {
   mozlog.info("forcing-db-version", {db: db.constr, version});