Merge pull request #3271 from calvintwr/master

$not fix.

lib/dialects/abstract/query-generator.js

@@ -1582,7 +1582,7 @@ module.exports = (function() {
         $gt: '>',
         $gt: '>',
         $lte: '<=',
         $lte: '<=',
         $lt: '<',
         $lt: '<',
-        $not: 'NOT',
+        $not: 'IS NOT',
         $is: 'IS',
         $is: 'IS',
         $like: 'LIKE',
         $like: 'LIKE',
         $notLike: 'NOT LIKE',
         $notLike: 'NOT LIKE',
@@ -1710,12 +1710,18 @@ module.exports = (function() {
           value = {
           value = {
             $in: value
             $in: value
           };
           };
-        } else if (value.$not && Array.isArray(value.$not)) {
+        } else if (value && Array.isArray(value.$not)) {
           value.$notIn = value.$not;
           value.$notIn = value.$not;
           delete value.$not;
           delete value.$not;
         }
         }
       }
       }
 
 
+      // normalize $not: non-bool|non-null to $ne
+      if (value && typeof value.$not !== 'undefined' && [null, true, false].indexOf(value.$not) < 0) {
+        value.$ne = value.$not;
+        delete value.$not;
+      }
+
       // Setup keys and comparators
       // Setup keys and comparators
       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);

test/unit/sql/where.test.js

@@ -121,15 +121,21 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
       testsql('deleted', {
       testsql('deleted', {
         $not: true
         $not: true
       }, {
       }, {
-        default: "[deleted] NOT true",
-        mssql: "[deleted] NOT 'true'",
-        sqlite: "`deleted` NOT 1"
+        default: "[deleted] IS NOT true",
+        mssql: "[deleted] IS NOT 'true'",
+        sqlite: "`deleted` IS NOT 1"
       });
       });
 
 
       testsql('deleted', {
       testsql('deleted', {
         $not: null
         $not: null
       }, {
       }, {
-        default: "[deleted] NOT NULL"
+        default: "[deleted] IS NOT NULL"
+      });
+
+      testsql('muscles', {
+        $not: 3
+      }, {
+        default: '[muscles] != 3'
       });
       });
 
 
       testsql('muscles', {
       testsql('muscles', {