fix(aggregate): handle calling aggregate() before initial connectio…

…n succeeds Fix #10722 Re: #10610
Automattic · Sep 18, 2021 · 4e2f7bf · 4e2f7bf
1 parent f0e6126
commit 4e2f7bf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 26 deletions.
diff --git a/lib/aggregate.js b/lib/aggregate.js
@@ -721,9 +721,14 @@ Aggregate.prototype.explain = function(callback) {
 
       this.options.explain = true;
 
-      model.collection.
-        aggregate(this._pipeline, this.options || {}).
-        explain((error, result) => {
+      model.collection.aggregate(this._pipeline, this.options, (error, cursor) => {
+        if (error != null) {
+          const _opts = { error: error };
+          return model.hooks.execPost('aggregate', this, [null], _opts, error => {
+            cb(error);
+          });
+        }
+        cursor.explain((error, result) => {
           const _opts = { error: error };
           return model.hooks.execPost('aggregate', this, [result], _opts, error => {
             if (error) {
@@ -732,6 +737,7 @@ Aggregate.prototype.explain = function(callback) {
             return cb(null, result);
           });
         });
+      });
     });
   }, model.events);
 };
@@ -977,31 +983,20 @@ Aggregate.prototype.exec = function(callback) {
 
       const options = utils.clone(this.options || {});
 
-      const cursor = collection.aggregate(this._pipeline, options);
+      collection.aggregate(this._pipeline, options, (err, cursor) => {
+        if (err != null) {
+          return cb(err);
+        }
 
-      if (cursor != null && typeof cursor.then === 'function') {
-        return cursor.then(cursor => {
-          cursor.toArray((error, result) => {
-            const _opts = { error: error };
-            model.hooks.execPost('aggregate', this, [result], _opts, (error, result) => {
-              if (error) {
-                return cb(error);
-              }
+        cursor.toArray((error, result) => {
+          const _opts = { error: error };
+          model.hooks.execPost('aggregate', this, [result], _opts, (error, result) => {
+            if (error) {
+              return cb(error);
+            }
 
-              cb(null, result);
-            });
+            cb(null, result);
           });
-        }).catch(err => cb(err));
-      }
-
-      cursor.toArray((error, result) => {
-        const _opts = { error: error };
-        model.hooks.execPost('aggregate', this, [result], _opts, (error, result) => {
-          if (error) {
-            return cb(error);
-          }
-
-          cb(null, result);
         });
       });
     });

diff --git a/lib/drivers/node-mongodb-native/collection.js b/lib/drivers/node-mongodb-native/collection.js
@@ -66,7 +66,7 @@ NativeCollection.prototype.onClose = function(force) {
  * ignore
  */
 
-const syncCollectionMethods = { watch: true, find: true };
+const syncCollectionMethods = { watch: true, find: true, aggregate: true };
 
 /*!
  * Copy the collection methods and make them subject to queues