Merge pull request #66 from lae/fix/bulk-import-failure

Import terms with transactional adds instead of bulkAdd

1 files changed, 13 insertions, 14 deletions

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 70aeb0d7..4829356c 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -189,20 +189,19 @@ class Database {
         };
 
         const termsLoaded = (title, entries, total, current) => {
-            const rows = [];
-            for (const [expression, reading, tags, rules, score, ...glossary] of entries) {
-                rows.push({
-                    expression,
-                    reading,
-                    tags,
-                    rules,
-                    score,
-                    glossary,
-                    dictionary: title
-                });
-            }
-
-            return this.db.terms.bulkAdd(rows).then(() => {
+            return this.db.transaction('rw', this.db.terms, function() {
+                for (const [expression, reading, tags, rules, score, ...glossary] of entries) {
+                    this.db.terms.add({
+                        expression,
+                        reading,
+                        tags,
+                        rules,
+                        score,
+                        glossary,
+                        dictionary: title
+                    });
+                }
+            }).then(() => {
                 if (callback) {
                     callback(total, current);
                 }