Fixes #2221: Nested Or queries (#2231)

* Adds repro for #2221 * Fixes nested or queries * not for PG yet
2016-07-09 01:03:13 -04:00
parent 61aa5a8d62
commit a55466fde8
2 changed files with 30 additions and 2 deletions
--- a/src/Controllers/DatabaseController.js
+++ b/src/Controllers/DatabaseController.js
@@ -540,8 +540,10 @@ DatabaseController.prototype.reduceInRelation = function(className, query, schem
    return Promise.all(ors.map((aQuery, index) => {
      return this.reduceInRelation(className, aQuery, schema).then((aQuery) => {
        query['$or'][index] = aQuery;
-      })
-    }));
+      });
+    })).then(() => {
+      return Promise.resolve(query);
+    });
  }

  let promises = Object.keys(query).map((key) => {