Merge pull request #1231 from unlooped/master

better check if 'IS NOT' or '!=' should be used

lib/utils.js

@@ -299,7 +299,7 @@ var Utils = module.exports = {
     case 'eq':
       return '='
     case 'ne':
-      return val ? '!=' : 'IS NOT'
+      return val === null ? 'IS NOT' : '!='
     case 'between':
     case '..':
       return 'BETWEEN'
@@ -451,7 +451,7 @@ var Utils = module.exports = {
 
       for (var key in hash) {
         if (key instanceof Utils.literal) {
-          _hash[key] = hash[key]          
+          _hash[key] = hash[key]
         } else if (key.indexOf('.') === -1) {
           _hash[tableName + '.' + key] = hash[key]
         } else {

test/mysql/query-generator.test.js

@@ -273,6 +273,16 @@ if (Support.dialectIsMySQL()) {
           arguments: ['myTable', {where: { field: new Buffer("Sequelize")}}],
           expectation: "SELECT * FROM `myTable` WHERE `myTable`.`field`=X'53657175656c697a65';",
           context: QueryGenerator
+        }, {
+          title: 'use != if ne !== null',
+          arguments: ['myTable', {where: {field: {ne: 0}}}],
+          expectation: "SELECT * FROM `myTable` WHERE `myTable`.`field` != 0;",
+          context: QueryGenerator
+        }, {
+          title: 'use IS NOT if ne === null',
+          arguments: ['myTable', {where: {field: {ne: null}}}],
+          expectation: "SELECT * FROM `myTable` WHERE `myTable`.`field` IS NOT NULL;",
+          context: QueryGenerator
         }
       ],
 

test/postgres/query-generator.test.js

@@ -268,8 +268,8 @@ if (dialect.match(/^postgres/)) {
         }, {
           title: 'functions can take functions as arguments',
           arguments: ['myTable', function (sequelize) {
-            return { 
-              order: [[sequelize.fn('f1', sequelize.fn('f2', sequelize.col('id'))), 'DESC']] 
+            return {
+              order: [[sequelize.fn('f1', sequelize.fn('f2', sequelize.col('id'))), 'DESC']]
             }
           }],
           expectation: 'SELECT * FROM "myTable" ORDER BY f1(f2("id")) DESC;',
@@ -280,7 +280,7 @@ if (dialect.match(/^postgres/)) {
           arguments: ['myTable', function (sequelize) {
             return {
               order: [
-                [sequelize.fn('f1', sequelize.col('myTable.id')), 'DESC'], 
+                [sequelize.fn('f1', sequelize.col('myTable.id')), 'DESC'],
                 [sequelize.fn('f2', 12, 'lalala', new Date(Date.UTC(2011, 2, 27, 10, 1, 55))), 'ASC']
               ]
             }
@@ -410,6 +410,16 @@ if (dialect.match(/^postgres/)) {
           arguments: ['mySchema.myTable', {where: {name: "foo';DROP TABLE mySchema.myTable;"}}],
           expectation: "SELECT * FROM mySchema.myTable WHERE mySchema.myTable.name='foo'';DROP TABLE mySchema.myTable;';",
           context: {options: {quoteIdentifiers: false}}
+        }, {
+          title: 'use != if ne !== null',
+          arguments: ['myTable', {where: {field: {ne: 0}}}],
+          expectation: "SELECT * FROM myTable WHERE myTable.field != 0;",
+          context: {options: {quoteIdentifiers: false}}
+        }, {
+          title: 'use IS NOT if ne === null',
+          arguments: ['myTable', {where: {field: {ne: null}}}],
+          expectation: "SELECT * FROM myTable WHERE myTable.field IS NOT NULL;",
+          context: {options: {quoteIdentifiers: false}}
         }
       ],
 

test/sqlite/query-generator.test.js

@@ -165,8 +165,8 @@ if (dialect === 'sqlite') {
         }, {
           title: 'functions can take functions as arguments',
           arguments: ['myTable', function (sequelize) {
-            return { 
-              order: [[sequelize.fn('f1', sequelize.fn('f2', sequelize.col('id'))), 'DESC']] 
+            return {
+              order: [[sequelize.fn('f1', sequelize.fn('f2', sequelize.col('id'))), 'DESC']]
             }
           }],
           expectation: "SELECT * FROM `myTable` ORDER BY f1(f2(`id`)) DESC;",
@@ -177,7 +177,7 @@ if (dialect === 'sqlite') {
           arguments: ['myTable', function (sequelize) {
             return {
               order: [
-                [sequelize.fn('f1', sequelize.col('myTable.id')), 'DESC'], 
+                [sequelize.fn('f1', sequelize.col('myTable.id')), 'DESC'],
                 [sequelize.fn('f2', 12, 'lalala', new Date(Date.UTC(2011, 2, 27, 10, 1, 55))), 'ASC']
               ]
             }
@@ -260,6 +260,16 @@ if (dialect === 'sqlite') {
           arguments: ['myTable', {where: { field: new Buffer("Sequelize")}}],
           expectation: "SELECT * FROM `myTable` WHERE `myTable`.`field`=X'53657175656c697a65';",
           context: QueryGenerator
+        }, {
+          title: 'use != if ne !== null',
+          arguments: ['myTable', {where: {field: {ne: 0}}}],
+          expectation: "SELECT * FROM `myTable` WHERE `myTable`.`field` != 0;",
+          context: QueryGenerator
+        }, {
+          title: 'use IS NOT if ne === null',
+          arguments: ['myTable', {where: {field: {ne: null}}}],
+          expectation: "SELECT * FROM `myTable` WHERE `myTable`.`field` IS NOT NULL;",
+          context: QueryGenerator
         }
       ],