mugiten/jadb
2
0
Fork 0
Code Issues 45 Pull Requests Actions Activity

JMdict_BaseAndFurigana: move isFirst column out of dart query

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2025-05-22 19:57:46 +02:00
parent fdd15df344
commit 03a8e11d91
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/search/word_search/data_query.dart
View File

@@ -120,9 +120,7 @@ Future<LinearWordQueryData> fetchLinearWordQueryData(
ON "${JMdictTableNames.senseAntonyms}"."xrefEntryId" = "JMdict_BaseAndFurigana"."entryId"
WHERE
"senseId" IN (${List.filled(senseIds.length, '?').join(',')})
AND COALESCE("JMdict_BaseAndFurigana"."kanjiOrderNum", 1)
+ "JMdict_BaseAndFurigana"."readingOrderNum"
= 2
AND "JMdict_BaseAndFurigana"."isFirst"
ORDER BY
"${JMdictTableNames.senseAntonyms}"."senseId",
"${JMdictTableNames.senseAntonyms}"."xrefEntryId"
@@ -213,9 +211,7 @@ Future<LinearWordQueryData> fetchLinearWordQueryData(
ON "${JMdictTableNames.senseSeeAlso}"."xrefEntryId" = "JMdict_BaseAndFurigana"."entryId"
WHERE
"senseId" IN (${List.filled(senseIds.length, '?').join(',')})
AND COALESCE("JMdict_BaseAndFurigana"."kanjiOrderNum", 1)
+ "JMdict_BaseAndFurigana"."readingOrderNum"
= 2
AND "JMdict_BaseAndFurigana"."isFirst"
ORDER BY
"${JMdictTableNames.senseSeeAlso}"."senseId",
"${JMdictTableNames.senseSeeAlso}"."xrefEntryId"

6
migrations/0010_Views.sql
View File

@@ -14,7 +14,7 @@ SELECT
FROM "JMdict_SenseGlossary" JOIN "JMdict_Sense" USING("senseId");
CREATE VIEW "JMdict_BaseAndFurigana"("entryId", "base", "furigana", "kanjiOrderNum", "readingOrderNum")
CREATE VIEW "JMdict_BaseAndFurigana"("entryId", "base", "furigana", "isFirst", "kanjiOrderNum", "readingOrderNum")
AS
SELECT
"JMdict_Entry"."entryId" AS "entryId",
@@ -32,6 +32,10 @@ SELECT
THEN "JMdict_ReadingElement"."reading"
ELSE NULL
END AS "furigana",
COALESCE("JMdict_KanjiElement"."orderNum", 1)
+ "JMdict_ReadingElement"."orderNum"
= 2
AS "isFirst",
"JMdict_KanjiElement"."orderNum" AS "kanjiOrderNum",
"JMdict_ReadingElement"."orderNum" AS "readingOrderNum"
FROM "JMdict_Entry"