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

jmdict: infer entryId from element ids

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2026-04-08 17:37:52 +09:00
parent 99218a6987
commit f6de8680ad
3 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/_data_ingestion/jmdict/seed_data.dart
View File

@@ -88,10 +88,7 @@ Future<void> seedJMDictData(List<Entry> entries, Database db) async {
b.insert(JMdictTableNames.entry, e.sqlValue);
for (final k in e.kanji) {
b.insert(
JMdictTableNames.kanjiElement,
k.sqlValue..addAll({'entryId': e.entryId}),
);
b.insert(JMdictTableNames.kanjiElement, k.sqlValue);
for (final i in k.info) {
b.insert(JMdictTableNames.kanjiInfo, {
@@ -102,10 +99,7 @@ Future<void> seedJMDictData(List<Entry> entries, Database db) async {
}
for (final r in e.readings) {
b.insert(
JMdictTableNames.readingElement,
r.sqlValue..addAll({'entryId': e.entryId}),
);
b.insert(JMdictTableNames.readingElement, r.sqlValue);
for (final i in r.info) {
b.insert(JMdictTableNames.readingInfo, {
@@ -129,10 +123,7 @@ Future<void> seedJMDictData(List<Entry> entries, Database db) async {
for (final e in entries) {
for (final s in e.senses) {
b.insert(
JMdictTableNames.sense,
s.sqlValue..addAll({'entryId': e.entryId}),
);
b.insert(JMdictTableNames.sense, s.sqlValue);
for (final d in s.dialects) {
b.insert(JMdictTableNames.senseDialect, {
'senseId': s.senseId,
@@ -156,14 +147,12 @@ Future<void> seedJMDictData(List<Entry> entries, Database db) async {
}
for (final rk in s.restrictedToKanji) {
b.insert(JMdictTableNames.senseRestrictedToKanji, {
'entryId': e.entryId,
'senseId': s.senseId,
'kanji': rk,
});
}
for (final rr in s.restrictedToReading) {
b.insert(JMdictTableNames.senseRestrictedToReading, {
'entryId': e.entryId,
'senseId': s.senseId,
'reading': rr,
});

23
migrations/0001_JMDict.sql
View File

@@ -53,14 +53,15 @@ CREATE TABLE "JMdict_Entry" (
CREATE TABLE "JMdict_KanjiElement" (
"elementId" INTEGER PRIMARY KEY,
"orderNum" INTEGER GENERATED ALWAYS AS ("elementId" % 100) VIRTUAL,
"entryId" INTEGER NOT NULL REFERENCES "JMdict_Entry"("entryId"),
"entryId" INTEGER NOT NULL GENERATED ALWAYS AS ("elementId" / 100) STORED,
"orderNum" INTEGER NOT NULL GENERATED ALWAYS AS ("elementId" % 100) VIRTUAL,
"reading" TEXT NOT NULL,
"news" INTEGER CHECK ("news" BETWEEN 1 AND 2),
"ichi" INTEGER CHECK ("ichi" BETWEEN 1 AND 2),
"spec" INTEGER CHECK ("spec" BETWEEN 1 AND 2),
"gai" INTEGER CHECK ("gai" BETWEEN 1 AND 2),
"nf" INTEGER CHECK ("nf" BETWEEN 1 AND 48),
FOREIGN KEY ("entryId") REFERENCES "JMdict_Entry"("entryId"),
UNIQUE("entryId", "reading")
) WITHOUT ROWID;
@@ -76,8 +77,8 @@ CREATE TABLE "JMdict_KanjiElementInfo" (
CREATE TABLE "JMdict_ReadingElement" (
"elementId" INTEGER PRIMARY KEY,
"orderNum" INTEGER GENERATED ALWAYS AS ("elementId" % 100) VIRTUAL,
"entryId" INTEGER NOT NULL REFERENCES "JMdict_Entry"("entryId"),
"entryId" INTEGER NOT NULL GENERATED ALWAYS AS ("elementId" / 100) STORED,
"orderNum" INTEGER NOT NULL GENERATED ALWAYS AS ("elementId" % 100) VIRTUAL,
"reading" TEXT NOT NULL,
"readingDoesNotMatchKanji" BOOLEAN NOT NULL DEFAULT FALSE,
"news" INTEGER CHECK ("news" BETWEEN 1 AND 2),
@@ -85,6 +86,7 @@ CREATE TABLE "JMdict_ReadingElement" (
"spec" INTEGER CHECK ("spec" BETWEEN 1 AND 2),
"gai" INTEGER CHECK ("gai" BETWEEN 1 AND 2),
"nf" INTEGER CHECK ("nf" BETWEEN 1 AND 48),
FOREIGN KEY ("entryId") REFERENCES "JMdict_Entry"("entryId"),
UNIQUE("entryId", "reading")
) WITHOUT ROWID;
@@ -106,25 +108,26 @@ CREATE TABLE "JMdict_ReadingElementInfo" (
CREATE TABLE "JMdict_Sense" (
"senseId" INTEGER PRIMARY KEY,
"orderNum" INTEGER GENERATED ALWAYS AS ("senseId" % 100) VIRTUAL,
"entryId" INTEGER NOT NULL REFERENCES "JMdict_Entry"("entryId"),
"entryId" INTEGER NOT NULL GENERATED ALWAYS AS ("senseId" / 100) STORED,
"orderNum" INTEGER NOT NULL GENERATED ALWAYS AS ("senseId" % 100) VIRTUAL,
FOREIGN KEY ("entryId") REFERENCES "JMdict_Entry"("entryId"),
UNIQUE("entryId", "orderNum")
);
CREATE TABLE "JMdict_SenseRestrictedToKanji" (
"entryId" INTEGER NOT NULL,
"senseId" INTEGER NOT NULL REFERENCES "JMdict_Sense"("senseId"),
"kanji" TEXT NOT NULL,
"entryId" INTEGER NOT NULL GENERATED ALWAYS AS ("senseId" / 100) VIRTUAL,
FOREIGN KEY ("entryId", "kanji") REFERENCES "JMdict_KanjiElement"("entryId", "reading"),
PRIMARY KEY ("entryId", "senseId", "kanji")
PRIMARY KEY ("senseId", "kanji")
) WITHOUT ROWID;
CREATE TABLE "JMdict_SenseRestrictedToReading" (
"entryId" INTEGER NOT NULL,
"senseId" INTEGER NOT NULL REFERENCES "JMdict_Sense"("senseId"),
"reading" TEXT NOT NULL,
"entryId" INTEGER NOT NULL GENERATED ALWAYS AS ("senseId" / 100) VIRTUAL,
FOREIGN KEY ("entryId", "reading") REFERENCES "JMdict_ReadingElement"("entryId", "reading"),
PRIMARY KEY ("entryId", "senseId", "reading")
PRIMARY KEY ("senseId", "reading")
) WITHOUT ROWID;
-- In order to add xrefs, you will need to have added the entry to xref to.

11
migrations/0005_JMDict_search_index_tables.sql
View File

@@ -1,9 +1,12 @@
CREATE TABLE "JMdict_EntryScore" (
"type" CHAR(1) NOT NULL CHECK ("type" IN ('r', 'k')),
"entryId" INTEGER NOT NULL REFERENCES "JMdict_Entry"("entryId"),
"elementId" INTEGER NOT NULL,
"score" INTEGER NOT NULL DEFAULT 0,
"common" BOOLEAN NOT NULL DEFAULT FALSE,
"entryId" INTEGER NOT NULL GENERATED ALWAYS AS ("elementId" / 100) STORED,
FOREIGN KEY ("entryId") REFERENCES "JMdict_Entry"("entryId"),
PRIMARY KEY ("type", "elementId")
) WITHOUT ROWID;
@@ -97,12 +100,11 @@ AFTER INSERT ON "JMdict_ReadingElement"
BEGIN
INSERT INTO "JMdict_EntryScore" (
"type",
"entryId",
"elementId",
"score",
"common"
)
SELECT "type", "entryId", "elementId", "score", "common"
SELECT "type", "elementId", "score", "common"
FROM "JMdict_EntryScoreView_Reading"
WHERE "elementId" = NEW."elementId";
END;
@@ -134,12 +136,11 @@ AFTER INSERT ON "JMdict_KanjiElement"
BEGIN
INSERT INTO "JMdict_EntryScore" (
"type",
"entryId",
"elementId",
"score",
"common"
)
SELECT "type", "entryId", "elementId", "score", "common"
SELECT "type", "elementId", "score", "common"
FROM "JMdict_EntryScoreView_Kanji"
WHERE "elementId" = NEW."elementId";
END;