got thai working but this is a bit too specific i think

1 files changed, 13 insertions, 27 deletions

diff --git a/src/lib/db/prosodydb.ts b/src/lib/db/prosodydb.ts
index 1cfb8f0..9e76b8d 100644
--- a/src/lib/db/prosodydb.ts
+++ b/src/lib/db/prosodydb.ts
@@ -130,7 +130,7 @@ class DatabaseHandler {
            RETURNING rowid
           `,
         )
-        .get(onset.ipa, lang, onset.spelling) as number;
+        .get(onset.ipa, lang, onset.spelling) as { id: number };
       const medialId = this.db
         .query(
           `INSERT INTO medials(ipa, lang, text) VALUES(?, ?, ?)
@@ -139,7 +139,7 @@ class DatabaseHandler {
            RETURNING rowid
           `,
         )
-        .get(medial.ipa, lang, medial.spelling) as number;
+        .get(medial.ipa, lang, medial.spelling) as { id: number };
       const nucleusId = this.db
         .query(
           `INSERT INTO nucleus(ipa, lang, text) VALUES(?, ?, ?)
@@ -148,7 +148,7 @@ class DatabaseHandler {
          RETURNING rowid
         `,
         )
-        .get(nucleus.ipa, lang, nucleus.spelling) as number;
+        .get(nucleus.ipa, lang, nucleus.spelling) as { id: number };
       const codaId = this.db
         .query(
           `INSERT INTO codas(ipa, lang, text) VALUES(?, ?, ?)
@@ -157,7 +157,7 @@ class DatabaseHandler {
            RETURNING rowid
           `,
         )
-        .get(coda.ipa, lang, coda.spelling) as number;
+        .get(coda.ipa, lang, coda.spelling) as { id: number };
       const rhymeId = this.db
         .query(
           `INSERT INTO rhymes(ipa, lang, text) VALUES(?, ?, ?)
@@ -166,7 +166,7 @@ class DatabaseHandler {
          RETURNING rowid
         `,
         )
-        .get(rhyme.ipa, lang, rhyme.spelling) as number;
+        .get(rhyme.ipa, lang, rhyme.spelling) as { id: number };
       const toneId = this.db
         .query(
           `INSERT INTO tones(ipa, lang, name, nums) VALUES(?, ?, ?, ?)
@@ -175,39 +175,25 @@ class DatabaseHandler {
            RETURNING rowid
           `,
         )
-        .get(tone.letters, lang, tone.name, tone.numbers) as number;
+        .get(tone.letters, lang, tone.name, tone.numbers) as { id: number };
 
       const query = this.db.query(
-        `INSERT INTO syllables(lang, ipa, long, text, onset, medial, nucleus, coda, rhyme, tone, notes) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        `INSERT INTO syllables(lang, ipa, long, text, onset, medial, nucleus, coda, rhyme, tone, notes) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       );
-      // TODO need a dual structure here for IPA and orto
       const res = query.run(
         lang,
         ipa,
         long,
         text,
-        onsetId,
-        medialId,
-        nucleusId,
-        codaId,
-        rhymeId,
-        toneId,
+        onsetId.id,
+        medialId.id,
+        nucleusId.id,
+        codaId.id,
+        rhymeId.id,
+        toneId.id,
         notes,
       );
       const sylId = res.lastInsertRowid;
-      const ipaq = this.db.query(`
-        INSERT INTO syl_ipa(syl_id, ipa, onset, medial, nucleus, coda, rhyme, notes)
-        VALUES(?, ?, ?, ?, ?, ?, ?, ?)`);
-      ipaq.run(
-        sylId,
-        ipa,
-        onset.ipa,
-        medial.ipa,
-        nucleus.ipa,
-        coda.ipa,
-        rhyme.ipa,
-        null,
-      );
       //
       const res1 = this.db
         .query(