Merge pull request #718 from durango/emptyarray

PostgreSQL should now be able to insert empty arrays with typecasting. Closes #714

lib/dialects/postgres/query-generator.js

@@ -289,7 +289,7 @@ module.exports = (function() {
       return Utils._.template(query)(options)
       return Utils._.template(query)(options)
     },
     },
 
 
-    insertQuery: function(tableName, attrValueHash) {
+    insertQuery: function(tableName, attrValueHash, attributes) {
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
       attrValueHash = Utils.removeNullValuesFromHash(attrValueHash, this.options.omitNull)
 
 
       var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
       var query     = "INSERT INTO <%= table %> (<%= attributes %>) VALUES (<%= values %>) RETURNING *;"
@@ -306,14 +306,17 @@ module.exports = (function() {
         }
         }
       });
       });
 
 
+      var rowValues = []
+      Object.keys(attrValueHash).forEach(function(attr) {
+        rowValues[rowValues.length] = this.escape(attrValueHash[attr], (!!attributes && !!attributes[attr] ? attributes[attr] : undefined))
+      }.bind(this))
+
       var replacements  = {
       var replacements  = {
         table:      this.quoteIdentifiers(tableName)
         table:      this.quoteIdentifiers(tableName)
       , attributes: Object.keys(attrValueHash).map(function(attr){
       , attributes: Object.keys(attrValueHash).map(function(attr){
                       return this.quoteIdentifier(attr)
                       return this.quoteIdentifier(attr)
                     }.bind(this)).join(",")
                     }.bind(this)).join(",")
-      , values:     Utils._.values(attrValueHash).map(function(value){
-                      return this.escape(value)
-                    }.bind(this)).join(",")
+      , values:     rowValues.join(",")
       }
       }
 
 
       return Utils._.template(query)(replacements)
       return Utils._.template(query)(replacements)
@@ -734,7 +737,7 @@ module.exports = (function() {
       return identifiers.split('.').map(function(t) { return this.quoteIdentifier(t, force) }.bind(this)).join('.')
       return identifiers.split('.').map(function(t) { return this.quoteIdentifier(t, force) }.bind(this)).join('.')
     },
     },
 
 
-    escape: function (val) {
+    escape: function (val, field) {
       if (val === undefined || val === null) {
       if (val === undefined || val === null) {
         return 'NULL';
         return 'NULL';
       }
       }
@@ -746,7 +749,11 @@ module.exports = (function() {
           return val + '';
           return val + '';
         case 'object':
         case 'object':
           if (Array.isArray(val)) {
           if (Array.isArray(val)) {
-            return 'ARRAY['+ val.map(function(it) { return this.escape(it) }.bind(this)).join(',') + ']';
+            var ret = 'ARRAY['+ val.map(function(it) { return this.escape(it) }.bind(this)).join(',') + ']'
+            if (!!field && !!field.type) {
+              ret += '::' + field.type.replace(/\(\d+\)/g, '')
+            }
+            return ret
           }
           }
       }
       }
 
 

lib/query-interface.js

@@ -254,7 +254,7 @@ module.exports = (function() {
   }
   }
 
 
   QueryInterface.prototype.insert = function(dao, tableName, values) {
   QueryInterface.prototype.insert = function(dao, tableName, values) {
-    var sql = this.QueryGenerator.insertQuery(tableName, values)
+    var sql = this.QueryGenerator.insertQuery(tableName, values, dao.daoFactory.rawAttributes)
     return queryAndEmit.call(this, [sql, dao], 'insert', {
     return queryAndEmit.call(this, [sql, dao], 'insert', {
       success: function(obj) { obj.isNewRecord = false }
       success: function(obj) { obj.isNewRecord = false }
     })
     })

spec/dao-factory.spec.js

@@ -281,6 +281,26 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
   })
   })
 
 
   describe('create', function() {
   describe('create', function() {
+    it("casts empty arrays correctly for postgresql", function(done) {
+      if (dialect !== "postgres" && dialect !== "postgresql-native") {
+        expect('').toEqual('')
+        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: [], mystr: []}).on('sql', function(sql){
+          expect(sql.indexOf('ARRAY[]::INTEGER[]')).toBeGreaterThan(-1)
+          expect(sql.indexOf('ARRAY[]::VARCHAR[]')).toBeGreaterThan(-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', {
         username: { type: Sequelize.STRING, unique: true }
         username: { type: Sequelize.STRING, unique: true }