Connection configuration provider - without changes to drivers

lib/client.js

@@ -259,17 +259,7 @@ Object.assign(Client.prototype, {
     // choose the smallest, positive timeout setting and set on poolConfig
     poolConfig.acquireTimeoutMillis = Math.min(...timeouts);
 
-    const handleConnectionConfigProviderResult = (result) => {
-      if (result.expirationChecker) {
-        this.connectionConfigExpirationChecker = result.expirationChecker;
-        delete result.expirationChecker;
-      } else {
-        delete this.connectionConfigExpirationChecker;
-      }
-      this.connectionSettings = result;
-    };
-
-    const updatePoolConnectionSettingsFromProvider = () => {
+    const updatePoolConnectionSettingsFromProvider = async () => {
       if (!this.connectionConfigProvider) {
         return; // static configuration, nothing to update
       }
@@ -279,34 +269,26 @@ Object.assign(Client.prototype, {
       ) {
         return; // not expired, reuse existing connection
       }
-      const providerResult = this.connectionConfigProvider();
-      if (!providerResult.then) {
-        handleConnectionConfigProviderResult(providerResult);
-        return; // provider is synchronous, no need to return a promise
+      const providerResult = await this.connectionConfigProvider();
+      if (providerResult.expirationChecker) {
+        this.connectionConfigExpirationChecker =
+          providerResult.expirationChecker;
+        delete providerResult.expirationChecker;
+      } else {
+        delete this.connectionConfigExpirationChecker;
       }
-      return providerResult.then((connectionSettings) => {
-        handleConnectionConfigProviderResult(connectionSettings);
-      });
+      this.connectionSettings = providerResult;
     };
 
-    const createPoolConnection = () => {
-      return this.acquireRawConnection().then(async (connection) => {
+    return Object.assign(poolConfig, {
+      create: async () => {
+        await updatePoolConnectionSettingsFromProvider();
+        const connection = await this.acquireRawConnection();
         connection.__knexUid = uniqueId('__knexUid');
-
         if (poolConfig.afterCreate) {
           await promisify(poolConfig.afterCreate)(connection);
         }
         return connection;
-      });
-    };
-
-    return Object.assign(poolConfig, {
-      create: () => {
-        const promiseOfUpdate = updatePoolConnectionSettingsFromProvider();
-        if (promiseOfUpdate) {
-          return promiseOfUpdate.then(createPoolConnection.bind(this));
-        }
-        return createPoolConnection.bind(this)();
       },
 
       destroy: (connection) => {

test/tape/index.js

@@ -13,7 +13,6 @@ require('./migrate');
 require('./pool');
 require('./knex');
 require('./invalid-db-setup')(knexfile);
-require('./connection-config-provider');
 
 Object.keys(knexfile).forEach(function(key) {
   var knex = makeKnex(knexfile[key]);