fix(mssql): dont use OUTPUT INSERTED.* for update without returning (#12260)

lib/dialects/abstract/query-generator.js

@@ -362,7 +362,7 @@ class QueryGenerator {
       }
       }
     }
     }
 
 
-    if (this._dialect.supports.returnValues && (this._dialect.supports.returnValues.output || options.returning)) {
+    if (this._dialect.supports.returnValues && options.returning) {
       const returnValues = this.generateReturnValues(attributes, options);
       const returnValues = this.generateReturnValues(attributes, options);
 
 
       suffix += returnValues.returningFragment;
       suffix += returnValues.returningFragment;

lib/dialects/abstract/query-interface.js

@@ -847,7 +847,7 @@ class QueryInterface {
 
 
   async update(instance, tableName, values, identifier, options) {
   async update(instance, tableName, values, identifier, options) {
     options = { ...options };
     options = { ...options };
-    options.hasTrigger = !!(instance && instance._modelOptions && instance._modelOptions.hasTrigger);
+    options.hasTrigger = instance && instance.constructor.options.hasTrigger;
 
 
     const sql = this.queryGenerator.updateQuery(tableName, values, identifier, options, instance.constructor.rawAttributes);
     const sql = this.queryGenerator.updateQuery(tableName, values, identifier, options, instance.constructor.rawAttributes);
 
 

lib/dialects/mssql/query.js

@@ -211,7 +211,7 @@ class Query extends AbstractQuery {
       return data[0];
       return data[0];
     }
     }
     if (this.isBulkUpdateQuery()) {
     if (this.isBulkUpdateQuery()) {
-      return data.length;
+      return rowCount;
     }
     }
     if (this.isBulkDeleteQuery()) {
     if (this.isBulkDeleteQuery()) {
       return data[0] && data[0].AFFECTEDROWS;
       return data[0] && data[0].AFFECTEDROWS;

lib/instance-validator.js

@@ -160,7 +160,7 @@ class InstanceValidator {
    */
    */
   async _customValidators() {
   async _customValidators() {
     const validators = [];
     const validators = [];
-    _.each(this.modelInstance._modelOptions.validate, (validator, validatorType) => {
+    _.each(this.modelInstance.constructor.options.validate, (validator, validatorType) => {
       if (this.options.skip.includes(validatorType)) {
       if (this.options.skip.includes(validatorType)) {
         return;
         return;
       }
       }

lib/model.js

@@ -105,7 +105,6 @@ class Model {
     this.dataValues = {};
     this.dataValues = {};
     this._previousDataValues = {};
     this._previousDataValues = {};
     this._changed = new Set();
     this._changed = new Set();
-    this._modelOptions = this.constructor.options;
     this._options = options || {};
     this._options = options || {};
 
 
     /**
     /**
@@ -3394,7 +3393,7 @@ class Model {
     }, {});
     }, {});
 
 
     if (_.size(where) === 0) {
     if (_.size(where) === 0) {
-      return this._modelOptions.whereCollection;
+      return this.constructor.options.whereCollection;
     }
     }
     const versionAttr = this.constructor._versionAttribute;
     const versionAttr = this.constructor._versionAttribute;
     if (checkVersion && versionAttr) {
     if (checkVersion && versionAttr) {

test/unit/sql/update.test.js

@@ -10,6 +10,30 @@ const Support   = require('../support'),
 
 
 describe(Support.getTestDialectTeaser('SQL'), () => {
 describe(Support.getTestDialectTeaser('SQL'), () => {
   describe('update', () => {
   describe('update', () => {
+    it('supports returning false', () => {
+      const User = Support.sequelize.define('user', {
+        username: {
+          type: DataTypes.STRING,
+          field: 'user_name'
+        }
+      }, {
+        timestamps: false
+      });
+
+      const options = {
+        returning: false
+      };
+      expectsql(sql.updateQuery(User.tableName, { user_name: 'triggertest' }, { id: 2 }, options, User.rawAttributes),
+        {
+          query: {
+            default: 'UPDATE [users] SET [user_name]=$1 WHERE [id] = $2'
+          },
+          bind: {
+            default: ['triggertest', 2]
+          }
+        });
+    });
+
     it('with temp table for trigger', () => {
     it('with temp table for trigger', () => {
       const User = Support.sequelize.define('user', {
       const User = Support.sequelize.define('user', {
         username: {
         username: {
@@ -38,8 +62,7 @@ describe(Support.getTestDialectTeaser('SQL'), () => {
         });
         });
     });
     });
 
 
-
-    it('Works with limit', () => {
+    it('works with limit', () => {
       const User = Support.sequelize.define('User', {
       const User = Support.sequelize.define('User', {
         username: {
         username: {
           type: DataTypes.STRING
           type: DataTypes.STRING
@@ -53,7 +76,7 @@ describe(Support.getTestDialectTeaser('SQL'), () => {
 
 
       expectsql(sql.updateQuery(User.tableName, { username: 'new.username' }, { username: 'username' }, { limit: 1 }), {
       expectsql(sql.updateQuery(User.tableName, { username: 'new.username' }, { username: 'username' }, { limit: 1 }), {
         query: {
         query: {
-          mssql: 'UPDATE TOP(1) [Users] SET [username]=$1 OUTPUT INSERTED.* WHERE [username] = $2',
+          mssql: 'UPDATE TOP(1) [Users] SET [username]=$1 WHERE [username] = $2',
           mariadb: 'UPDATE `Users` SET `username`=$1 WHERE `username` = $2 LIMIT 1',
           mariadb: 'UPDATE `Users` SET `username`=$1 WHERE `username` = $2 LIMIT 1',
           mysql: 'UPDATE `Users` SET `username`=$1 WHERE `username` = $2 LIMIT 1',
           mysql: 'UPDATE `Users` SET `username`=$1 WHERE `username` = $2 LIMIT 1',
           sqlite: 'UPDATE `Users` SET `username`=$1 WHERE rowid IN (SELECT rowid FROM `Users` WHERE `username` = $2 LIMIT 1)',
           sqlite: 'UPDATE `Users` SET `username`=$1 WHERE rowid IN (SELECT rowid FROM `Users` WHERE `username` = $2 LIMIT 1)',