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':
     case 'eq':
       return '='
       return '='
     case 'ne':
     case 'ne':
-      return val ? '!=' : 'IS NOT'
+      return val === null ? 'IS NOT' : '!='
     case 'between':
     case 'between':
     case '..':
     case '..':
       return 'BETWEEN'
       return 'BETWEEN'

test/mysql/query-generator.test.js

@@ -273,6 +273,16 @@ if (Support.dialectIsMySQL()) {
           arguments: ['myTable', {where: { field: new Buffer("Sequelize")}}],
           arguments: ['myTable', {where: { field: new Buffer("Sequelize")}}],
           expectation: "SELECT * FROM `myTable` WHERE `myTable`.`field`=X'53657175656c697a65';",
           expectation: "SELECT * FROM `myTable` WHERE `myTable`.`field`=X'53657175656c697a65';",
           context: QueryGenerator
           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

@@ -410,6 +410,16 @@ if (dialect.match(/^postgres/)) {
           arguments: ['mySchema.myTable', {where: {name: "foo';DROP TABLE mySchema.myTable;"}}],
           arguments: ['mySchema.myTable', {where: {name: "foo';DROP TABLE mySchema.myTable;"}}],
           expectation: "SELECT * FROM mySchema.myTable WHERE mySchema.myTable.name='foo'';DROP TABLE mySchema.myTable;';",
           expectation: "SELECT * FROM mySchema.myTable WHERE mySchema.myTable.name='foo'';DROP TABLE mySchema.myTable;';",
           context: {options: {quoteIdentifiers: false}}
           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

@@ -260,6 +260,16 @@ if (dialect === 'sqlite') {
           arguments: ['myTable', {where: { field: new Buffer("Sequelize")}}],
           arguments: ['myTable', {where: { field: new Buffer("Sequelize")}}],
           expectation: "SELECT * FROM `myTable` WHERE `myTable`.`field`=X'53657175656c697a65';",
           expectation: "SELECT * FROM `myTable` WHERE `myTable`.`field`=X'53657175656c697a65';",
           context: QueryGenerator
           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
         }
         }
       ],
       ],