From 6fa896991204aa4bad3802905c6af789585acb5a Mon Sep 17 00:00:00 2001
From: Clark Wang <clark.wangs@gmail.com>
Date: Thu, 11 Dec 2014 15:14:35 +0800
Subject: [PATCH] fix default include in default scope fails findById

Signed-off-by: Clark Wang <clark.wangs@gmail.com>
---
 lib/dao.js                 |  1 -
 test/default-scope.test.js | 39 +++++++++++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/lib/dao.js b/lib/dao.js
index 42a4b9dc..b7a35021 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -58,7 +58,6 @@ function byIdQuery(m, id) {
   var pk = idName(m);
   var query = { where: {} };
   query.where[pk] = id;
-  m.applyScope(query);
   return query;
 }
 
diff --git a/test/default-scope.test.js b/test/default-scope.test.js
index 0d510cff..ca6c8a9b 100644
--- a/test/default-scope.test.js
+++ b/test/default-scope.test.js
@@ -2,7 +2,7 @@
 var should = require('./init.js');
 var async = require('async');
 
-var db, Category, Product, Tool, Widget, Thing;
+var db, Category, Product, Tool, Widget, Thing, Person;
 
 // This test requires a connector that can
 // handle a custom collection or table name
@@ -86,6 +86,10 @@ describe('default scope', function () {
         mongodb: { collection: 'Product' },
         memory: { collection: 'Product' }
     });
+
+    Person = db.define('Person', { name: String }, {
+      scope: { include: 'things' }
+    });
     
     // inst is only valid for instance methods
     // like save, updateAttributes
@@ -115,6 +119,9 @@ describe('default scope', function () {
     Tool.belongsTo(Category);
     Widget.belongsTo(Category);
     Thing.belongsTo(Category);
+
+    Person.hasMany(Thing);
+    Thing.belongsTo(Person);
     
     db.automigrate(done);
   });
@@ -802,7 +809,33 @@ describe('default scope', function () {
         });
       });
     });
-    
+
   });
-  
+
+  describe('with include option', function() {
+
+    before(function (done) {
+      db.automigrate(done);
+    });
+
+    before(function (done) {
+      Person.create({ id: 1, name: 'Person A' }, function(err, person) {
+        person.things.create({ name: 'Thing A' }, done);
+      });
+    });
+
+    it('should find a scoped instance with included relation - things', function(done) {
+      Person.findById(1, function(err, person) {
+        should.not.exist(err);
+        should.exist(person);
+        var things = person.things();
+        should.exist(things);
+        things.should.be.an.instanceOf(Array);
+        things.should.have.length(1);
+        done();
+      });
+    });
+
+  });
+
 });