Merge pull request #3798 from seegno-forks/enhancement/allow-raw-queries-on-model-scopes

Add hability to use raw queries in Model scopes

lib/model.js

@@ -593,7 +593,7 @@ module.exports = (function() {
       if (!!scope) {
       if (!!scope) {
         _.assign(self.$scope, scope, function scopeCustomizer(objectValue, sourceValue, key) {
         _.assign(self.$scope, scope, function scopeCustomizer(objectValue, sourceValue, key) {
           if (key === 'where') {
           if (key === 'where') {
-            return _.assign(objectValue || {}, sourceValue);
+            return Array.isArray(sourceValue) ? sourceValue : _.assign(objectValue || {}, sourceValue);
           } else if (key === 'include' && Array.isArray(objectValue) && Array.isArray(sourceValue)) {
           } else if (key === 'include' && Array.isArray(objectValue) && Array.isArray(sourceValue)) {
             return objectValue.concat(sourceValue);
             return objectValue.concat(sourceValue);
           }
           }

test/unit/model/scope.test.js

@@ -12,6 +12,11 @@ describe(Support.getTestDialectTeaser('Model'), function() {
     , Company;
     , Company;
 
 
   var scopes = {
   var scopes = {
+    complexFunction: function(value) {
+      return {
+        where: [(value + ' IN (SELECT foobar FROM some_sql_function(foo.bar))')]
+      };
+    },
     somethingTrue: {
     somethingTrue: {
       where: {
       where: {
         something: true,
         something: true,
@@ -91,7 +96,6 @@ describe(Support.getTestDialectTeaser('Model'), function() {
         expect(scoped2.$scope).to.deep.equal(scopes.somethingFalse);
         expect(scoped2.$scope).to.deep.equal(scopes.somethingFalse);
     });
     });
 
 
-
     it('should work with function scopes', function () {
     it('should work with function scopes', function () {
       expect(Company.scope({method: ['actualValue', 11]}).$scope).to.deep.equal({
       expect(Company.scope({method: ['actualValue', 11]}).$scope).to.deep.equal({
         where: {
         where: {
@@ -128,6 +132,18 @@ describe(Support.getTestDialectTeaser('Model'), function() {
       });
       });
     });
     });
 
 
+    it('should be able to use raw queries', function () {
+      expect(Company.scope([{method: ['complexFunction', 'qux']}]).$scope).to.deep.equal({
+        where: [ 'qux IN (SELECT foobar FROM some_sql_function(foo.bar))' ]
+      });
+    });
+
+    it('should override the default scope', function () {
+      expect(Company.scope(['defaultScope', {method: ['complexFunction', 'qux']}]).$scope).to.deep.equal({
+        where: [ 'qux IN (SELECT foobar FROM some_sql_function(foo.bar))' ]
+      });
+    });
+
     it('should emit an error for scopes that dont exist', function() {
     it('should emit an error for scopes that dont exist', function() {
       expect(function () {
       expect(function () {
         Company.scope('doesntexist');
         Company.scope('doesntexist');