feat: simplify connection overrides

dadi · Dec 4, 2017 · f47685b · f47685b
1 parent 3689a61
commit f47685b
Show file tree

Hide file tree

Showing 3 changed files with 4,470 additions and 8 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -495,11 +495,9 @@ DataStore.prototype.getConnectionOptions = function (overrideOptions) {
     (overrideOptions.database &&
     overrideOptions.database !== connectionOptions.databaase)
 
-  // override ok and config block exists with the specified database key
-  if (allowOverride && this.config[overrideOptions.database]) {
-    connectionOptions = Object.assign(connectionOptions, { database: overrideOptions.database }, this.config[overrideOptions.database])
-  } else if (allowOverride && typeof this.config[overrideOptions.database] === 'undefined') {
-    throw new Error(`Requested database "${overrideOptions.database}" is not configured`)
+  // override allowed, use defaults or config block if one exists for the specified database key
+  if (allowOverride) {
+    connectionOptions = Object.assign(connectionOptions, { database: overrideOptions.database }, this.config.databases[overrideOptions.database])
   }
 
   debug('connectionOptions %o', connectionOptions)