Fix: fix limit 1 for find method

arterli · Feb 23, 2016 · 33918c4 · 33918c4
1 parent 9312efb
commit 33918c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/model/base.js b/src/model/base.js
@@ -91,7 +91,10 @@ export default class extends Base {
   async parseOptions(oriOpts, extraOptions){
     let options = think.extend({}, this._options);
     if (think.isObject(oriOpts)) {
-      options = think.extend(options, oriOpts, extraOptions);
+      options = think.extend(options, oriOpts);
+    }
+    if(extraOptions){
+      options = think.extend(options, extraOptions);
     }
     //clear options
     this._options = {};
@@ -109,8 +112,8 @@ export default class extends Base {
       options.table += ' AS ' + options.alias;
     }
 
-    if(!think.isObject(oriOpts)){
-      options = think.extend(options, this.parseWhereOptions(oriOpts, extraOptions));
+    if(oriOpts !== undefined && !think.isObject(oriOpts)){
+      options = think.extend(options, this.parseWhereOptions(oriOpts));
     }
     //check where key
     if(options.where && !think.isEmpty(schema)){

diff --git a/test/model/base.js b/test/model/base.js
@@ -102,9 +102,9 @@ describe('model/base.js', function(){
         return Promise.resolve({
           insertId: 1000
         });
-      }else if(sql.trim() === "SELECT * FROM `think_user` WHERE ( `id` = 897 )"){
+      }else if(sql.trim() === "SELECT * FROM `think_user` WHERE ( `id` = 897 ) LIMIT 1"){
         return Promise.resolve([]);
-      }else if(sql.trim() === "SELECT * FROM `think_user` WHERE ( `id` = 898 )"){
+      }else if(sql.trim() === "SELECT * FROM `think_user` WHERE ( `id` = 898 ) LIMIT 1"){
         return Promise.resolve([{
           id: 898
         }]);
@@ -776,7 +776,7 @@ describe('model/base.js', function(){
   })
   it('find', function(done){
     instance.where({id: 100}).find().then(function(data){
-      assert.equal(instance.getLastSql(), "SELECT * FROM `think_user` WHERE ( `id` = 100 )");
+      assert.equal(instance.getLastSql(), "SELECT * FROM `think_user` WHERE ( `id` = 100 ) LIMIT 1");
       assert.deepEqual(data, { id: 7565, title: 'title1', cate_id: 1, cate_no: 0 })
       done();
     })