ne: null now yields "IS NOT NULL" instead of "!= NULL"

lib/dialects/abstract/query-generator.js

@@ -650,7 +650,7 @@ module.exports = (function() {
             result.push([_key, _value].join("="))
             result.push([_key, _value].join("="))
           } else {
           } else {
             for (var logic in value) {
             for (var logic in value) {
-              var logicResult = Utils.getWhereLogic(logic)
+              var logicResult = Utils.getWhereLogic(logic, hash[key][logic]);
               if (logic === "IN" || logic === "NOT IN") {
               if (logic === "IN" || logic === "NOT IN") {
                 var values = Array.isArray(where[i][ii]) ? where[i][ii] : [where[i][ii]]
                 var values = Array.isArray(where[i][ii]) ? where[i][ii] : [where[i][ii]]
                 _where[_where.length] = i + ' ' + logic + ' (' + values.map(function(){ return '?' }).join(',') + ')'
                 _where[_where.length] = i + ' ' + logic + ' (' + values.map(function(){ return '?' }).join(',') + ')'

lib/utils.js

@@ -180,7 +180,7 @@ var Utils = module.exports = {
           }
           }
           else if (type === "object") {
           else if (type === "object") {
             Object.keys(where[i]).forEach(function(ii) {
             Object.keys(where[i]).forEach(function(ii) {
-              logic = self.getWhereLogic(ii)
+              logic = self.getWhereLogic(ii, where[i][ii]);
 
 
               switch(logic) {
               switch(logic) {
               case 'IN':
               case 'IN':
@@ -282,7 +282,7 @@ var Utils = module.exports = {
 
 
     return Utils._.compactLite([text.join(' AND ')].concat(whereArgs))
     return Utils._.compactLite([text.join(' AND ')].concat(whereArgs))
   },
   },
-  getWhereLogic: function(logic) {
+  getWhereLogic: function(logic, val) {
     switch (logic) {
     switch (logic) {
     case 'join':
     case 'join':
       return 'JOIN'
       return 'JOIN'
@@ -297,7 +297,8 @@ var Utils = module.exports = {
     case 'eq':
     case 'eq':
       return '='
       return '='
     case 'ne':
     case 'ne':
-      return '!='
+      if (val) return '!='
+      else return 'IS NOT'
     case 'between':
     case 'between':
     case '..':
     case '..':
       return 'BETWEEN'
       return 'BETWEEN'