Fixed: jsonb/json update or softdelete (#7499)

changelog.md

@@ -67,6 +67,7 @@
 - [ADDED] Added support for associations aliases in orders and groups. [#7425](https://github.com/sequelize/sequelize/issues/7425)
 - [ADDED] Added support for associations aliases in orders and groups. [#7425](https://github.com/sequelize/sequelize/issues/7425)
 - [REMOVED] Removes support for `{raw: 'injection goes here'}` for order and group. [#7188](https://github.com/sequelize/sequelize/issues/7188)
 - [REMOVED] Removes support for `{raw: 'injection goes here'}` for order and group. [#7188](https://github.com/sequelize/sequelize/issues/7188)
 - [FIXED] `showIndex` breaks with newline characters [#7492](https://github.com/sequelize/sequelize/pull/7492)
 - [FIXED] `showIndex` breaks with newline characters [#7492](https://github.com/sequelize/sequelize/pull/7492)
+- [FIXED] Update or soft delete breaks when querying on `JSON/JSONB` [#7376](https://github.com/sequelize/sequelize/issues/7376) [#7400](https://github.com/sequelize/sequelize/issues/7400) [#7444](https://github.com/sequelize/sequelize/issues/7444)
 
 
 ## BC breaks:
 ## BC breaks:
 - Model.validate instance method now runs validation hooks by default. Previously you needed to pass { hooks: true }. You can override this behavior by passing { hooks: false }
 - Model.validate instance method now runs validation hooks by default. Previously you needed to pass { hooks: true }. You can override this behavior by passing { hooks: false }

lib/dialects/abstract/query-generator.js

@@ -362,7 +362,7 @@ const QueryGenerator = {
       table: this.quoteTable(tableName),
       table: this.quoteTable(tableName),
       values: values.join(','),
       values: values.join(','),
       output: outputFragment,
       output: outputFragment,
-      where: this.whereQuery(where),
+      where: this.whereQuery(where, options),
       tmpTable
       tmpTable
     };
     };
 
 
@@ -1930,7 +1930,7 @@ const QueryGenerator = {
     let outerBinding;
     let outerBinding;
     let comparator = '=';
     let comparator = '=';
     let field = options.field || options.model && options.model.rawAttributes && options.model.rawAttributes[key] || options.model && options.model.fieldRawAttributesMap && options.model.fieldRawAttributesMap[key];
     let field = options.field || options.model && options.model.rawAttributes && options.model.rawAttributes[key] || options.model && options.model.fieldRawAttributesMap && options.model.fieldRawAttributesMap[key];
-    let fieldType = options.type || field && field.type;
+    let fieldType = field && field.type || options.type;
 
 
     if (key && typeof key === 'string' && key.indexOf('.') !== -1 && options.model) {
     if (key && typeof key === 'string' && key.indexOf('.') !== -1 && options.model) {
       if (options.model.rawAttributes[key.split('.')[0]] && options.model.rawAttributes[key.split('.')[0]].type instanceof DataTypes.JSON) {
       if (options.model.rawAttributes[key.split('.')[0]] && options.model.rawAttributes[key.split('.')[0]].type instanceof DataTypes.JSON) {

lib/dialects/sqlite/query-generator.js

@@ -241,7 +241,7 @@ const QueryGenerator = {
       values.push(this.quoteIdentifier(key) + '=' + this.escape(value, modelAttributeMap && modelAttributeMap[key] || undefined, { context: 'UPDATE' }));
       values.push(this.quoteIdentifier(key) + '=' + this.escape(value, modelAttributeMap && modelAttributeMap[key] || undefined, { context: 'UPDATE' }));
     }
     }
 
 
-    return `UPDATE ${this.quoteTable(tableName)} SET ${values.join(',')} ${this.whereQuery(where)}`;
+    return `UPDATE ${this.quoteTable(tableName)} SET ${values.join(',')} ${this.whereQuery(where, options)}`;
   },
   },
 
 
   deleteQuery(tableName, where, options, model) {
   deleteQuery(tableName, where, options, model) {

test/integration/model/json.test.js

@@ -56,6 +56,7 @@ describe(Support.getTestDialectTeaser('Model'), () => {
         });
         });
       }
       }
 
 
+      describe('create', () => {
         it('should create an instance with JSON data', function() {
         it('should create an instance with JSON data', function() {
           return this.Event.create({
           return this.Event.create({
             data: {
             data: {
@@ -79,6 +80,96 @@ describe(Support.getTestDialectTeaser('Model'), () => {
             });
             });
           });
           });
         });
         });
+      });
+
+      describe('update', () => {
+        it('should update with JSON column (dot notation)', function() {
+          return this.Event.bulkCreate([{
+            id: 1,
+            data: {
+              name: {
+                first: 'Homer',
+                last: 'Simpson'
+              },
+              employment: 'Nuclear Safety Inspector'
+            }
+          }, {
+            id: 2,
+            data: {
+              name: {
+                first: 'Rick',
+                last: 'Sanchez'
+              },
+              employment: 'Multiverse Scientist'
+            }
+          }]).then(() => this.Event.update({
+            'data': {
+              name: {
+                first: 'Rick',
+                last: 'Sanchez'
+              },
+              employment: 'Galactic Fed Prisioner'
+            }
+          }, {
+            where: {
+              'data.name.first': 'Rick'
+            }
+          })).then(() => this.Event.findById(2)).then(event => {
+            expect(event.get('data')).to.eql({
+              name: {
+                first: 'Rick',
+                last: 'Sanchez'
+              },
+              employment: 'Galactic Fed Prisioner'
+            });
+          });
+        });
+
+        it('should update with JSON column (JSON notation)', function() {
+          return this.Event.bulkCreate([{
+            id: 1,
+            data: {
+              name: {
+                first: 'Homer',
+                last: 'Simpson'
+              },
+              employment: 'Nuclear Safety Inspector'
+            }
+          }, {
+            id: 2,
+            data: {
+              name: {
+                first: 'Rick',
+                last: 'Sanchez'
+              },
+              employment: 'Multiverse Scientist'
+            }
+          }]).then(() => this.Event.update({
+            'data': {
+              name: {
+                first: 'Rick',
+                last: 'Sanchez'
+              },
+              employment: 'Galactic Fed Prisioner'
+            }
+          }, {
+            where: {
+              data: {
+                name: {
+                  first: 'Rick'
+                }
+              }
+            }
+          })).then(() => this.Event.findById(2)).then(event => {
+            expect(event.get('data')).to.eql({
+              name: {
+                first: 'Rick',
+                last: 'Sanchez'
+              },
+              employment: 'Galactic Fed Prisioner'
+            });
+          });
+        });
 
 
         it('should update an instance with JSON data', function() {
         it('should update an instance with JSON data', function() {
           return this.Event.create({
           return this.Event.create({
@@ -113,7 +204,9 @@ describe(Support.getTestDialectTeaser('Model'), () => {
             });
             });
           });
           });
         });
         });
+      });
 
 
+      describe('find', () => {
         it('should be possible to query a nested value', function() {
         it('should be possible to query a nested value', function() {
           return Promise.join(
           return Promise.join(
             this.Event.create({
             this.Event.create({
@@ -306,7 +399,9 @@ describe(Support.getTestDialectTeaser('Model'), () => {
             });
             });
           });
           });
         });
         });
+      });
 
 
+      describe('destroy', () => {
         it('should be possible to destroy with where', function() {
         it('should be possible to destroy with where', function() {
           const conditionSearch = {
           const conditionSearch = {
             where: {
             where: {
@@ -352,6 +447,7 @@ describe(Support.getTestDialectTeaser('Model'), () => {
             return expect(this.Event.findAll(conditionSearch)).to.eventually.have.length(0);
             return expect(this.Event.findAll(conditionSearch)).to.eventually.have.length(0);
           });
           });
         });
         });
+      });
 
 
       describe('sql injection attacks', () => {
       describe('sql injection attacks', () => {
         beforeEach(function() {
         beforeEach(function() {

test/integration/model/paranoid.test.js

@@ -5,6 +5,7 @@ const DataTypes = require(__dirname + '/../../../lib/data-types');
 const chai = require('chai');
 const chai = require('chai');
 const expect = chai.expect;
 const expect = chai.expect;
 const sinon = require('sinon');
 const sinon = require('sinon');
+const current = Support.sequelize;
 
 
 describe(Support.getTestDialectTeaser('Model'), () => {
 describe(Support.getTestDialectTeaser('Model'), () => {
   describe('paranoid', () => {
   describe('paranoid', () => {
@@ -100,5 +101,62 @@ describe(Support.getTestDialectTeaser('Model'), () => {
           expect(count).to.be.equal(1);
           expect(count).to.be.equal(1);
         });
         });
     });
     });
+
+    if (current.dialect.supports.JSON) {
+      describe('JSONB', () => {
+        before(function() {
+          this.Model = this.sequelize.define('Model', {
+            name: {
+              type: DataTypes.STRING
+            },
+            data: {
+              type: DataTypes.JSONB
+            },
+            deletedAt: {
+              type: DataTypes.DATE,
+              allowNull: true,
+              field: 'deleted_at'
+            }
+          }, {
+            paranoid: true,
+            timestamps: true,
+            deletedAt: 'deletedAt'
+          });
+        });
+
+        beforeEach(function() {
+          return this.Model.sync({ force: true });
+        });
+
+        it('should soft delete with JSONB condition', function() {
+          return this.Model.bulkCreate([{
+            name: 'One',
+            data: {
+              field: {
+                deep: true
+              }
+            }
+          }, {
+            name: 'Two',
+            data: {
+              field: {
+                deep: false
+              }
+            }
+          }]).then(() => this.Model.destroy({
+            where: {
+              data: {
+                field: {
+                  deep: true
+                }
+              }
+            }
+          })).then(() => this.Model.findAll()).then(records => {
+            expect(records.length).to.equal(1);
+            expect(records[0].get('name')).to.equal('Two');
+          });
+        });
+      });
+    }
   });
   });
 });
 });