Merge pull request #1108 from strongloop/fix_geo_2.x

Fix the bug when near filter is used

lib/dao.js

@@ -1798,11 +1798,7 @@ DataAccessObject.find = function find(query, options, cb) {
   var near = query && geo.nearFilter(query.where);
   var supportsGeo = !!connector.buildNearFilter;
 
-  if (near) {
+  if (query.where && near && !supportsGeo) {
-    if (supportsGeo) {
-      // convert it
-      connector.buildNearFilter(query, near);
-    } else if (query.where) {
     // do in memory query
     // using all documents
     // TODO [fabien] use default scope here?
@@ -1825,6 +1821,7 @@ DataAccessObject.find = function find(query, options, cb) {
         queryGeo(ctx.query);
       });
     }
+
     function queryGeo(query) {
       function geoCallback(err, data) {
         var memory = new Memory();
@@ -1860,7 +1857,9 @@ DataAccessObject.find = function find(query, options, cb) {
       // already handled
       return cb.promise;
     }
-    }
+  } else {
+    if (near && supportsGeo) {
+      connector.buildNearFilter(query, near);
     }
 
     var allCb = function(err, data) {
@@ -1966,6 +1965,7 @@ DataAccessObject.find = function find(query, options, cb) {
       });
     }
     return cb.promise;
+  }
 };
 
 function isDefined(value) {

test/persistence-hooks.suite.js

@@ -86,6 +86,19 @@ module.exports = function(dataSource, should, connectorCapabilities) {
           });
       });
 
+      it('triggers correct hooks when near filter is used', function(done) {
+        monitorHookExecution();
+        var query = { where:
+          { location: { near: '10,20', maxDistance: '10', unit: 'meters' }},
+        };
+
+        TestModel.find(query, function(err, list) {
+          if (err) return done(err);
+          hookMonitor.names.should.eql(['access']);
+          done();
+        });
+      });
+
       it('should not trigger hooks, if notify is false', function(done) {
         monitorHookExecution();
         TestModel.find(