Fix stringifying null values with patch option

seegno · Sep 19, 2016 · 0c5d78d · 0c5d78d
1 parent 710f8a6
commit 0c5d78d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -83,7 +83,7 @@ export default Bookshelf => {
 
       // Stringify JSON columns.
       Object.keys(attributes).forEach(attribute => {
-        if (this.jsonColumns.includes(attribute)) {
+        if (this.jsonColumns.includes(attribute) && attributes[attribute]) {
           attributes[attribute] = JSON.stringify(attributes[attribute]);
         }
       });

diff --git a/test/postgres/index.js b/test/postgres/index.js
@@ -130,6 +130,19 @@ describe('with PostgreSQL client', () => {
       should(model.get('foo')).be.undefined();
     });
 
+    it('should not stringify null values on update with patch option', async () => {
+      sinon.spy(ModelPrototype, 'save');
+
+      const model = await Model.forge().save();
+
+      await model.save({ foo: null }, { patch: true });
+
+      ModelPrototype.save.callCount.should.equal(2);
+      ModelPrototype.save.secondCall.args[0].should.eql({ foo: null });
+
+      sinon.restore(ModelPrototype);
+    });
+
     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
@@ -142,6 +142,19 @@ describe('with SQLite client', () => {
       should(fetched.get('foo')).be.null();
     });
 
+    it('should not stringify null values on update with patch option', async () => {
+      sinon.spy(ModelPrototype, 'save');
+
+      const model = await Model.forge().save();
+
+      await model.save({ foo: null }, { patch: true });
+
+      ModelPrototype.save.callCount.should.equal(2);
+      ModelPrototype.save.secondCall.args[0].should.eql({ foo: null });
+
+      sinon.restore(ModelPrototype);
+    });
+
     it('should keep a json value when updating with `patch` option', async () => {
       const model = await Model.forge().save();