Merge pull request #50 from zhongzhi107/master

Fix parsing empty strings
seegno · Jul 18, 2017 · a6ebb51 · a6ebb51
2 parents 0ecde4c + f469c2f
commit a6ebb51
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -144,4 +144,4 @@ exports.default = Bookshelf => {
   });
 };
 
-module.exports = exports['default'];
+module.exports = exports['default'];
diff --git a/src/index.js b/src/index.js
@@ -102,7 +102,7 @@ export default Bookshelf => {
         .then(model => {
           // Parse JSON columns.
           Object.keys(attributes).forEach(attribute => {
-            if (this.constructor.jsonColumns.includes(attribute)) {
+            if (this.constructor.jsonColumns.includes(attribute) && model.attributes[attribute]) {
               model.attributes[attribute] = JSON.parse(model.attributes[attribute]);
             }
           });

diff --git a/test/mysql/index.js b/test/mysql/index.js
@@ -140,6 +140,16 @@ describe('with MySQL client', () => {
       sinon.restore(ModelPrototype);
     });
 
+    it('should keep an empty string on update with `patch` option', async () => {
+      sinon.spy(ModelPrototype, 'save');
+
+      const model = await Model.forge().save();
+
+      await model.save({ foo: '' }, { patch: true });
+
+      model.get('foo').should.equal('');
+    });
+
     it('should keep a JSON value when updating with `patch` option', async () => {
       const model = await Model.forge().save();
 

diff --git a/test/sqlite/index.js b/test/sqlite/index.js
@@ -163,6 +163,16 @@ describe('with SQLite client', () => {
       sinon.restore(ModelPrototype);
     });
 
+    it('should keep an empty string on update with `patch` option', async () => {
+      sinon.spy(ModelPrototype, 'save');
+
+      const model = await Model.forge().save();
+
+      await model.save({ foo: '' }, { patch: true });
+
+      model.get('foo').should.equal('');
+    });
+
     it('should keep a JSON value when updating with `patch` option', async () => {
       const model = await Model.forge().save();