bug(scopes) Mark unscoped model as .scoped to prevent injection of default scope…

… on includes. Closes #4663

changelog.md

+# NEXT
+- [FIXED] Mark unscoped model as `.scoped`, to prevent injection of default scope on includes [#4663](https://github.com/sequelize/sequelize/issues/4663)
+
 # 3.12.1
 - [FIXED] Mark postgres connection as invalid if the connection is reset [#4661](https://github.com/sequelize/sequelize/pull/4661)
 - [FIXED] Remove usage of "limit" in cases where it's unnecessary, which fixes some of the cases mentioned in [#4404] (https://github.com/sequelize/sequelize/issues/4404)

lib/model.js

@@ -1164,6 +1164,7 @@ Model.prototype.scope = function(option) {
     , scopeName;
 
   self.$scope = {};
+  self.scoped = true;
 
   if (!option) {
     return self;
@@ -1216,8 +1217,6 @@ Model.prototype.scope = function(option) {
     }
   });
 
-  self.scoped = true;
-
   return self;
 };
 

test/unit/model/scope.test.js

@@ -80,6 +80,8 @@ describe(Support.getTestDialectTeaser('Model'), function() {
     it('should be able to unscope', function () {
       expect(Company.scope(null).$scope).to.be.empty;
       expect(Company.unscoped().$scope).to.be.empty;
+      // Yes, being unscoped is also a scope - this prevents inject defaultScope, when including a scoped model, see #4663
+      expect(Company.unscoped().scoped).to.be.ok;
     });
 
     it('should be able to merge scopes', function() {