Fix #5736, Invalid query generated when using LIKE with ANY (#5840)

* added failing test case for LIKE ANY parentheses issue

* wrap ANY arguments with parentheses when using LIKE + ANY

* changelog entry for #5736

changelog.md

 # Future
 # Future
+- [FIXED] Invalid query generated when using LIKE + ANY [#5736](https://github.com/sequelize/sequelize/issues/5736)
 - [FIXED] Method QueryInterface.bulkDelete no longer working when the model parameter is missing. (PostgreSQL) [#5615](https://github.com/sequelize/sequelize/issues/5615)
 - [FIXED] Method QueryInterface.bulkDelete no longer working when the model parameter is missing. (PostgreSQL) [#5615](https://github.com/sequelize/sequelize/issues/5615)
 - [ADDED] Context and custom options for deep creation
 - [ADDED] Context and custom options for deep creation
 
 

lib/dialects/abstract/query-generator.js

@@ -2240,6 +2240,11 @@ var QueryGenerator = {
 
 
       if (escapeValue) {
       if (escapeValue) {
         value = this.escape(value, field, escapeOptions);
         value = this.escape(value, field, escapeOptions);
+
+        //if ANY is used with like, add parentheses to generate correct query
+        if (escapeOptions.acceptStrings && (comparator.indexOf('ANY') > comparator.indexOf('LIKE'))) {
+         value = '(' + value + ')';
+        }
       }
       }
     }
     }
 
 

test/unit/sql/where.test.js

@@ -572,7 +572,7 @@ 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', {
@@ -580,7 +580,7 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
               $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', {
@@ -588,7 +588,7 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
               $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', {
@@ -596,7 +596,7 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
               $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'])"
           });
           });
 
 
           testsql('userId', {
           testsql('userId', {