fix(sql/update): use new whereQuery in updateQuery, closes #3113

Mick Hansen
Commit 31b9c0ba authored Feb 12, 2015 by Mick Hansen
Showing with 12 additions and 8 deletions
changelog.md
lib/dialects/abstract/query-generator.js
test/integration/associations/has-many.test.js
test/integration/dialects/mysql/query-generator.test.js
test/integration/dialects/postgres/query-generator.test.js
test/integration/dialects/sqlite/query-generator.test.js
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,7 @@
 - [BUG] Fixed regression with `DataTypes.ARRAY(DataTypes.STRING(length))` [#3106](https://github.com/sequelize/sequelize/issues/3106)
 - [BUG] Fixed regression where `.or([{key: value}, {key: value, key2: value}])` would result in 3 `A OR B OR C` rather than `A OR (B AND C)` [#3107](https://github.com/sequelize/sequelize/issues/3107)
 - [BUG] Fixed regression with `DataTypes.DECIMAL(10)` resulting in `10, undefined` [#3119](https://github.com/sequelize/sequelize/issues/3119)
+- [BUG] Fixed issue with dangling `WHERE ` query on `Model.update(values, {where: {}})` [#3113](https://github.com/sequelize/sequelize/issues/3113)
 # 2.0.1
 - [BUG] Fixed issue with empty `include.where`

--- a/lib/dialects/abstract/query-generator.js
+++ b/lib/dialects/abstract/query-generator.js
@@ -300,7 +300,7 @@ module.exports = (function() {
        , outputFragment
        , modelAttributeMap = {};
-      query = 'UPDATE <%= table %> SET <%= values %><%= output %> WHERE <%= where %>';
+      query = 'UPDATE <%= table %> SET <%= values %><%= output %> <%= where %>';
      if (this._dialect.supports['LIMIT ON UPDATE'] && options.limit) {
        query += ' LIMIT ' + this.escape(options.limit) + ' ';
@@ -340,14 +340,14 @@ module.exports = (function() {
        table: this.quoteTable(tableName),
        values: values.join(','),
        output: outputFragment,
-        where: this.getWhereConditions(where)
+        where: this.whereQuery(where)
      };
      if (values.length === 0) {
        return '';
      }
-      return Utils._.template(query)(replacements);
+      return Utils._.template(query)(replacements).trim();
    },
    /*
@@ -1748,6 +1748,9 @@ module.exports = (function() {
        value = this.escape(value, field);
      }
+      // Really retarded BC^TM
+      if (key === undefined) key = 'id';
      key = this.quoteIdentifier(key);
      if (options.prefix) {

--- a/test/integration/associations/has-many.test.js
+++ b/test/integration/associations/has-many.test.js
@@ -2363,7 +2363,7 @@ describe(Support.getTestDialectTeaser('HasMany'), function() {
            // `WHERE` clause
            var tableName = user.QueryInterface.QueryGenerator.addSchema(user.Model);
-            return user.QueryInterface.update(user, tableName, {id: 999}, user.id);
+            return user.QueryInterface.update(user, tableName, {id: 999}, {id: user.id});
          }).then(function() {
            return Task.findAll();
          }).then(function(tasks) {

--- a/test/integration/dialects/mysql/query-generator.test.js
+++ b/test/integration/dialects/mysql/query-generator.test.js
@@ -438,7 +438,7 @@ if (Support.dialectIsMySQL()) {
          arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, {id: 2}],
          expectation: "UPDATE `myTable` SET `name`='foo',`birthday`='2011-03-27 10:01:55' WHERE `id` = 2"
        }, {
-          arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, 2],
+          arguments: ['myTable', {name: 'foo', birthday: new Date(Date.UTC(2011, 2, 27, 10, 1, 55))}, {id: 2}],
          expectation: "UPDATE `myTable` SET `name`='foo',`birthday`='2011-03-27 10:01:55' WHERE `id` = 2"
        }, {
          arguments: ['myTable', {bar: 2}, {name: 'foo'}],

--- a/test/integration/dialects/postgres/query-generator.test.js
+++ b/test/integration/dialects/postgres/query-generator.test.js
@@ -687,7 +687,7 @@ if (dialect.match(/^postgres/)) {
          arguments: ['myTable', {name: 'foo', birthday: moment('2011-03-27 10:01:55 +0000', 'YYYY-MM-DD HH:mm:ss Z').toDate()}, {id: 2}],
          expectation: "UPDATE \"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.000 +00:00' WHERE \"id\" = 2"
        }, {
-          arguments: ['myTable', {name: 'foo', birthday: moment('2011-03-27 10:01:55 +0000', 'YYYY-MM-DD HH:mm:ss Z').toDate()}, 2],
+          arguments: ['myTable', {name: 'foo', birthday: moment('2011-03-27 10:01:55 +0000', 'YYYY-MM-DD HH:mm:ss Z').toDate()}, {id: 2}],
          expectation: "UPDATE \"myTable\" SET \"name\"='foo',\"birthday\"='2011-03-27 10:01:55.000 +00:00' WHERE \"id\" = 2"
        }, {
          arguments: ['myTable', {bar: 2}, {name: 'foo'}],
@@ -746,7 +746,7 @@ if (dialect.match(/^postgres/)) {
          expectation: "UPDATE myTable SET name='foo',birthday='2011-03-27 10:01:55.000 +00:00' WHERE id = 2",
          context: {options: {quoteIdentifiers: false}}
        }, {
-          arguments: ['myTable', {name: 'foo', birthday: moment('2011-03-27 10:01:55 +0000', 'YYYY-MM-DD HH:mm:ss Z').toDate()}, 2],
+          arguments: ['myTable', {name: 'foo', birthday: moment('2011-03-27 10:01:55 +0000', 'YYYY-MM-DD HH:mm:ss Z').toDate()}, {id: 2}],
          expectation: "UPDATE myTable SET name='foo',birthday='2011-03-27 10:01:55.000 +00:00' WHERE id = 2",
          context: {options: {quoteIdentifiers: false}}
        }, {

--- a/test/integration/dialects/sqlite/query-generator.test.js
+++ b/test/integration/dialects/sqlite/query-generator.test.js
@@ -423,7 +423,7 @@ if (dialect === 'sqlite') {
          arguments: ['myTable', {name: 'foo', birthday: moment('2011-03-27 10:01:55 +0000', 'YYYY-MM-DD HH:mm:ss Z').toDate()}, {id: 2}],
          expectation: "UPDATE `myTable` SET `name`='foo',`birthday`='2011-03-27 10:01:55.000 +00:00' WHERE `id` = 2"
        }, {
-          arguments: ['myTable', {name: 'foo', birthday: moment('2011-03-27 10:01:55 +0000', 'YYYY-MM-DD HH:mm:ss Z').toDate()}, 2],
+          arguments: ['myTable', {name: 'foo', birthday: moment('2011-03-27 10:01:55 +0000', 'YYYY-MM-DD HH:mm:ss Z').toDate()}, {id: 2}],
          expectation: "UPDATE `myTable` SET `name`='foo',`birthday`='2011-03-27 10:01:55.000 +00:00' WHERE `id` = 2"
        }, {
          arguments: ['myTable', { name: 'foo' }, { id: 2 }],