Merge pull request #3933 from ns3777k/hotfix/and-or-shorten-syntax

fix fields and-or logic

lib/dialects/abstract/query-generator.js

@@ -1789,18 +1789,24 @@ var QueryGenerator = {
       }
     }
 
-    if (value) {
-      if (value.$or || value.$and) {
-        binding = value.$or ? ' OR ' : ' AND ';
+    if (value && (value.$or || value.$and)) {
+      binding = value.$or ? ' OR ' : ' AND ';
+      value = value.$or || value.$and;
 
-        value = (value.$or || value.$and).map(function (_value) {
-          return self.whereItemQuery(key, _value, options);
-        }).filter(function (item) {
-          return item && item.length;
-        });
-
-        return value.length ? '('+value.join(binding)+')' : undefined;
+      if (_.isPlainObject(value)) {
+        value = _.reduce(value, function (result, _value, key) {
+          result.push(_.zipObject([key], [_value]));
+          return result;
+        }, []);
       }
+
+      value = value.map(function (_value) {
+        return self.whereItemQuery(key, _value, options);
+      }).filter(function (item) {
+        return item && item.length;
+      });
+
+      return value.length ? '('+value.join(binding)+')' : undefined;
     }
 
     if (_.isPlainObject(value) && fieldType instanceof DataTypes.JSON && options.json !== false) {

test/unit/sql/where.test.js

@@ -186,6 +186,15 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
           default: '([email] = \'maker@mhansen.io\' OR [email] = \'janzeh@gmail.com\')'
         });
 
+        testsql('rank', {
+          $or: {
+            $lt: 100,
+            $eq: null
+          }
+        }, {
+          default: '([rank] < 100 OR [rank] IS NULL)'
+        });
+
         testsql('$or', [
           {email: 'maker@mhansen.io'},
           {email: 'janzeh@gmail.com'}
@@ -259,6 +268,15 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
           default: "([name] LIKE '%hello' AND [name] LIKE 'hello%')"
         });
 
+        testsql('rank', {
+          $and: {
+            $ne: 15,
+            $between: [10, 20]
+          }
+        }, {
+          default: '([rank] != 15 AND [rank] BETWEEN 10 AND 20)'
+        });
+
         testsql('name', {
             $and: [
               {like : '%someValue1%'},