Merge branch 'master' into milestones/2.0.0

changelog.md

@@ -35,6 +35,7 @@
 - [BUG] Default schemas should now be utilized when describing tables [#812](https://github.com/sequelize/sequelize/pull/812). thanks to durango
 - [BUG] Fixed eager loading for many-to-many associations. [#834](https://github.com/sequelize/sequelize/pull/834). thanks to lemon-tree
 - [BUG] allowNull: true enums can now be null [#857](https://github.com/sequelize/sequelize/pull/857). thanks to durango
+- [BUG] Fixes Postgres' ability to search within arrays. [#879](https://github.com/sequelize/sequelize/pull/879). 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] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
@@ -63,7 +64,7 @@
 - [FEATURE] Blob support. janmeier
 - [FEATURE] We can now define our own custom timestamp columns [#856](https://github.com/sequelize/sequelize/pull/856). thanks to durango
 - [FEATURE] Scopes. [#748](https://github.com/sequelize/sequelize/pull/748). durango
-- [FEATURE] Model#find() / Model#findAll() is now working with strings. [#855](https://github.com/sequelize/sequelize/pull/855). Thanks to whito. 
+- [FEATURE] Model#find() / Model#findAll() is now working with strings. [#855](https://github.com/sequelize/sequelize/pull/855). Thanks to whito.
 - [FEATURE] Shortcut method for getting a defined model. [#868](https://github.com/sequelize/sequelize/pull/868). Thanks to jwilm.
 - [REFACTORING] hasMany now uses a single SQL statement when creating and destroying associations, instead of removing each association seperately [690](https://github.com/sequelize/sequelize/pull/690). Inspired by [#104](https://github.com/sequelize/sequelize/issues/104). janmeier
 - [REFACTORING] Consistent handling of offset across dialects. Offset is now always applied, and limit is set to max table size of not limit is given [#725](https://github.com/sequelize/sequelize/pull/725). janmeier

lib/dialects/postgres/query-generator.js

@@ -526,7 +526,7 @@ module.exports = (function() {
 
       if (Utils.isHash(smth)) {
         smth = Utils.prependTableNameToHash(tableName, smth)
-        result = this.hashToWhereConditions(smth)
+        result = this.hashToWhereConditions(smth, factory)
       } else if (typeof smth === 'number') {
         var primaryKeys = !!factory ? Object.keys(factory.primaryKeys) : []
         if (primaryKeys.length > 0) {
@@ -549,7 +549,7 @@ module.exports = (function() {
       return result
     },
 
-    hashToWhereConditions: function(hash) {
+    hashToWhereConditions: function(hash, factory) {
       var result = []
 
       for (var key in hash) {
@@ -561,9 +561,20 @@ module.exports = (function() {
 
         if (Array.isArray(value)) {
           if (value.length === 0) { value = [null] }
-          _value = "(" + value.map(this.escape).join(',') + ")"
 
-          result.push([_key, _value].join(" IN "))
+          // Special conditions for searching within an array column type
+          var _realKey = key.split('.').pop()
+          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(" && "))
+            }
+          } else {
+            _value = "(" + value.map(this.escape).join(',') + ")"
+            result.push([_key, _value].join(" IN "))
+          }
         }
         else if ((value) && (typeof value === "object")) {
           if (!!value.join) {

test/postgres/dao.test.js

@@ -26,6 +26,28 @@ if (dialect.match(/^postgres/)) {
       done()
     })
 
+    it('should be able to search within an array', function(done) {
+      this.User.all({where: {email: ['hello', 'world']}}).on('sql', function(sql) {
+        expect(sql).to.equal('SELECT * FROM "Users" WHERE "Users"."email" && ARRAY[\'hello\',\'world\']::TEXT[];')
+        done()
+      })
+    })
+
+    it('should be able to find a record while searching in an array', function(done) {
+      var self = this
+      this.User.bulkCreate([
+        {username: 'bob', email: ['myemail@email.com']},
+        {username: 'tony', email: ['wrongemail@email.com']}
+      ]).success(function() {
+        self.User.all({where: {email: ['myemail@email.com']}}).success(function(user) {
+          expect(user).to.be.instanceof(Array)
+          expect(user).to.have.length(1)
+          expect(user[0].username).to.equal('bob')
+          done()
+        })
+      })
+    })
+
     it('describeTable should tell me that a column is hstore and not USER-DEFINED', function(done) {
       this.sequelize.queryInterface.describeTable('Users').success(function(table) {
         expect(table.document.type).to.equal('HSTORE')