#284 add unique main index columns to tables and index/replace

scribe-org · Apr 19, 2023 · f6527e7 · f6527e7
1 parent 0495a72
commit f6527e7
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 4 deletions.
diff --git a/Keyboards/KeyboardsBase/KeyboardViewController.swift b/Keyboards/KeyboardsBase/KeyboardViewController.swift
@@ -1470,7 +1470,7 @@ class KeyboardViewController: UIInputViewController {
       expandLanguageDataset()
 
       // Add UILexicon words including unpaired first and last names from Contacts to autocompletions.
-      let addToAutocompleteLexiconQuery = "INSERT INTO autocomplete_lexicon (word) VALUES (?)"
+      let addToAutocompleteLexiconQuery = "INSERT OR IGNORE INTO autocomplete_lexicon (word) VALUES (?)"
       requestSupplementaryLexicon { (userLexicon: UILexicon!) in
         for item in userLexicon.entries {
           if item.documentText.count > 1 {

diff --git a/Keyboards/KeyboardsBase/LoadData.swift b/Keyboards/KeyboardsBase/LoadData.swift
@@ -96,19 +96,19 @@ func expandLanguageDataset() {
   let scribeOrEmptyString = queryDBRow(query: checkScribeQuery, outputCols: outputCols, args: args)[0]
 
   if scribeOrEmptyString == "" {
-    let addScribeQuery = "INSERT INTO nouns (noun, plural, form) VALUES (?, ?, ?)"
+    let addScribeQuery = "INSERT OR IGNORE INTO nouns (noun, plural, form) VALUES (?, ?, ?)"
     writeDBRow(query: addScribeQuery, args: ["Scribe", "Scribes", ""])
     writeDBRow(query: addScribeQuery, args: ["Scribes", "isPlural", "PL"])
   }
 
   // Add German compound prepositions to the prepositions table so they also receive annotations.
   if controllerLanguage == "German" {
-    let prepositionsInsertQuery = "INSERT INTO prepositions (preposition, form) VALUES (?, ?)"
+    let prepositionsInsertQuery = "INSERT OR IGNORE INTO prepositions (preposition, form) VALUES (?, ?)"
     for (p, f) in contractedGermanPrepositions {
       writeDBRow(query: prepositionsInsertQuery, args: [p, f])
     }
 
-    let autocompletionsInsertQuery = "INSERT INTO autocomplete_lexicon (word) VALUES (?)"
+    let autocompletionsInsertQuery = "INSERT OR IGNORE INTO autocomplete_lexicon (word) VALUES (?)"
     for (p, _) in contractedGermanPrepositions {
       writeDBRow(query: autocompletionsInsertQuery, args: [p])
     }

diff --git a/Keyboards/LanguageKeyboards/French/FRLanguageData.sqlite b/Keyboards/LanguageKeyboards/French/FRLanguageData.sqlite
diff --git a/Keyboards/LanguageKeyboards/German/DELanguageData.sqlite b/Keyboards/LanguageKeyboards/German/DELanguageData.sqlite
diff --git a/Keyboards/LanguageKeyboards/Italian/ITLanguageData.sqlite b/Keyboards/LanguageKeyboards/Italian/ITLanguageData.sqlite
diff --git a/Keyboards/LanguageKeyboards/Portuguese/PTLanguageData.sqlite b/Keyboards/LanguageKeyboards/Portuguese/PTLanguageData.sqlite
diff --git a/Keyboards/LanguageKeyboards/Russian/RULanguageData.sqlite b/Keyboards/LanguageKeyboards/Russian/RULanguageData.sqlite
diff --git a/Keyboards/LanguageKeyboards/Spanish/ESLanguageData.sqlite b/Keyboards/LanguageKeyboards/Spanish/ESLanguageData.sqlite
diff --git a/Keyboards/LanguageKeyboards/Swedish/SVLanguageData.sqlite b/Keyboards/LanguageKeyboards/Swedish/SVLanguageData.sqlite