use ids for \{kanji,reading\}Element tables

lib/_data_ingestion/jmdict/seed_data.dart

@@ -72,20 +72,25 @@ Future<void> seedJMDictData(List<Entry> entries, Database db) async {
   print('  [JMdict] Batch 1 - Kanji and readings');
   Batch b = db.batch();
 
+  int elementId = 0;
   for (final e in entries) {
     b.insert(JMdictTableNames.entry, e.sqlValue);
+
     for (final k in e.kanji) {
+      elementId++;
       b.insert(
         JMdictTableNames.kanjiElement,
-        k.sqlValue..addAll({'entryId': e.entryId}),
+        k.sqlValue..addAll({
+          'entryId': e.entryId,
+          'elementId': elementId,
+        }),
       );
 
       for (final i in k.info) {
         b.insert(
           JMdictTableNames.kanjiInfo,
           {
-            'entryId': e.entryId,
-            'reading': k.reading,
+            'elementId': elementId,
             'info': i,
           },
         );
@@ -93,17 +98,20 @@ Future<void> seedJMDictData(List<Entry> entries, Database db) async {
     }
 
     for (final r in e.readings) {
+      elementId++;
       b.insert(
         JMdictTableNames.readingElement,
-        r.sqlValue..addAll({'entryId': e.entryId}),
+        r.sqlValue..addAll({
+          'entryId': e.entryId,
+          'elementId': elementId,
+        }),
       );
 
       for (final i in r.info) {
         b.insert(
           JMdictTableNames.readingInfo,
           {
-            'entryId': e.entryId,
-            'reading': r.reading,
+            'elementId': elementId,
             'info': i,
           },
         );
@@ -112,8 +120,7 @@ Future<void> seedJMDictData(List<Entry> entries, Database db) async {
         b.insert(
           JMdictTableNames.readingRestriction,
           {
-            'entryId': e.entryId,
-            'reading': r.reading,
+            'elementId': elementId,
             'restriction': res,
           },
         );

lib/search/word_search/data_query.dart

@@ -230,40 +230,37 @@ Future<LinearWordQueryData> fetchLinearWordQueryData(
   // Reading queries
 
   final readingIds = readingElements
-      .map((element) => (
-            element['entryId'] as int,
-            escapeStringValue(element['reading'] as String)
-          ))
+      .map((element) => element['elementId'] as int)
       .toList();
 
   late final List<Map<String, Object?>> readingElementInfos;
   final Future<List<Map<String, Object?>>> readingElementInfos_query =
       connection.query(
     JMdictTableNames.readingInfo,
-    where: '(entryId, reading) IN (${readingIds.join(',')})',
+    where: '(elementId) IN (${List.filled(readingIds.length, '?').join(',')})',
+    whereArgs: readingIds,
   );
 
   late final List<Map<String, Object?>> readingElementRestrictions;
   final Future<List<Map<String, Object?>>> readingElementRestrictions_query =
       connection.query(
     JMdictTableNames.readingRestriction,
-    where: '(entryId, reading) IN (${readingIds.join(',')})',
+    where: '(elementId) IN (${List.filled(readingIds.length, '?').join(',')})',
+    whereArgs: readingIds,
   );
 
   // Kanji queries
 
   final kanjiIds = kanjiElements
-      .map((element) => (
-            element['entryId'] as int,
-            escapeStringValue(element['reading'] as String)
-          ))
+      .map((element) => element['elementId'] as int)
       .toList();
 
   late final List<Map<String, Object?>> kanjiElementInfos;
   final Future<List<Map<String, Object?>>> kanjiElementInfos_query =
       connection.query(
     JMdictTableNames.kanjiInfo,
-    where: '(entryId, reading) IN (${kanjiIds.join(',')})',
+    where: '(elementId) IN (${List.filled(kanjiIds.length, '?').join(',')})',
+    whereArgs: kanjiIds,
   );
 
   await Future.wait([

lib/search/word_search/entry_id_query.dart

@@ -51,14 +51,14 @@ String _filterFTSSensitiveCharacters(String word) {
         WITH
           fts_results AS (
             SELECT DISTINCT
-              "${tableName}FTS"."entryId",
+              "${tableName}"."entryId",
               100
               + (("${tableName}FTS"."reading" = ?) * 50)
               + "JMdict_EntryScore"."score"
               AS "score"
             FROM "${tableName}FTS"
-            JOIN "${tableName}" USING ("entryId", "reading")
-            JOIN "JMdict_EntryScore" USING ("entryId", "reading")
+            JOIN "${tableName}" USING ("elementId")
+            JOIN "JMdict_EntryScore" USING ("elementId")
             WHERE "${tableName}FTS"."reading" MATCH ? || '*'
               AND "JMdict_EntryScore"."type" = '${tableName == JMdictTableNames.kanjiElement ? 'kanji' : 'reading'}'
             ORDER BY
@@ -72,9 +72,9 @@ String _filterFTSSensitiveCharacters(String word) {
               + "JMdict_EntryScore"."score"
               AS "score"
             FROM "${tableName}"
-            JOIN "JMdict_EntryScore" USING ("entryId", "reading")
+            JOIN "JMdict_EntryScore" USING ("elementId")
             WHERE "reading" LIKE '%' || ? || '%'
-              AND "entryId" NOT IN (SELECT "entryId" FROM "fts_results")
+              AND "${tableName}"."entryId" NOT IN (SELECT "entryId" FROM "fts_results")
               AND "JMdict_EntryScore"."type" = '${tableName == JMdictTableNames.kanjiElement ? 'kanji' : 'reading'}'
             ORDER BY
               "JMdict_EntryScore"."score" DESC,

lib/search/word_search/regrouping.dart

@@ -182,16 +182,35 @@ GroupedWordResult _regroup_words({
     'No readings found for entryId: $entryId',
   );
 
+  final Map<int, String> readingElementIdsToReading = {
+    for (final element in readingElements_)
+      element['elementId'] as int: element['reading'] as String,
+  };
+
+  final Map<int, String> kanjiElementIdsToReading = {
+    for (final element in kanjiElements_)
+      element['elementId'] as int: element['reading'] as String,
+  };
+
+  final readingElementInfos_ = readingElementInfos
+      .where((element) => element['entryId'] == entryId)
+      .toList();
+
+  final kanjiElementInfos_ = kanjiElementInfos
+      .where((element) => element['entryId'] == entryId)
+      .toList();
+
   return GroupedWordResult(
     rubys: rubys,
     readingInfos: {
-      for (final rei in readingElementInfos)
-        rei['reading'] as String:
+      for (final rei in readingElementInfos_)
+        readingElementIdsToReading[rei['elementId'] as int]!:
             JMdictReadingInfo.fromId(rei['info'] as String),
     },
     kanjiInfos: {
-      for (final kei in kanjiElementInfos)
-        kei['reading'] as String: JMdictKanjiInfo.fromId(kei['info'] as String),
+      for (final kei in kanjiElementInfos_)
+        kanjiElementIdsToReading[kei['elementId'] as int]!:
+        JMdictKanjiInfo.fromId(kei['info'] as String),
     },
   );
 }