不要怂,就是干,撸起袖子干!

Commit 96c7cd90 by Sascha Depold

some smart refactoring

1 parent 99db6671
...@@ -59,7 +59,7 @@ var QueryGenerator = module.exports = { ...@@ -59,7 +59,7 @@ var QueryGenerator = module.exports = {
table: tableName, table: tableName,
attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","), attributes: Utils._.keys(attrValueHash).map(function(attr){return Utils.addTicks(attr)}).join(","),
values: Utils._.values(attrValueHash).map(function(value){ values: Utils._.values(attrValueHash).map(function(value){
return Utils.transformValueByDataType(value, Utils.getDataTypeForValue(value)) return Utils.transformValueByDataType(value)
}).join(",") }).join(",")
} }
...@@ -95,8 +95,7 @@ var QueryGenerator = module.exports = { ...@@ -95,8 +95,7 @@ var QueryGenerator = module.exports = {
*/ */
hashToWhereConditions: function(hash) { hashToWhereConditions: function(hash) {
return Utils._.map(hash, function(value, key) { return Utils._.map(hash, function(value, key) {
var dataType = Utils.getDataTypeForValue(value) var _value = Utils.transformValueByDataType(value)
, _value = Utils.transformValueByDataType(value, dataType)
, _key = Utils.addTicks(key) , _key = Utils.addTicks(key)
return (_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("=") return (_value == 'NULL') ? _key + " IS NULL" : [_key, _value].join("=")
......
...@@ -25,6 +25,8 @@ var Utils = module.exports = { ...@@ -25,6 +25,8 @@ var Utils = module.exports = {
} }
}, },
transformValueByDataType: function(value, dataType) { transformValueByDataType: function(value, dataType) {
dataType = dataType || Utils.getDataTypeForValue(value)
var DataTypes = require("./data-types") var DataTypes = require("./data-types")
if((value == null)||(typeof value == 'undefined')||((dataType.indexOf(DataTypes.INTEGER) > -1) && isNaN(value))) if((value == null)||(typeof value == 'undefined')||((dataType.indexOf(DataTypes.INTEGER) > -1) && isNaN(value)))
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!