Preposition annotation: update queryPrepForm and add conversion preposition to abbreviation

Author: catreedle

Keyboards/DataManager/LanguageDBManager.swift

@@ -12,6 +12,7 @@ class LanguageDBManager {
   static let shared = LanguageDBManager(translate: false)
   static let translations = LanguageDBManager(translate: true)
   private var database: DatabaseQueue?
+  private var cachedHasGrammaticalCase: Bool?
 
   private init(translate: Bool) {
     if translate {
@@ -358,22 +359,46 @@ extension LanguageDBManager {
 
   /// Query preposition form of word in `prepositions`.
   func queryPrepForm(of word: String) -> [String] {
-    let query = """
-    SELECT
-      *
-
-    FROM
-      prepositions
+    // Check if this language's database has grammaticalCase column
+    guard hasGrammaticalCaseColumn() else {
+      return [""]
+    }
 
-    WHERE
-      preposition = ?
-    """
-    let outputCols = ["form"]
+    let query = """
+      SELECT grammaticalCase
+      FROM prepositions
+      WHERE preposition = ?
+      """
+    let outputCols = ["grammaticalCase"]
     let args = [word]
 
     return queryDBRow(query: query, outputCols: outputCols, args: StatementArguments(args))
   }
 
+  /// Check if the prepositions table has a grammaticalCase column.
+  /// Result is cached to avoid repeated PRAGMA queries.
+  private func hasGrammaticalCaseColumn() -> Bool {
+    if let cached = cachedHasGrammaticalCase {
+      return cached
+    }
+
+    var hasColumn = false
+
+    do {
+      try database?.read { db in
+        let columns = try Row.fetchAll(db, sql: "PRAGMA table_info(prepositions)")
+        hasColumn = columns.contains { row in
+          (row["name"] as? String) == "grammaticalCase"
+        }
+      }
+    } catch {
+      hasColumn = false
+    }
+
+    cachedHasGrammaticalCase = hasColumn
+    return hasColumn
+  }
+
   /// Query the translation of word in the current language. Only works with the `translations` manager.
   func queryTranslation(of word: String) -> [String] {
     let translateLanguage = getKeyInDict(givenValue: getControllerTranslateLangCode(), dict: languagesAbbrDict)

Keyboards/KeyboardsBase/ScribeFunctionality/Annotate.swift

@@ -34,16 +34,30 @@ let prepAnnotationConversionDict = [
 
 // Converts full gender names to abbreviations (e.g., "feminine" → "F")
 func convertFullGenderToAbbr(_ genderFull: String) -> String {
-    let genderMap: [String: String] = [
-        "feminine": "F",
-        "masculine": "M",
-        "neuter": "N",
-        "common": "C",
-        "common of two genders": "C",
-        "PL": "PL"
-    ]
-
-    return genderMap[genderFull.lowercased()] ?? genderFull
+  let genderMap: [String: String] = [
+    "feminine": "F",
+    "masculine": "M",
+    "neuter": "N",
+    "common": "C",
+    "common of two genders": "C",
+    "PL": "PL"
+  ]
+
+  return genderMap[genderFull.lowercased()] ?? genderFull
+}
+
+// Converts full preposition to abbreviations
+func convertFullPrepositionToAbbr(_ prepositionFull: String) -> String {
+  let prepositionMap: [String: String] = [
+    "genitive case": "Gen",
+    "accusative case": "Acc",
+    "dative case": "Dat",
+    "locative case": "Loc",
+    "prepositional case": "Pre",
+    "instrumental case": "Ins"
+  ]
+
+  return prepositionMap[prepositionFull.lowercased()] ?? prepositionFull
 }
 
 /// The base function for annotation that's accessed by `typedWordAnnotation`.
@@ -77,6 +91,9 @@ func wordAnnotation(wordToAnnotate: String, KVC: KeyboardViewController) {
   let combinedNounForm = allAnnotations.joined(separator: "/")
 
   prepAnnotationForm = LanguageDBManager.shared.queryPrepForm(of: wordToAnnotate.lowercased())[0]
+  if !prepAnnotationForm.isEmpty {
+    prepAnnotationForm = convertFullPrepositionToAbbr(prepAnnotationForm)
+  }
 
   hasNounForm = !combinedNounForm.isEmpty
   hasPrepForm = !prepAnnotationForm.isEmpty