Extra test and bug fix

Author: Polarisation

CHANGELOG.md

@@ -1,9 +1,13 @@
 # Changelog
 
-## v2.1.4
+## v2.1.5
 
 - Fix bug when import JSON is missing keys that are present as object store names (#25).
 
+## v2.1.4
+
+*Bad release - do not use.*
+
 ## v2.1.3
 
 - Fix bug when import JSON contains keys that are not present as object store names (#21).

index.js

@@ -81,9 +81,7 @@ function importFromJsonString(idbDatabase, jsonString, cb) {
     objectStoreNames.forEach((storeName) => {
       let count = 0;
 
-      // setting aux to an empty array if the key doesn't exists in the import object.
-      const dataToImport = importObject[storeName] || [];
-      const aux = Array.from(dataToImport);
+      const aux = Array.from(importObject[storeName] || []);
 
       if (importObject[storeName] && aux.length > 0) {
         aux.forEach((toAdd) => {
@@ -104,10 +102,12 @@ function importFromJsonString(idbDatabase, jsonString, cb) {
           };
         });
       } else {
-        delete importObject[storeName];
-        if (Object.keys(importObject).length === 0) {
-          // added all object stores
-          cb(null);
+        if (importObject[storeName]) {
+          delete importObject[storeName];
+          if (Object.keys(importObject).length === 0) {
+            // added all object stores
+            cb(null);
+          }
         }
       }
     });

test/test.js

@@ -121,6 +121,37 @@ describe('IDBExportImport', function() {
       assert.ifError(e);
     });
   });
+  it('Should ignore stores that are not present when importing', function(done) {
+    const db = new Dexie('MyDB', {indexedDB: fakeIndexedDB});
+    db.version(1).stores({
+      things: 'id++, thing_name, thing_description',
+    });
+    db.open().catch(function(e) {
+      console.error('Could not connect. ' + e);
+    });
+
+    const thingsToAdd = [{thing_name: 'First thing', thing_description: 'This is the first thing'},
+      {thing_name: 'Second thing', thing_description: 'This is the second thing'}];
+    db.things.bulkAdd(thingsToAdd).then(function() {
+      const idbDB = db.backendDB(); // get native IDBDatabase object from Dexie wrapper
+      IDBExportImport.importFromJsonString(idbDB, '{"other":[' +
+        '{"thing_name":"First thing","thing_description":"This is the first thing","id":1},' +
+        '{"thing_name":"Second thing","thing_description":"This is the second thing","id":2}]}', function(err) {
+        assert.ifError(err);
+        console.log('Imported data successfully');
+
+        IDBExportImport.clearDatabase(idbDB, () => {
+          IDBExportImport.importFromJsonString(idbDB, '{"other": []}', function(err) {
+            assert.ifError(err);
+            console.log('Imported data successfully');
+            done();
+          });
+        });
+      });
+    }).catch(Dexie.BulkError, function(e) {
+      assert.ifError(e);
+    });
+  });
   it('Should import and export the database with empty keys', function(done) {
     const db = new Dexie('myDB', {indexedDB: fakeIndexedDB});
     db.version(1).stores({