Merge pull request #14577 from Automattic/vkarpov15/gh-12335

handle initially null driver when instantiating Mongoose for Rollup support
Automattic · May 9, 2024 · 55564e1 · 55564e1
2 parents db29c08 + 19e744a
commit 55564e1
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 17 deletions.
diff --git a/lib/error/browserMissingSchema.js b/lib/error/browserMissingSchema.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 
 class MissingSchemaError extends MongooseError {

diff --git a/lib/error/divergentArray.js b/lib/error/divergentArray.js
@@ -5,7 +5,7 @@
 
 'use strict';
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 class DivergentArrayError extends MongooseError {
   /**

diff --git a/lib/error/eachAsyncMultiError.js b/lib/error/eachAsyncMultiError.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 
 /**

diff --git a/lib/error/invalidSchemaOption.js b/lib/error/invalidSchemaOption.js
@@ -5,7 +5,7 @@
 
 'use strict';
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 class InvalidSchemaOptionError extends MongooseError {
   /**

diff --git a/lib/error/missingSchema.js b/lib/error/missingSchema.js
@@ -5,7 +5,7 @@
 
 'use strict';
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 class MissingSchemaError extends MongooseError {
   /**

diff --git a/lib/error/notFound.js b/lib/error/notFound.js
@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 const util = require('util');
 
 class DocumentNotFoundError extends MongooseError {

diff --git a/lib/error/objectExpected.js b/lib/error/objectExpected.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 
 class ObjectExpectedError extends MongooseError {

diff --git a/lib/error/objectParameter.js b/lib/error/objectParameter.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 class ObjectParameterError extends MongooseError {
   /**

diff --git a/lib/error/overwriteModel.js b/lib/error/overwriteModel.js
@@ -5,7 +5,7 @@
 
 'use strict';
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 
 class OverwriteModelError extends MongooseError {

diff --git a/lib/error/parallelSave.js b/lib/error/parallelSave.js
@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 class ParallelSaveError extends MongooseError {
   /**

diff --git a/lib/error/strict.js b/lib/error/strict.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 
 class StrictModeError extends MongooseError {

diff --git a/lib/error/strictPopulate.js b/lib/error/strictPopulate.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 class StrictPopulateError extends MongooseError {
   /**

diff --git a/lib/error/validator.js b/lib/error/validator.js
@@ -4,7 +4,7 @@
 
 'use strict';
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 
 class ValidatorError extends MongooseError {

diff --git a/lib/error/version.js b/lib/error/version.js
@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 
-const MongooseError = require('./');
+const MongooseError = require('./mongooseError');
 
 class VersionError extends MongooseError {
   /**

diff --git a/lib/index.js b/lib/index.js
@@ -4,10 +4,14 @@
  * Module dependencies.
  */
 
-require('./driver').set(require('./drivers/node-mongodb-native'));
+const mongodbDriver = require('./drivers/node-mongodb-native');
+
+require('./driver').set(mongodbDriver);
 
 const mongoose = require('./mongoose');
 
+mongoose.setDriver(mongodbDriver);
+
 mongoose.Mongoose.prototype.mongo = require('mongodb');
 
 module.exports = mongoose;
diff --git a/lib/mongoose.js b/lib/mongoose.js
@@ -68,8 +68,8 @@ function Mongoose(options) {
     autoCreate: true,
     autoSearchIndex: false
   }, options);
-  const createInitialConnection = utils.getOption('createInitialConnection', this.options);
-  if (createInitialConnection == null || createInitialConnection) {
+  const createInitialConnection = utils.getOption('createInitialConnection', this.options) ?? true;
+  if (createInitialConnection && this.__driver != null) {
     const conn = this.createConnection(); // default connection
     conn.models = this.models;
   }
@@ -169,6 +169,9 @@ Mongoose.prototype.setDriver = function setDriver(driver) {
   const oldDefaultConnection = _mongoose.connections[0];
   _mongoose.connections = [new Connection(_mongoose)];
   _mongoose.connections[0].models = _mongoose.models;
+  if (oldDefaultConnection == null) {
+    return _mongoose;
+  }
 
   // Update all models that pointed to the old default connection to
   // the new default connection, including collections