Merge pull request #84 from flyvictor/WEB-5601-deep-query-modificator…

…s-rewrite WEB-5601 deep query modificators rewrite
flyvictor · Oct 15, 2014 · d0e1906 · d0e1906
2 parents a247833 + ed93457
commit d0e1906
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/lib/adapters/mongodb.js b/lib/adapters/mongodb.js
@@ -289,6 +289,8 @@ adapter.findMany = function(model, query, projection) {
       }else if(key === 'or' || key === 'and') {
         query['$' + key] = _.map(val, parseQuery);
         delete query[key];
+      }else if(key === '$or' || key === '$and'){
+        query[key] = _.map(val, parseQuery);
       }
     });
 

diff --git a/test/fortune-mongodb/mongodb.spec.js b/test/fortune-mongodb/mongodb.spec.js
@@ -434,6 +434,28 @@ module.exports = function(options){
             done();
           });
       });
+      it('should deeply parse nested $and, $or, or, and queries', function(done){
+        var query = {
+          $or: [{
+            or: [{
+              $and: [{
+                and: [{
+                  name: {
+                    regex: 'WALLY',
+                    options: 'i'
+                  }
+                }]
+              }]
+            }]
+          }]
+        };
+        adapter.findMany('person', query)
+          .then(function(docs){
+            docs.length.should.equal(1);
+            docs[0].name.should.equal('Wally');
+            done();
+          });
+      });
     });
   });