fixed boolean to tinyint conversion for sqlite

lib/dialects/mysql/query-generator.js

@@ -149,7 +149,7 @@ module.exports = (function() {
       }
       }
 
 
       if(options.where) {
       if(options.where) {
-        options.where = QueryGenerator.getWhereConditions(options.where, tableName)
+        options.where = this.getWhereConditions(options.where, tableName)
         query += " WHERE <%= where %>"
         query += " WHERE <%= where %>"
       }
       }
 
 
@@ -290,10 +290,10 @@ module.exports = (function() {
 
 
       if(Utils.isHash(smth)) {
       if(Utils.isHash(smth)) {
         smth   = Utils.prependTableNameToHash(tableName, smth)
         smth   = Utils.prependTableNameToHash(tableName, smth)
-        result = QueryGenerator.hashToWhereConditions(smth)
+        result = this.hashToWhereConditions(smth)
       } else if (typeof smth === 'number') {
       } else if (typeof smth === 'number') {
         smth   = Utils.prependTableNameToHash(tableName, { id: smth })
         smth   = Utils.prependTableNameToHash(tableName, { id: smth })
-        result = QueryGenerator.hashToWhereConditions(smth)
+        result = this.hashToWhereConditions(smth)
       } else if (typeof smth === "string") {
       } else if (typeof smth === "string") {
         result = smth
         result = smth
       } else if (Array.isArray(smth)) {
       } else if (Array.isArray(smth)) {

lib/dialects/sqlite/query-generator.js

 var Utils = require("../../utils")
 var Utils = require("../../utils")
-  , util  = require("util")
+var MySqlQueryGenerator = Utils._.extend(
+  Utils._.clone(require("../query-generator")),
+  Utils._.clone(require("../mysql/query-generator"))
+)
+
+var hashToWhereConditions = MySqlQueryGenerator.hashToWhereConditions
 
 
 var escape = function(str) {
 var escape = function(str) {
   if (typeof str === 'string') {
   if (typeof str === 'string') {
@@ -24,12 +29,14 @@ module.exports = (function() {
         , attrStr = []
         , attrStr = []
 
 
       for (var attr in attributes) {
       for (var attr in attributes) {
-        var dataType = attributes[attr]
+        if (attributes.hasOwnProperty(attr)) {
+          var dataType = attributes[attr]
 
 
-        if (Utils._.includes(dataType, 'PRIMARY KEY')) {
-          attrStr.push(Utils.addTicks(attr) + " " + dataType)
-        } else {
-          attrStr.push(Utils.addTicks(attr) + " " + dataType)
+          if (Utils._.includes(dataType, 'PRIMARY KEY')) {
+            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+          } else {
+            attrStr.push(Utils.addTicks(attr) + " " + dataType)
+          }
         }
         }
       }
       }
 
 
@@ -129,21 +136,34 @@ module.exports = (function() {
       var fields = []
       var fields = []
 
 
       for (var name in factory.attributes) {
       for (var name in factory.attributes) {
-        var definition = factory.attributes[name]
+        if (factory.attributes.hasOwnProperty(name)) {
+          var definition = factory.attributes[name]
 
 
-        if (definition && (definition.indexOf('INTEGER PRIMARY KEY') == 0)) {
-          fields.push(name)
+          if (definition && (definition.indexOf('INTEGER PRIMARY KEY') === 0)) {
+            fields.push(name)
+          }
         }
         }
       }
       }
 
 
       return fields
       return fields
+    },
+
+    hashToWhereConditions: function(hash) {
+      for (var key in hash) {
+        if (hash.hasOwnProperty(key)) {
+          var value = hash[key]
+
+          if (typeof value === 'boolean') {
+            value = !!value ? 1 : 0
+          }
+
+          hash[key] = value
+        }
+      }
+
+      return hashToWhereConditions(hash)
     }
     }
   }
   }
 
 
-  var MySqlQueryGenerator = Utils._.extend(
-    Utils._.clone(require("../query-generator")),
-    Utils._.clone(require("../mysql/query-generator"))
-  )
-
   return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
   return Utils._.extend(MySqlQueryGenerator, QueryGenerator)
 })()
 })()

spec/associations/has-many.spec.js

@@ -215,9 +215,9 @@ dialects.forEach(function(dialect) {
           })
           })
         })
         })
 
 
-        it("only get objects that fullfil the options", function(done) {
-          this.User.find({where: {username: 'John'}}).success(function (john) {
-            john.getTasks({where: {active: true}, limit: 10, order: 'ID DESC'}).success(function (tasks) {
+        it("only get objects that fulfill the options", function(done) {
+          this.User.find({ where: { username: 'John' } }).success(function (john) {
+            john.getTasks({ where: { active: true }, limit: 10, order: 'id DESC' }).success(function (tasks) {
               expect(tasks.length).toEqual(1)
               expect(tasks.length).toEqual(1)
               done();
               done();
             })
             })
@@ -259,7 +259,7 @@ dialects.forEach(function(dialect) {
           })
           })
         })
         })
 
 
-        it("only get objects that fullfil the options", function(done) {
+        it("only get objects that fulfill the options", function(done) {
           this.User.find({where: {username: 'John'}}).success(function (john) {
           this.User.find({where: {username: 'John'}}).success(function (john) {
             john.getTasks({where: {active: true}}).success(function (tasks) {
             john.getTasks({where: {active: true}}).success(function (tasks) {
               expect(tasks.length).toEqual(1)
               expect(tasks.length).toEqual(1)