archive-gh-me/thinkjs
1
0
Fork 0
mirror of https://github.com/thinkjs/thinkjs.git synced 2026-01-25 14:42:47 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
welefen 2014-01-16 19:53:20 +08:00
parent 4da836c0e4
commit bdfdb7e2f1
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Extend/Model/AdvModel.class.js
View File

@ -185,9 +185,11 @@ module.exports = Model(function(){
db.parseOrder(value.order),
db.parseLimit(value.limit)
];
return self.query(sql, queryData).then(function(mapData){
return self.parseSql(sql, queryData).then(function(sql){
return self.db.select(sql, parsedOptions.cache);
}).then(function(mapData){
self.parseRelationData(data, mapData, mapName, mapKey, mapfKey, true);
})
});
})
break;
default:

13
lib/Lib/Core/Db.class.js
View File

@ -647,10 +647,15 @@ var Db = module.exports = Class(function(){
* @return {[type]} [description]
*/
select: function(options){
options = options || {};
this.model = options.model;
var sql = this.buildSelectSql(options);
var cache = options.cache;
if (isString(options) && options.indexOf('SELECT') > -1) {
var sql = options;
var cache = arguments[1];
}else{
options = options || {};
this.model = options.model;
var sql = this.buildSelectSql(options);
var cache = options.cache;
}
var self = this;
//获取数据
function queryData(){