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

Commit c1f2423e by Sascha Depold

some refactoring

1 parent cd3a58b1
Showing with 11 additions and 13 deletions
...@@ -4,6 +4,14 @@ SequelizeHelper = { ...@@ -4,6 +4,14 @@ SequelizeHelper = {
sys.puts(sys.inspect(obj)) sys.puts(sys.inspect(obj))
}, },
evaluateTemplate: function(template, replacements) {
var result = template
SequelizeHelper.Hash.keys(replacements).forEach(function(key) {
result = result.replace("%{" + key + "}", replacements[key])
})
return result
},
SQL: { SQL: {
manyToManyTableName: function(t1, t2) { manyToManyTableName: function(t1, t2) {
return [t1.tableName, t2.tableName].sort().join("") return [t1.tableName, t2.tableName].sort().join("")
...@@ -45,7 +53,7 @@ SequelizeHelper = { ...@@ -45,7 +53,7 @@ SequelizeHelper = {
}, },
transformValueByDataType: function(value, dataType) { transformValueByDataType: function(value, dataType) {
if(typeof value == 'undefined') if((value == null)||(typeof value == 'undefined'))
return "NULL" return "NULL"
if(dataType.indexOf(Sequelize.INTEGER) > -1) if(dataType.indexOf(Sequelize.INTEGER) > -1)
...@@ -63,10 +71,8 @@ SequelizeHelper = { ...@@ -63,10 +71,8 @@ SequelizeHelper = {
options = options || {} options = options || {}
SequelizeHelper.Hash.keys(actualValues).forEach(function(key) { SequelizeHelper.Hash.forEach(actualValues, function(value, key) {
var value = actualValues[key], var dataType = object.table.attributes[key]
dataType = object.attributes[key]
result.push([key, SequelizeHelper.SQL.transformValueByDataType(value, dataType)].join(" = ")) result.push([key, SequelizeHelper.SQL.transformValueByDataType(value, dataType)].join(" = "))
}) })
...@@ -86,14 +92,6 @@ SequelizeHelper = { ...@@ -86,14 +92,6 @@ SequelizeHelper = {
} }
}, },
evaluateTemplate: function(template, replacements) {
var result = template
SequelizeHelper.Hash.keys(replacements).forEach(function(key) {
result = result.replace("%{" + key + "}", replacements[key])
})
return result
},
Hash: { Hash: {
forEach: function(object, func) { forEach: function(object, func) {
SequelizeHelper.Hash.keys(object).forEach(function(key) { SequelizeHelper.Hash.keys(object).forEach(function(key) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!