Merge branch 'master' into milestones/2.0.0

changelog.md

@@ -39,6 +39,7 @@
 - [BUG] Find and finAll would modify the options objects, now the objects are cloned at the start of the method [#884](https://github.com/sequelize/sequelize/pull/884) thanks to janmeier
 - [BUG] Find and finAll would modify the options objects, now the objects are cloned at the start of the method [#884](https://github.com/sequelize/sequelize/pull/884) thanks to janmeier
 - [BUG] Add support for typed arrays in SqlString.escape and SqlString.arrayToList [#891](https://github.com/sequelize/sequelize/pull/891). thanks to LJ1102
 - [BUG] Add support for typed arrays in SqlString.escape and SqlString.arrayToList [#891](https://github.com/sequelize/sequelize/pull/891). thanks to LJ1102
 - [BUG] Postgres requires empty array to be explicitly cast on update [#890](https://github.com/sequelize/sequelize/pull/890). thanks to robraux
 - [BUG] Postgres requires empty array to be explicitly cast on update [#890](https://github.com/sequelize/sequelize/pull/890). thanks to robraux
+- [BUG] Added tests & bugfixes for DAO-Factory.update and array of values in where clause [#880](https://github.com/sequelize/sequelize/pull/880). thanks to domasx2
 - [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601). thanks to durango
 - [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601). thanks to durango
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude

lib/dao-factory.js

@@ -668,8 +668,8 @@ module.exports = (function() {
    */
    */
   DAOFactory.prototype.update = function(attrValueHash, where, options) {
   DAOFactory.prototype.update = function(attrValueHash, where, options) {
     options = options || {}
     options = options || {}
-    options.validate = options.validate || true
-
+    options.validate = options.validate === undefined ? true : Boolean(options.validate)
+    
     if(this.options.timestamps) {
     if(this.options.timestamps) {
       var attr = Utils._.underscoredIf(this.options.updatedAt, this.options.underscored)
       var attr = Utils._.underscoredIf(this.options.updatedAt, this.options.underscored)
       attrValueHash[attr] = Utils.now()
       attrValueHash[attr] = Utils.now()

lib/dialects/postgres/query-generator.js

@@ -565,16 +565,19 @@ module.exports = (function() {
 
 
         if (Array.isArray(value)) {
         if (Array.isArray(value)) {
           if (value.length === 0) { value = [null] }
           if (value.length === 0) { value = [null] }
-
+          var col = null, coltype = null
           // Special conditions for searching within an array column type
           // Special conditions for searching within an array column type
           var _realKey = key.split('.').pop()
           var _realKey = key.split('.').pop()
           if (!!factory && !!factory.rawAttributes[_realKey]) {
           if (!!factory && !!factory.rawAttributes[_realKey]) {
-            var col = factory.rawAttributes[_realKey]
-
-            if ((!!col.type && col.type.match(/\[\]$/) !== null) || (col.toString().match(/\[\]$/) !== null)) {
-              _value = 'ARRAY[' + value.map(this.escape).join(',') + ']::' + (!!col.type ? col.type : col.toString())
-              result.push([_key, _value].join(" && "))
+            col = factory.rawAttributes[_realKey]
+            coltype = col.type
+            if(coltype && !(typeof coltype == 'string')) {
+              coltype = coltype.toString();
             }
             }
+          }
+          if ( col && ((!!coltype && coltype.match(/\[\]$/) !== null) || (col.toString().match(/\[\]$/) !== null))) {
+            _value = 'ARRAY[' + value.map(this.escape).join(',') + ']::' + (!!col.type ? col.type : col.toString())
+            result.push([_key, _value].join(" && "))
           } else {
           } else {
             _value = "(" + value.map(this.escape).join(',') + ")"
             _value = "(" + value.map(this.escape).join(',') + ")"
             result.push([_key, _value].join(" IN "))
             result.push([_key, _value].join(" IN "))

test/dao-factory.test.js

@@ -1088,6 +1088,27 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       })
       })
     })
     })
 
 
+    it('should be able to find rows where attribute is in a list of values', function (done) {
+      this.User.findAll({
+        where: {
+          username: ['boo', 'boo2']
+        }
+      }).success(function(users){
+        expect(users).to.have.length(2);
+        done()
+      });
+    })
+
+    it('should not break when trying to find rows using an array of primary keys', function (done) {
+      this.User.findAll({
+        where: {
+          id: [1, 2, 3]
+        }
+      }).success(function(users){
+        done();
+      });
+    })
+
     it('should be able to find a row using like', function(done) {
     it('should be able to find a row using like', function(done) {
       this.User.findAll({
       this.User.findAll({
         where: {
         where: {