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

Commit 0afc6f94 by Sascha Depold

changed asterisk use for join queries

1 parent d9efb009
Showing with 16 additions and 3 deletions
......@@ -126,13 +126,26 @@ module.exports = (function() {
options.attributes = options.attributes || '*'
if (options.include) {
var tableNames = []
var tableNames = [options.table]
, optAttributes = [options.table + '.*']
for (var daoName in options.include) {
tableNames.push(Utils.addTicks(options.include[daoName].tableName))
if (options.include.hasOwnProperty(daoName)) {
var dao = options.include[daoName]
, _tableName = Utils.addTicks(dao.tableName)
tableNames.push(_tableName)
optAttributes = optAttributes.concat(
Utils._.keys(dao.attributes).map(function(attr) {
var identifer = [_tableName, Utils.addTicks(attr)]
return identifer.join('.') + ' AS ' + Utils.addTicks(identifer.join('.'))
})
)
}
}
options.table = [options.table].concat(tableNames).join(', ')
options.table = tableNames.join(', ')
options.attributes = optAttributes.join(', ')
}
if(options.where) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!