Improved readability. Removed unneeded parentheses from query.

lib/dialects/abstract/query-generator.js

@@ -1737,7 +1737,6 @@ module.exports = (function() {
       }
       }
 
 
       // Setup keys and comparators
       // Setup keys and comparators
-      var any;
       if (Array.isArray(value) && fieldType instanceof DataTypes.ARRAY) {
       if (Array.isArray(value) && fieldType instanceof DataTypes.ARRAY) {
         value = this.escape(value, field);
         value = this.escape(value, field);
       } else if (value && (value.$in || value.$notIn)) {
       } else if (value && (value.$in || value.$notIn)) {
@@ -1767,17 +1766,16 @@ module.exports = (function() {
         value = (value.$between || value.$notBetween).map(function (item) {
         value = (value.$between || value.$notBetween).map(function (item) {
           return self.escape(item);
           return self.escape(item);
         }).join(' AND ');
         }).join(' AND ');
-      } else if (value && ((value.$like && (any = value.$like.$any) && (comparator = 'LIKE ANY')) ||
-                (value.$iLike && (any = value.$iLike.$any) && (comparator = 'ILIKE ANY')) ||
-                (value.$notLike && (any = value.$notLike.$any) && (comparator = 'NOT LIKE ANY')) ||
-                (value.$notILike && (any = value.$notILike.$any) && (comparator = 'NOT ILIKE ANY')))) {
-        value = '('+self.escape(any)+')';
       } else {
       } else {
         if (_.isPlainObject(value)) {
         if (_.isPlainObject(value)) {
           _.forOwn(value, function (item, key) {
           _.forOwn(value, function (item, key) {
             if (comparatorMap[key]) {
             if (comparatorMap[key]) {
               comparator = comparatorMap[key];
               comparator = comparatorMap[key];
               value = item;
               value = item;
+              if (_.isPlainObject(value) && value.$any){
+                comparator += ' ANY';
+                value = value.$any;
+              }
             }
             }
           });
           });
         }
         }

test/unit/sql/where.test.js

@@ -430,28 +430,28 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
               $any: ['foo', 'bar', 'baz']
               $any: ['foo', 'bar', 'baz']
             }
             }
           }, {
           }, {
-            postgres: "\"userId\" LIKE ANY (ARRAY['foo','bar','baz'])"
+            postgres: "\"userId\" LIKE ANY ARRAY['foo','bar','baz']"
           });
           });
           testsql('userId', {
           testsql('userId', {
             $iLike: {
             $iLike: {
               $any: ['foo', 'bar', 'baz']
               $any: ['foo', 'bar', 'baz']
             }
             }
           }, {
           }, {
-            postgres: "\"userId\" ILIKE ANY (ARRAY['foo','bar','baz'])"
+            postgres: "\"userId\" ILIKE ANY ARRAY['foo','bar','baz']"
           });
           });
           testsql('userId', {
           testsql('userId', {
             $notLike: {
             $notLike: {
               $any: ['foo', 'bar', 'baz']
               $any: ['foo', 'bar', 'baz']
             }
             }
           }, {
           }, {
-            postgres: "\"userId\" NOT LIKE ANY (ARRAY['foo','bar','baz'])"
+            postgres: "\"userId\" NOT LIKE ANY ARRAY['foo','bar','baz']"
           });
           });
           testsql('userId', {
           testsql('userId', {
             $notILike: {
             $notILike: {
               $any: ['foo', 'bar', 'baz']
               $any: ['foo', 'bar', 'baz']
             }
             }
           }, {
           }, {
-            postgres: "\"userId\" NOT ILIKE ANY (ARRAY['foo','bar','baz'])"
+            postgres: "\"userId\" NOT ILIKE ANY ARRAY['foo','bar','baz']"
           });
           });
         });
         });
       });
       });