Consistently use senseId name everywhere

lib/_data_ingestion/jmdict/objects.dart

@@ -161,7 +161,7 @@ class XRef {
 }
 
 class Sense extends SQLWritable {
-  final int id;
+  final int senseId;
   final int orderNum;
   final List<XRefParts> antonyms;
   final List<String> dialects;
@@ -176,7 +176,7 @@ class Sense extends SQLWritable {
   final List<XRefParts> seeAlso;
 
   const Sense({
-    required this.id,
+    required this.senseId,
     required this.orderNum,
     this.antonyms = const [],
     this.dialects = const [],
@@ -193,7 +193,7 @@ class Sense extends SQLWritable {
 
   @override
   Map<String, Object?> get sqlValue => {
-        'id': id,
+        'senseId': senseId,
         'orderNum': orderNum,
       };
 

lib/_data_ingestion/jmdict/seed_data.dart

@@ -132,43 +132,43 @@ Future<void> seedJMDictData(List<Entry> entries, Database db) async {
       for (final d in s.dialects) {
         b.insert(
           JMdictTableNames.senseDialect,
-          {'senseId': s.id, 'dialect': d},
+          {'senseId': s.senseId, 'dialect': d},
         );
       }
       for (final f in s.fields) {
-        b.insert(JMdictTableNames.senseField, {'senseId': s.id, 'field': f});
+        b.insert(JMdictTableNames.senseField, {'senseId': s.senseId, 'field': f});
       }
       for (final i in s.info) {
-        b.insert(JMdictTableNames.senseInfo, {'senseId': s.id, 'info': i});
+        b.insert(JMdictTableNames.senseInfo, {'senseId': s.senseId, 'info': i});
       }
       for (final m in s.misc) {
-        b.insert(JMdictTableNames.senseMisc, {'senseId': s.id, 'misc': m});
+        b.insert(JMdictTableNames.senseMisc, {'senseId': s.senseId, 'misc': m});
       }
       for (final p in s.pos) {
-        b.insert(JMdictTableNames.sensePOS, {'senseId': s.id, 'pos': p});
+        b.insert(JMdictTableNames.sensePOS, {'senseId': s.senseId, 'pos': p});
       }
       for (final rk in s.restrictedToKanji) {
         b.insert(
           JMdictTableNames.senseRestrictedToKanji,
-          {'entryId': e.entryId, 'senseId': s.id, 'kanji': rk},
+          {'entryId': e.entryId, 'senseId': s.senseId, 'kanji': rk},
         );
       }
       for (final rr in s.restrictedToReading) {
         b.insert(
           JMdictTableNames.senseRestrictedToReading,
-          {'entryId': e.entryId, 'senseId': s.id, 'reading': rr},
+          {'entryId': e.entryId, 'senseId': s.senseId, 'reading': rr},
         );
       }
       for (final ls in s.languageSource) {
         b.insert(
           JMdictTableNames.senseLanguageSource,
-          ls.sqlValue..addAll({'senseId': s.id}),
+          ls.sqlValue..addAll({'senseId': s.senseId}),
         );
       }
       for (final g in s.glossary) {
         b.insert(
           JMdictTableNames.senseGlossary,
-          g.sqlValue..addAll({'senseId': s.id}),
+          g.sqlValue..addAll({'senseId': s.senseId}),
         );
       }
     }
@@ -214,7 +214,7 @@ Future<void> seedJMDictData(List<Entry> entries, Database db) async {
         b.insert(
           JMdictTableNames.senseSeeAlso,
           {
-            'senseId': s.id,
+            'senseId': s.senseId,
             'xrefEntryId': resolvedEntry.entry.entryId,
             'seeAlsoKanji': xref.kanjiRef,
             'seeAlsoReading': xref.readingRef,
@@ -232,7 +232,7 @@ Future<void> seedJMDictData(List<Entry> entries, Database db) async {
         );
 
         b.insert(JMdictTableNames.senseAntonyms, {
-          'senseId': s.id,
+          'senseId': s.senseId,
           'xrefEntryId': resolvedEntry.entry.entryId,
           'antonymKanji': ant.kanjiRef,
           'antonymReading': ant.readingRef,

lib/_data_ingestion/jmdict/xml_parser.dart

@@ -127,7 +127,7 @@ List<Entry> parseJMDictData(XmlElement root) {
     for (final (orderNum, sense) in entry.findElements('sense').indexed) {
       senseId++;
       final result = Sense(
-        id: senseId,
+        senseId: senseId,
         orderNum: orderNum + 1,
         restrictedToKanji:
             sense.findElements('stagk').map((e) => e.innerText).toList(),

lib/_data_ingestion/tanos-jlpt/resolve.dart

@@ -37,7 +37,7 @@ Future<List<(int, String)>> _findSenseCandidates(
     db
         .rawQuery('SELECT entryId, phrase '
             'FROM ${JMdictTableNames.senseGlossary} '
-            'JOIN ${JMdictTableNames.sense} ON ${JMdictTableNames.senseGlossary}.senseId = ${JMdictTableNames.sense}.id '
+            'JOIN ${JMdictTableNames.sense} USING (senseId)'
             'WHERE phrase IN (${word.meanings.map((e) => escapeStringValue(e)).join(',')})')
         .then((rows) => rows
             .map((row) => (row['entryId'] as int, row['phrase'] as String))

lib/search/word_search.dart

@@ -81,7 +81,7 @@ Future<List<WordSearchResult>?> searchWordWithDbConnection(
 
   // Sense queries
 
-  final senseIds = senses.map((element) => element['id'] as int).toList();
+  final senseIds = senses.map((sense) => sense['senseId'] as int).toList();
 
   late final List<Map<String, Object?>> senseAntonyms;
   final Future<List<Map<String, Object?>>> senseAntonyms_query =
@@ -450,7 +450,7 @@ List<WordSearchSense> _regroup_senses({
 
   final List<WordSearchSense> result = [];
   for (final sense in senses) {
-    final int senseId = sense['id'] as int;
+    final int senseId = sense['senseId'] as int;
 
     final antonyms = groupedSenseAntonyms[senseId] ?? [];
     final dialects = groupedSenseDialects[senseId] ?? [];