fix(sql/where): fix issue with {field: {: []}}, closes #3219

changelog.md

 # Next
 # Next
 - [BUG] Fixed support for 2 x belongsToMany without foreignKey defined and association getter/adder [#3185](https://github.com/sequelize/sequelize/issues/3185)
 - [BUG] Fixed support for 2 x belongsToMany without foreignKey defined and association getter/adder [#3185](https://github.com/sequelize/sequelize/issues/3185)
 - [BUG] No longer throws on `Model.hasHook()` if no hooks are defiend [#3181](https://github.com/sequelize/sequelize/issues/3181)
 - [BUG] No longer throws on `Model.hasHook()` if no hooks are defiend [#3181](https://github.com/sequelize/sequelize/issues/3181)
+- [BUG] Fixed issue with `{$and: []}`
 
 
 # 2.0.3
 # 2.0.3
 - [BUG] Support for plain strings, ints and bools on JSON insert
 - [BUG] Support for plain strings, ints and bools on JSON insert

lib/dialects/abstract/query-generator.js

@@ -1680,7 +1680,7 @@ module.exports = (function() {
         if (value.$or || value.$and) {
         if (value.$or || value.$and) {
           binding = value.$or ? ' OR ' : ' AND ';
           binding = value.$or ? ' OR ' : ' AND ';
 
 
-          value = value.$or.map(function (_value) {
+          value = (value.$or || value.$and).map(function (_value) {
             return self.whereItemQuery(key, _value, options);
             return self.whereItemQuery(key, _value, options);
           }).filter(function (item) {
           }).filter(function (item) {
             return item && item.length;
             return item && item.length;

test/unit/sql/where.test.js

@@ -219,6 +219,30 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
           default: "([shared] = 1 AND ([group_id] = 1 OR [user_id] = 2))"
           default: "([shared] = 1 AND ([group_id] = 1 OR [user_id] = 2))"
         });
         });
 
 
+        testsql('$and', [
+          {
+            name: {
+              $like: '%hello'
+            }
+          },
+          {
+            name: {
+              $like: 'hello%'
+            }
+          }
+        ], {
+          default: "([name] LIKE '%hello' AND [name] LIKE 'hello%')"
+        });
+
+        testsql('name', {
+            $and: [
+              {like : '%someValue1%'},
+              {like : '%someValue2%'}
+            ]
+        }, {
+          default: "([name] LIKE '%someValue1%' AND [name] LIKE '%someValue2%')"
+        })
+
         test("sequelize.and({shared: 1, sequelize.or({group_id: 1}, {user_id: 2}))", function () {
         test("sequelize.and({shared: 1, sequelize.or({group_id: 1}, {user_id: 2}))", function () {
           expectsql(sql.whereItemQuery(undefined, this.sequelize.and({shared: 1}, this.sequelize.or({group_id: 1}, {user_id: 2}))), {
           expectsql(sql.whereItemQuery(undefined, this.sequelize.and({shared: 1}, this.sequelize.or({group_id: 1}, {user_id: 2}))), {
             default: "([shared] = 1 AND ([group_id] = 1 OR [user_id] = 2))"
             default: "([shared] = 1 AND ([group_id] = 1 OR [user_id] = 2))"