Merge pull request #608 from terraflubb/mysql_bools_save_as_tinyints

Properly process booleans in MySQL dialect to fix #607

lib/dialects/mysql/query-generator.js

@@ -2,10 +2,20 @@ var Utils     = require("../../utils")
   , DataTypes = require("../../data-types")
   , util      = require("util")
 
+var processAndEscapeValue = function(value) {
+  var processedValue = value
+  if (value instanceof Date) {
+    processedValue = Utils.toSqlDate(value)
+  } else if (typeof value === 'boolean') {
+    processedValue = value ? 1 : 0
+  }
+  return Utils.escape(processedValue)
+}
+
 module.exports = (function() {
   var QueryGenerator = {
     addSchema: function(opts) {
-      var tableName     = undefined
+      var tableName
       var schema        = (!!opts && !!opts.options && !!opts.options.schema ? opts.options.schema : undefined)
       var schemaDelimiter  = (!!opts && !!opts.options && !!opts.options.schemaDelimiter ? opts.options.schemaDelimiter : undefined)
 
@@ -131,7 +141,7 @@ module.exports = (function() {
       var query      = "ALTER TABLE `<%= tableName %>` CHANGE <%= attributes %>;"
       var attrString = []
 
-      for (attrName in attributes) {
+      for (var attrName in attributes) {
         var definition = attributes[attrName]
 
         attrString.push(Utils._.template('`<%= attrName %>` `<%= attrName %>` <%= definition %>')({
@@ -234,9 +244,7 @@ module.exports = (function() {
 
       var table = QueryGenerator.addQuotes(tableName)
       var attributes = Object.keys(attrValueHash).map(function(attr){return QueryGenerator.addQuotes(attr)}).join(",")
-      var values = Utils._.values(attrValueHash).map(function(value){
-          return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
-        }).join(",")
+      var values = Utils._.values(attrValueHash).map(processAndEscapeValue).join(",")
 
       var query = "INSERT INTO " + table + " (" + attributes + ") VALUES (" + values + ");"
 
@@ -248,9 +256,7 @@ module.exports = (function() {
 
       Utils._.forEach(attrValueHashes, function(attrValueHash) {
         tuples.push("(" +
-          Utils._.values(attrValueHash).map(function(value){
-            return Utils.escape((value instanceof Date) ? Utils.toSqlDate(value) : value)
-          }).join(",") +
+          Utils._.values(attrValueHash).map(processAndEscapeValue).join(",") +
         ")")
       })
 
@@ -269,9 +275,9 @@ module.exports = (function() {
 
       for (var key in attrValueHash) {
         var value  = attrValueHash[key]
-          , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
+          , _value = processAndEscapeValue(value)
 
-        values.push(QueryGenerator.addQuotes(key) + "=" + Utils.escape(_value))
+        values.push(QueryGenerator.addQuotes(key) + "=" + _value)
       }
 
       var query = "UPDATE " + QueryGenerator.addQuotes(tableName) +
@@ -285,7 +291,7 @@ module.exports = (function() {
       options = options || {}
 
       var table = QueryGenerator.addQuotes(tableName)
-      var where = QueryGenerator.getWhereConditions(where)
+      where = QueryGenerator.getWhereConditions(where)
       var limit = ""
 
       if(Utils._.isUndefined(options.limit)) {
@@ -305,7 +311,7 @@ module.exports = (function() {
       options = options || {}
 
       var table = QueryGenerator.addQuotes(tableName)
-      var where = QueryGenerator.getWhereConditions(where)
+      where = QueryGenerator.getWhereConditions(where)
 
       var query = "DELETE FROM " + table + " WHERE " + where
 
@@ -319,14 +325,14 @@ module.exports = (function() {
 
       for (var key in attrValueHash) {
         var value  = attrValueHash[key]
-          , _value = (value instanceof Date) ? Utils.toSqlDate(value) : value
+          , _value = processAndEscapeValue(value)
 
-        values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.addQuotes(key) + " + " +Utils.escape(_value))
+        values.push(QueryGenerator.addQuotes(key) + "=" + QueryGenerator.addQuotes(key) + " + " + _value)
       }
 
       var table = QueryGenerator.addQuotes(tableName)
-      var values =  values.join(",")
-      var where = QueryGenerator.getWhereConditions(where)
+      values = values.join(",")
+      where = QueryGenerator.getWhereConditions(where)
 
       var query = "UPDATE " + table + " SET " + values + " WHERE " + where
 
@@ -425,20 +431,18 @@ module.exports = (function() {
 
         if (Array.isArray(value)) {
           // is value an array?
-          if (value.length == 0) { value = [null] }
-          _value = "(" + value.map(function(subValue) {
-            return Utils.escape(subValue);
-          }).join(',') + ")"
+          if (value.length === 0) { value = [null] }
+          _value = "(" + value.map(processAndEscapeValue).join(',') + ")"
 
           result.push([_key, _value].join(" IN "))
-        } else if ((value) && (typeof value == 'object')) {
+        } else if ((value) && (typeof value == 'object') && !(value instanceof Date)) {
           // is value an object?
 
           //using as sentinel for join column => value
           _value = value.join.split('.').map(function(col){ return QueryGenerator.addQuotes(col) }).join(".")
           result.push([_key, _value].join("="))
         } else {
-          _value = Utils.escape(value)
+          _value = processAndEscapeValue(value)
           result.push((_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("="))
         }
       }
@@ -475,7 +479,7 @@ module.exports = (function() {
             template += " auto_increment"
           }
 
-          if ((dataType.defaultValue != undefined) && (dataType.defaultValue != DataTypes.NOW)) {
+          if ((dataType.defaultValue !== undefined) && (dataType.defaultValue != DataTypes.NOW)) {
             template += " DEFAULT " + Utils.escape(dataType.defaultValue)
           }
 

spec-jasmine/mysql/query-generator.spec.js

@@ -197,6 +197,12 @@ describe('QueryGenerator', function() {
         arguments: ['myTable', {name: 'foo', foo: 1, nullValue: undefined}],
         expectation: "INSERT INTO `myTable` (`name`,`foo`) VALUES ('foo',1);",
         context: {options: {omitNull: true}}
+      }, {
+        arguments: ['myTable', {foo: false}],
+        expectation: "INSERT INTO `myTable` (`foo`) VALUES (0);"
+      }, {
+        arguments: ['myTable', {foo: true}],
+        expectation: "INSERT INTO `myTable` (`foo`) VALUES (1);"
       }
     ],
 
@@ -228,6 +234,9 @@ describe('QueryGenerator', function() {
         arguments: ['myTable', [{name: 'foo', foo: 1, nullValue: undefined}, {name: 'bar', foo: 2, undefinedValue: undefined}]],
         expectation: "INSERT INTO `myTable` (`name`,`foo`,`nullValue`) VALUES ('foo',1,NULL),('bar',2,NULL);",
         context: {options: {omitNull: true}} // Note: As above
+      }, {
+        arguments: ['myTable', [{name: "foo", value: true}, {name: 'bar', value: false}]],
+        expectation: "INSERT INTO `myTable` (`name`,`value`) VALUES ('foo',1),('bar',0);"
       }
     ],
 
@@ -255,6 +264,12 @@ describe('QueryGenerator', function() {
         arguments: ['myTable', {bar: 2, nullValue: null}, {name: 'foo'}],
         expectation: "UPDATE `myTable` SET `bar`=2 WHERE `name`='foo'",
         context: {options: {omitNull: true}}
+      }, {
+        arguments: ['myTable', {bar: false}, {name: 'foo'}],
+        expectation: "UPDATE `myTable` SET `bar`=0 WHERE `name`='foo'"
+      }, {
+        arguments: ['myTable', {bar: true}, {name: 'foo'}],
+        expectation: "UPDATE `myTable` SET `bar`=1 WHERE `name`='foo'"
       }
     ],
 
@@ -325,6 +340,27 @@ describe('QueryGenerator', function() {
       {
         arguments: [{ id: [] }],
         expectation: "`id` IN (NULL)"
+      },
+      {
+        arguments: [{ maple: false, bacon: true }],
+        expectation: "`maple`=0 AND `bacon`=1"
+      },
+      {
+        arguments: [{ beaver: [false, true] }],
+        expectation: "`beaver` IN (0,1)"
+      },
+      {
+        arguments: [{birthday: new Date(Date.UTC(2011, 6, 1, 10, 1, 55))}],
+        expectation: "`birthday`='2011-07-01 10:01:55'"
+      },
+      {
+        arguments: [{ birthday: new Date(Date.UTC(2011, 6, 1, 10, 1, 55)),
+                      otherday: new Date(Date.UTC(2013, 6, 2, 10, 1, 22)) }],
+        expectation: "`birthday`='2011-07-01 10:01:55' AND `otherday`='2013-07-02 10:01:22'"
+      },
+      {
+        arguments: [{ birthday: [new Date(Date.UTC(2011, 6, 1, 10, 1, 55)), new Date(Date.UTC(2013, 6, 2, 10, 1, 22))] }],
+        expectation: "`birthday` IN ('2011-07-01 10:01:55','2013-07-02 10:01:22')"
       }
     ]
   }