Merge pull request #1097 from alubbe/master

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,7 @@ var Utils = module.exports = {
     case 'eq':
     case 'eq':
       return '='
       return '='
     case 'ne':
     case 'ne':
-      return '!='
+      return val ? '!=' : 'IS NOT'
     case 'between':
     case 'between':
     case '..':
     case '..':
       return 'BETWEEN'
       return 'BETWEEN'

test/dao-factory.test.js

@@ -1454,8 +1454,9 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       var self = this
       var self = this
 
 
       this.User.bulkCreate([
       this.User.bulkCreate([
-        {username: 'boo', intVal: 5, theDate: '2013-01-01 12:00'},
-        {username: 'boo2', intVal: 10, theDate: '2013-01-10 12:00'}
+        {username: 'boo',  intVal: 5,    theDate: '2013-01-01 12:00'},
+        {username: 'boo2', intVal: 10,   theDate: '2013-01-10 12:00'},
+        {username: 'boo3', intVal: null, theDate: null}
       ]).success(function(user2) {
       ]).success(function(user2) {
         done()
         done()
       })
       })
@@ -1464,10 +1465,10 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
     it('should be able to find rows where attribute is in a list of values', function (done) {
     it('should be able to find rows where attribute is in a list of values', function (done) {
       this.User.findAll({
       this.User.findAll({
         where: {
         where: {
-          username: ['boo', 'boo2']
+          username: ['boo', 'boo2', 'boo3']
         }
         }
       }).success(function(users){
       }).success(function(users){
-        expect(users).to.have.length(2);
+        expect(users).to.have.length(3);
         done()
         done()
       });
       });
     })
     })
@@ -1475,9 +1476,10 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
     it('should not break when trying to find rows using an array of primary keys', function (done) {
     it('should not break when trying to find rows using an array of primary keys', function (done) {
       this.User.findAll({
       this.User.findAll({
         where: {
         where: {
-          id: [1, 2, 3]
+          id: [1, 2, 3, 4]
         }
         }
       }).success(function(users){
       }).success(function(users){
+        expect(users).to.have.length(3)
         done();
         done();
       });
       });
     })
     })
@@ -1507,9 +1509,11 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
         }
         }
       }).success(function(users) {
       }).success(function(users) {
         expect(users).to.be.an.instanceof(Array)
         expect(users).to.be.an.instanceof(Array)
-        expect(users).to.have.length(1)
+        expect(users).to.have.length(2)
         expect(users[0].username).to.equal('boo')
         expect(users[0].username).to.equal('boo')
         expect(users[0].intVal).to.equal(5)
         expect(users[0].intVal).to.equal(5)
+        expect(users[1].username).to.equal('boo3')
+        expect(users[1].intVal).to.equal(null)
         done()
         done()
       })
       })
     })
     })
@@ -1522,6 +1526,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           }
           }
         }
         }
       }).success(function(users) {
       }).success(function(users) {
+        expect(users).to.have.length(1)
         expect(users[0].username).to.equal('boo2')
         expect(users[0].username).to.equal('boo2')
         expect(users[0].intVal).to.equal(10)
         expect(users[0].intVal).to.equal(10)
         done()
         done()
@@ -1536,6 +1541,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           }
           }
         }
         }
       }).success(function(users) {
       }).success(function(users) {
+        expect(users).to.have.length(1)
         expect(users[0].username).to.equal('boo')
         expect(users[0].username).to.equal('boo')
         expect(users[0].intVal).to.equal(5)
         expect(users[0].intVal).to.equal(5)
         done()
         done()
@@ -1657,6 +1663,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           }
           }
         }
         }
       }).success(function(users) {
       }).success(function(users) {
+        expect(users).to.have.length(1)
         expect(users[0].username).to.equal('boo2')
         expect(users[0].username).to.equal('boo2')
         expect(users[0].intVal).to.equal(10)
         expect(users[0].intVal).to.equal(10)
         done()
         done()
@@ -1672,6 +1679,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           intVal: 10
           intVal: 10
         }
         }
       }).success(function(users) {
       }).success(function(users) {
+        expect(users).to.have.length(1)
         expect(users[0].username).to.equal('boo2')
         expect(users[0].username).to.equal('boo2')
         expect(users[0].intVal).to.equal(10)
         expect(users[0].intVal).to.equal(10)
         done()
         done()
@@ -1686,6 +1694,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           }
           }
         }
         }
       }).success(function(users) {
       }).success(function(users) {
+        expect(users).to.have.length(1)
         expect(users[0].username).to.equal('boo')
         expect(users[0].username).to.equal('boo')
         expect(users[0].intVal).to.equal(5)
         expect(users[0].intVal).to.equal(5)
         done()
         done()
@@ -1701,6 +1710,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           }
           }
         }
         }
       }).success(function(users) {
       }).success(function(users) {
+        expect(users).to.have.length(1)
         expect(users[0].username).to.equal('boo')
         expect(users[0].username).to.equal('boo')
         expect(users[0].intVal).to.equal(5)
         expect(users[0].intVal).to.equal(5)
         done()
         done()
@@ -1716,6 +1726,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           }
           }
         }
         }
       }).success(function(users) {
       }).success(function(users) {
+        expect(users).to.have.length(1)
         expect(users[0].username).to.equal('boo')
         expect(users[0].username).to.equal('boo')
         expect(users[0].intVal).to.equal(5)
         expect(users[0].intVal).to.equal(5)
         done()
         done()
@@ -1730,6 +1741,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           }
           }
         }
         }
       }).success(function(users) {
       }).success(function(users) {
+        expect(users).to.have.length(1)
         expect(users[0].username).to.equal('boo2')
         expect(users[0].username).to.equal('boo2')
         expect(users[0].intVal).to.equal(10)
         expect(users[0].intVal).to.equal(10)
         done()
         done()
@@ -1801,6 +1813,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           }
           }
         }
         }
       }).success(function(users) {
       }).success(function(users) {
+        expect(users).to.have.length(1)
         expect(users[0].username).to.equal('boo')
         expect(users[0].username).to.equal('boo')
         expect(users[0].intVal).to.equal(5)
         expect(users[0].intVal).to.equal(5)
         done()
         done()
@@ -1821,6 +1834,23 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       })
       })
     })
     })
 
 
+    it('should be able to find a row using not equal to null logic', function(done) {
+      this.User.findAll({
+        where: {
+          intVal: {
+            ne: null
+          }
+        }
+      }).success(function(users) {
+        expect(users).to.have.length(2)
+        expect(users[0].username).to.equal('boo')
+        expect(users[0].intVal).to.equal(5)
+        expect(users[1].username).to.equal('boo2')
+        expect(users[1].intVal).to.equal(10)
+        done()
+      })
+    })
+
     it('should be able to find multiple users with any of the special where logic properties', function(done) {
     it('should be able to find multiple users with any of the special where logic properties', function(done) {
       this.User.findAll({
       this.User.findAll({
         where: {
         where: {
@@ -1829,6 +1859,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           }
           }
         }
         }
       }).success(function(users) {
       }).success(function(users) {
+        expect(users).to.have.length(2)
         expect(users[0].username).to.equal('boo')
         expect(users[0].username).to.equal('boo')
         expect(users[0].intVal).to.equal(5)
         expect(users[0].intVal).to.equal(5)
         expect(users[1].username).to.equal('boo2')
         expect(users[1].username).to.equal('boo2')