From bdfdb7e2f124b31d3a3ff9f415435f549ea7804d Mon Sep 17 00:00:00 2001
From: welefen <welefen@gmail.com>
Date: Thu, 16 Jan 2014 19:53:20 +0800
Subject: [PATCH] update

---
 lib/Extend/Model/AdvModel.class.js |  6 ++++--
 lib/Lib/Core/Db.class.js           | 13 +++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/Extend/Model/AdvModel.class.js b/lib/Extend/Model/AdvModel.class.js
index 302999a0..bac7e374 100644
--- a/lib/Extend/Model/AdvModel.class.js
+++ b/lib/Extend/Model/AdvModel.class.js
@@ -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:
diff --git a/lib/Lib/Core/Db.class.js b/lib/Lib/Core/Db.class.js
index e4652b3e..374baaf7 100644
--- a/lib/Lib/Core/Db.class.js
+++ b/lib/Lib/Core/Db.class.js
@@ -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(){