1 files changed, 232 insertions, 222 deletions
diff --git a/third_party/rust/suggest/src/schema.rs b/third_party/rust/suggest/src/schema.rs
index b304363de5..76a0deed39 100644
--- a/third_party/rust/suggest/src/schema.rs
+++ b/third_party/rust/suggest/src/schema.rs
@@ -15,118 +15,118 @@ use sql_support::open_database::{self, ConnectionInitializer};
 ///     [`SuggestConnectionInitializer::upgrade_from`].
 ///    a. If suggestions should be re-ingested after the migration, call `clear_database()` inside
 ///       the migration.
-pub const VERSION: u32 = 18;
+pub const VERSION: u32 = 19;
 
 /// The current Suggest database schema.
 pub const SQL: &str = "
-    CREATE TABLE meta(
-        key TEXT PRIMARY KEY,
-        value NOT NULL
-    ) WITHOUT ROWID;
-
-    CREATE TABLE keywords(
-        keyword TEXT NOT NULL,
-        suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
-        full_keyword_id INTEGER NULL REFERENCES full_keywords(id) ON DELETE SET NULL,
-        rank INTEGER NOT NULL,
-        PRIMARY KEY (keyword, suggestion_id)
-    ) WITHOUT ROWID;
-
-    -- full keywords are what we display to the user when a (partial) keyword matches
-    -- The FK to suggestion_id makes it so full keywords get deleted when the parent suggestion is deleted.
-    CREATE TABLE full_keywords(
-        id INTEGER PRIMARY KEY,
-        suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
-        full_keyword TEXT NOT NULL
-    );
-
-    CREATE TABLE prefix_keywords(
-        keyword_prefix TEXT NOT NULL,
-        keyword_suffix TEXT NOT NULL DEFAULT '',
-        confidence INTEGER NOT NULL DEFAULT 0,
-        rank INTEGER NOT NULL,
-        suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
-        PRIMARY KEY (keyword_prefix, keyword_suffix, suggestion_id)
-    ) WITHOUT ROWID;
-
-    CREATE UNIQUE INDEX keywords_suggestion_id_rank ON keywords(suggestion_id, rank);
-
-    CREATE TABLE suggestions(
-        id INTEGER PRIMARY KEY,
-        record_id TEXT NOT NULL,
-        provider INTEGER NOT NULL,
-        title TEXT NOT NULL,
-        url TEXT NOT NULL,
-        score REAL NOT NULL
-    );
-
-    CREATE TABLE amp_custom_details(
-        suggestion_id INTEGER PRIMARY KEY,
-        advertiser TEXT NOT NULL,
-        block_id INTEGER NOT NULL,
-        iab_category TEXT NOT NULL,
-        impression_url TEXT NOT NULL,
-        click_url TEXT NOT NULL,
-        icon_id TEXT NOT NULL,
-        FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
-    );
-
-    CREATE TABLE wikipedia_custom_details(
-        suggestion_id INTEGER PRIMARY KEY REFERENCES suggestions(id) ON DELETE CASCADE,
-        icon_id TEXT NOT NULL
-    );
-
-    CREATE TABLE amo_custom_details(
-        suggestion_id INTEGER PRIMARY KEY,
-        description TEXT NOT NULL,
-        guid TEXT NOT NULL,
-        icon_url TEXT NOT NULL,
-        rating TEXT,
-        number_of_ratings INTEGER NOT NULL,
-        FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
-    );
-
-    CREATE INDEX suggestions_record_id ON suggestions(record_id);
-
-    CREATE TABLE icons(
-        id TEXT PRIMARY KEY,
-        data BLOB NOT NULL,
-        mimetype TEXT NOT NULL
-    ) WITHOUT ROWID;
-
-    CREATE TABLE yelp_subjects(
-        keyword TEXT PRIMARY KEY,
-        record_id TEXT NOT NULL
-    ) WITHOUT ROWID;
-
-    CREATE TABLE yelp_modifiers(
-        type INTEGER NOT NULL,
-        keyword TEXT NOT NULL,
-        record_id TEXT NOT NULL,
-        PRIMARY KEY (type, keyword)
-    ) WITHOUT ROWID;
-
-    CREATE TABLE yelp_location_signs(
-        keyword TEXT PRIMARY KEY,
-        need_location INTEGER NOT NULL,
-        record_id TEXT NOT NULL
-    ) WITHOUT ROWID;
-
-    CREATE TABLE yelp_custom_details(
-        icon_id TEXT PRIMARY KEY,
-        score REAL NOT NULL,
-        record_id TEXT NOT NULL
-    ) WITHOUT ROWID;
-
-    CREATE TABLE mdn_custom_details(
-        suggestion_id INTEGER PRIMARY KEY,
-        description TEXT NOT NULL,
-        FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
-    );
-
-    CREATE TABLE dismissed_suggestions (
-        url TEXT PRIMARY KEY
-    ) WITHOUT ROWID;
+CREATE TABLE meta(
+    key TEXT PRIMARY KEY,
+    value NOT NULL
+) WITHOUT ROWID;
+
+CREATE TABLE keywords(
+    keyword TEXT NOT NULL,
+    suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
+    full_keyword_id INTEGER NULL REFERENCES full_keywords(id) ON DELETE SET NULL,
+    rank INTEGER NOT NULL,
+    PRIMARY KEY (keyword, suggestion_id)
+) WITHOUT ROWID;
+
+-- full keywords are what we display to the user when a (partial) keyword matches
+-- The FK to suggestion_id makes it so full keywords get deleted when the parent suggestion is deleted.
+CREATE TABLE full_keywords(
+    id INTEGER PRIMARY KEY,
+    suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
+    full_keyword TEXT NOT NULL
+);
+
+CREATE TABLE prefix_keywords(
+    keyword_prefix TEXT NOT NULL,
+    keyword_suffix TEXT NOT NULL DEFAULT '',
+    confidence INTEGER NOT NULL DEFAULT 0,
+    rank INTEGER NOT NULL,
+    suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
+    PRIMARY KEY (keyword_prefix, keyword_suffix, suggestion_id)
+) WITHOUT ROWID;
+
+CREATE UNIQUE INDEX keywords_suggestion_id_rank ON keywords(suggestion_id, rank);
+
+CREATE TABLE suggestions(
+    id INTEGER PRIMARY KEY,
+    record_id TEXT NOT NULL,
+    provider INTEGER NOT NULL,
+    title TEXT NOT NULL,
+    url TEXT NOT NULL,
+    score REAL NOT NULL
+);
+
+CREATE TABLE amp_custom_details(
+    suggestion_id INTEGER PRIMARY KEY,
+    advertiser TEXT NOT NULL,
+    block_id INTEGER NOT NULL,
+    iab_category TEXT NOT NULL,
+    impression_url TEXT NOT NULL,
+    click_url TEXT NOT NULL,
+    icon_id TEXT NOT NULL,
+    FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
+);
+
+CREATE TABLE wikipedia_custom_details(
+    suggestion_id INTEGER PRIMARY KEY REFERENCES suggestions(id) ON DELETE CASCADE,
+    icon_id TEXT NOT NULL
+);
+
+CREATE TABLE amo_custom_details(
+    suggestion_id INTEGER PRIMARY KEY,
+    description TEXT NOT NULL,
+    guid TEXT NOT NULL,
+    icon_url TEXT NOT NULL,
+    rating TEXT,
+    number_of_ratings INTEGER NOT NULL,
+    FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
+);
+
+CREATE INDEX suggestions_record_id ON suggestions(record_id);
+
+CREATE TABLE icons(
+    id TEXT PRIMARY KEY,
+    data BLOB NOT NULL,
+    mimetype TEXT NOT NULL
+) WITHOUT ROWID;
+
+CREATE TABLE yelp_subjects(
+    keyword TEXT PRIMARY KEY,
+    record_id TEXT NOT NULL
+) WITHOUT ROWID;
+
+CREATE TABLE yelp_modifiers(
+    type INTEGER NOT NULL,
+    keyword TEXT NOT NULL,
+    record_id TEXT NOT NULL,
+    PRIMARY KEY (type, keyword)
+) WITHOUT ROWID;
+
+CREATE TABLE yelp_location_signs(
+    keyword TEXT PRIMARY KEY,
+    need_location INTEGER NOT NULL,
+    record_id TEXT NOT NULL
+) WITHOUT ROWID;
+
+CREATE TABLE yelp_custom_details(
+    icon_id TEXT PRIMARY KEY,
+    score REAL NOT NULL,
+    record_id TEXT NOT NULL
+) WITHOUT ROWID;
+
+CREATE TABLE mdn_custom_details(
+    suggestion_id INTEGER PRIMARY KEY,
+    description TEXT NOT NULL,
+    FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
+);
+
+CREATE TABLE dismissed_suggestions (
+    url TEXT PRIMARY KEY
+) WITHOUT ROWID;
 ";
 
 /// Initializes an SQLite connection to the Suggest database, performing
@@ -166,9 +166,9 @@ impl ConnectionInitializer for SuggestConnectionInitializer {
             16 => {
                 tx.execute(
                     "
-                    CREATE TABLE dismissed_suggestions (
-                        url_hash INTEGER PRIMARY KEY
-                    ) WITHOUT ROWID;",
+CREATE TABLE dismissed_suggestions (
+    url_hash INTEGER PRIMARY KEY
+) WITHOUT ROWID;",
                     (),
                 )?;
                 Ok(())
@@ -176,14 +176,23 @@ impl ConnectionInitializer for SuggestConnectionInitializer {
             17 => {
                 tx.execute(
                     "
-                    DROP TABLE dismissed_suggestions;
-                    CREATE TABLE dismissed_suggestions (
-                        url TEXT PRIMARY KEY
-                    ) WITHOUT ROWID;",
+DROP TABLE dismissed_suggestions;
+CREATE TABLE dismissed_suggestions (
+    url TEXT PRIMARY KEY
+) WITHOUT ROWID;",
                     (),
                 )?;
                 Ok(())
             }
+            18 => {
+                tx.execute_batch(
+                    "
+CREATE TABLE IF NOT EXISTS dismissed_suggestions (
+    url TEXT PRIMARY KEY
+) WITHOUT ROWID;",
+                )?;
+                Ok(())
+            }
             _ => Err(open_database::Error::IncompatibleVersion(version)),
         }
     }
@@ -212,112 +221,112 @@ mod test {
     // Snapshot of the v16 schema.  We use this to test that we can migrate from there to the
     // current schema.
     const V16_SCHEMA: &str = r#"
-    CREATE TABLE meta(
-        key TEXT PRIMARY KEY,
-        value NOT NULL
-    ) WITHOUT ROWID;
-
-    CREATE TABLE keywords(
-        keyword TEXT NOT NULL,
-        suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
-        full_keyword_id INTEGER NULL REFERENCES full_keywords(id) ON DELETE SET NULL,
-        rank INTEGER NOT NULL,
-        PRIMARY KEY (keyword, suggestion_id)
-    ) WITHOUT ROWID;
-
-    -- full keywords are what we display to the user when a (partial) keyword matches
-    -- The FK to suggestion_id makes it so full keywords get deleted when the parent suggestion is deleted.
-    CREATE TABLE full_keywords(
-        id INTEGER PRIMARY KEY,
-        suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
-        full_keyword TEXT NOT NULL
-    );
-
-    CREATE TABLE prefix_keywords(
-        keyword_prefix TEXT NOT NULL,
-        keyword_suffix TEXT NOT NULL DEFAULT '',
-        confidence INTEGER NOT NULL DEFAULT 0,
-        rank INTEGER NOT NULL,
-        suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
-        PRIMARY KEY (keyword_prefix, keyword_suffix, suggestion_id)
-    ) WITHOUT ROWID;
-
-    CREATE UNIQUE INDEX keywords_suggestion_id_rank ON keywords(suggestion_id, rank);
-
-    CREATE TABLE suggestions(
-        id INTEGER PRIMARY KEY,
-        record_id TEXT NOT NULL,
-        provider INTEGER NOT NULL,
-        title TEXT NOT NULL,
-        url TEXT NOT NULL,
-        score REAL NOT NULL
-    );
-
-    CREATE TABLE amp_custom_details(
-        suggestion_id INTEGER PRIMARY KEY,
-        advertiser TEXT NOT NULL,
-        block_id INTEGER NOT NULL,
-        iab_category TEXT NOT NULL,
-        impression_url TEXT NOT NULL,
-        click_url TEXT NOT NULL,
-        icon_id TEXT NOT NULL,
-        FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
-    );
-
-    CREATE TABLE wikipedia_custom_details(
-        suggestion_id INTEGER PRIMARY KEY REFERENCES suggestions(id) ON DELETE CASCADE,
-        icon_id TEXT NOT NULL
-    );
-
-    CREATE TABLE amo_custom_details(
-        suggestion_id INTEGER PRIMARY KEY,
-        description TEXT NOT NULL,
-        guid TEXT NOT NULL,
-        icon_url TEXT NOT NULL,
-        rating TEXT,
-        number_of_ratings INTEGER NOT NULL,
-        FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
-    );
-
-    CREATE INDEX suggestions_record_id ON suggestions(record_id);
-
-    CREATE TABLE icons(
-        id TEXT PRIMARY KEY,
-        data BLOB NOT NULL,
-        mimetype TEXT NOT NULL
-    ) WITHOUT ROWID;
-
-    CREATE TABLE yelp_subjects(
-        keyword TEXT PRIMARY KEY,
-        record_id TEXT NOT NULL
-    ) WITHOUT ROWID;
-
-    CREATE TABLE yelp_modifiers(
-        type INTEGER NOT NULL,
-        keyword TEXT NOT NULL,
-        record_id TEXT NOT NULL,
-        PRIMARY KEY (type, keyword)
-    ) WITHOUT ROWID;
-
-    CREATE TABLE yelp_location_signs(
-        keyword TEXT PRIMARY KEY,
-        need_location INTEGER NOT NULL,
-        record_id TEXT NOT NULL
-    ) WITHOUT ROWID;
-
-    CREATE TABLE yelp_custom_details(
-        icon_id TEXT PRIMARY KEY,
-        score REAL NOT NULL,
-        record_id TEXT NOT NULL
-    ) WITHOUT ROWID;
-
-    CREATE TABLE mdn_custom_details(
-        suggestion_id INTEGER PRIMARY KEY,
-        description TEXT NOT NULL,
-        FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
-    );
-
-    PRAGMA user_version=16;
+CREATE TABLE meta(
+    key TEXT PRIMARY KEY,
+    value NOT NULL
+) WITHOUT ROWID;
+
+CREATE TABLE keywords(
+    keyword TEXT NOT NULL,
+    suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
+    full_keyword_id INTEGER NULL REFERENCES full_keywords(id) ON DELETE SET NULL,
+    rank INTEGER NOT NULL,
+    PRIMARY KEY (keyword, suggestion_id)
+) WITHOUT ROWID;
+
+-- full keywords are what we display to the user when a (partial) keyword matches
+-- The FK to suggestion_id makes it so full keywords get deleted when the parent suggestion is deleted.
+CREATE TABLE full_keywords(
+    id INTEGER PRIMARY KEY,
+    suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
+    full_keyword TEXT NOT NULL
+);
+
+CREATE TABLE prefix_keywords(
+    keyword_prefix TEXT NOT NULL,
+    keyword_suffix TEXT NOT NULL DEFAULT '',
+    confidence INTEGER NOT NULL DEFAULT 0,
+    rank INTEGER NOT NULL,
+    suggestion_id INTEGER NOT NULL REFERENCES suggestions(id) ON DELETE CASCADE,
+    PRIMARY KEY (keyword_prefix, keyword_suffix, suggestion_id)
+) WITHOUT ROWID;
+
+CREATE UNIQUE INDEX keywords_suggestion_id_rank ON keywords(suggestion_id, rank);
+
+CREATE TABLE suggestions(
+    id INTEGER PRIMARY KEY,
+    record_id TEXT NOT NULL,
+    provider INTEGER NOT NULL,
+    title TEXT NOT NULL,
+    url TEXT NOT NULL,
+    score REAL NOT NULL
+);
+
+CREATE TABLE amp_custom_details(
+    suggestion_id INTEGER PRIMARY KEY,
+    advertiser TEXT NOT NULL,
+    block_id INTEGER NOT NULL,
+    iab_category TEXT NOT NULL,
+    impression_url TEXT NOT NULL,
+    click_url TEXT NOT NULL,
+    icon_id TEXT NOT NULL,
+    FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
+);
+
+CREATE TABLE wikipedia_custom_details(
+    suggestion_id INTEGER PRIMARY KEY REFERENCES suggestions(id) ON DELETE CASCADE,
+    icon_id TEXT NOT NULL
+);
+
+CREATE TABLE amo_custom_details(
+    suggestion_id INTEGER PRIMARY KEY,
+    description TEXT NOT NULL,
+    guid TEXT NOT NULL,
+    icon_url TEXT NOT NULL,
+    rating TEXT,
+    number_of_ratings INTEGER NOT NULL,
+    FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
+);
+
+CREATE INDEX suggestions_record_id ON suggestions(record_id);
+
+CREATE TABLE icons(
+    id TEXT PRIMARY KEY,
+    data BLOB NOT NULL,
+    mimetype TEXT NOT NULL
+) WITHOUT ROWID;
+
+CREATE TABLE yelp_subjects(
+    keyword TEXT PRIMARY KEY,
+    record_id TEXT NOT NULL
+) WITHOUT ROWID;
+
+CREATE TABLE yelp_modifiers(
+    type INTEGER NOT NULL,
+    keyword TEXT NOT NULL,
+    record_id TEXT NOT NULL,
+    PRIMARY KEY (type, keyword)
+) WITHOUT ROWID;
+
+CREATE TABLE yelp_location_signs(
+    keyword TEXT PRIMARY KEY,
+    need_location INTEGER NOT NULL,
+    record_id TEXT NOT NULL
+) WITHOUT ROWID;
+
+CREATE TABLE yelp_custom_details(
+    icon_id TEXT PRIMARY KEY,
+    score REAL NOT NULL,
+    record_id TEXT NOT NULL
+) WITHOUT ROWID;
+
+CREATE TABLE mdn_custom_details(
+    suggestion_id INTEGER PRIMARY KEY,
+    description TEXT NOT NULL,
+    FOREIGN KEY(suggestion_id) REFERENCES suggestions(id) ON DELETE CASCADE
+);
+
+PRAGMA user_version=16;
 "#;
 
     /// Test running all schema upgrades from V16, which was the first schema with a "real"
@@ -328,5 +337,6 @@ mod test {
     fn test_all_upgrades() {
         let db_file = MigratedDatabaseFile::new(SuggestConnectionInitializer, V16_SCHEMA);
         db_file.run_all_upgrades();
+        db_file.assert_schema_matches_new_database();
     }
 }