Merge branch 'master' into milestones/2.0.0

changelog.md

@@ -38,6 +38,7 @@
 - [BUG] Fixes Postgres' ability to search within arrays. [#879](https://github.com/sequelize/sequelize/pull/879). thanks to durango
 - [BUG] Fixes Postgres' ability to search within arrays. [#879](https://github.com/sequelize/sequelize/pull/879). thanks to durango
 - [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
 - [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/dialects/postgres/query-generator.js

@@ -382,7 +382,7 @@ module.exports = (function() {
       return Utils._.template(query)(replacements)
       return Utils._.template(query)(replacements)
     },
     },
 
 
-    updateQuery: function(tableName, attrValueHash, where, options) {
+    updateQuery: function(tableName, attrValueHash, where, options, attributes) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull, options)
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull, options)
 
 
       var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> RETURNING *"
       var query  = "UPDATE <%= table %> SET <%= values %> WHERE <%= where %> RETURNING *"
@@ -390,7 +390,7 @@ module.exports = (function() {
 
 
       for (var key in attrValueHash) {
       for (var key in attrValueHash) {
         var value = attrValueHash[key]
         var value = attrValueHash[key]
-        values.push(this.quoteIdentifier(key) + "=" + this.escape(value))
+        values.push(this.quoteIdentifier(key) + "=" + this.escape(value, (!!attributes && !!attributes[key] ? attributes[key] : undefined)))
       }
       }
 
 
       var replacements = {
       var replacements = {

lib/query-interface.js

@@ -417,7 +417,7 @@ module.exports = (function() {
   QueryInterface.prototype.update = function(dao, tableName, values, identifier, options) {
   QueryInterface.prototype.update = function(dao, tableName, values, identifier, options) {
     var self = this
     var self = this
       , restrict = false
       , restrict = false
-      , sql = self.QueryGenerator.updateQuery(tableName, values, identifier, options)
+      , sql = self.QueryGenerator.updateQuery(tableName, values, identifier, options, dao.daoFactory.rawAttributes)
 
 
     // Check for a restrict field
     // Check for a restrict field
     if (!!dao.daoFactory && !!dao.daoFactory.associations) {
     if (!!dao.daoFactory && !!dao.daoFactory.associations) {

test/dao-factory.test.js

@@ -333,7 +333,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
   })
   })
 
 
   describe('create', function() {
   describe('create', function() {
-    it("casts empty arrays correctly for postgresql", function(done) {
+    it("casts empty arrays correctly for postgresql insert", function(done) {
       if (dialect !== "postgres" && dialect !== "postgresql-native") {
       if (dialect !== "postgres" && dialect !== "postgresql-native") {
         expect('').to.equal('')
         expect('').to.equal('')
         return done()
         return done()
@@ -352,6 +352,30 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         })
         })
       })
       })
     })
     })
+    it("casts empty array correct for postgres update", function(done) {
+      if (dialect !== "postgres" && dialect !== "postgresql-native") {
+        expect('').to.equal('')
+        return done()
+      }
+
+      var User = this.sequelize.define('UserWithArray', {
+        myvals: { type: Sequelize.ARRAY(Sequelize.INTEGER) },
+        mystr: { type: Sequelize.ARRAY(Sequelize.STRING) }
+      })
+
+      User.sync({force: true}).success(function() {
+        User.create({myvals: [1,2,3,4], mystr: ["One", "Two", "Three", "Four"]}).on('success', function(user){
+         user.myvals = []
+          user.mystr = []
+          user.save().on('sql', function(sql) {
+            expect(sql.indexOf('ARRAY[]::INTEGER[]')).to.be.above(-1)
+            expect(sql.indexOf('ARRAY[]::VARCHAR[]')).to.be.above(-1)
+            done()
+          })
+        })
+      })
+    })
+
 
 
     it("doesn't allow duplicated records with unique:true", function(done) {
     it("doesn't allow duplicated records with unique:true", function(done) {
       var User = this.sequelize.define('UserWithUniqueUsername', {
       var User = this.sequelize.define('UserWithUniqueUsername', {