Minimize diff

Author: benjie

src/lib.ts

@@ -279,6 +279,50 @@ export function processSharedOptions<
 
 export type Releasers = Array<() => void | Promise<void>>;
 
+export async function assertPool(
+  compiledSharedOptions: CompiledSharedOptions,
+  releasers: Releasers,
+): Promise<Pool> {
+  const {
+    resolvedPreset: {
+      worker: { maxPoolSize, connectionString },
+    },
+    _rawOptions,
+  } = compiledSharedOptions;
+  assert.ok(
+    // NOTE: we explicitly want `_rawOptions.connectionString` here - we don't
+    // mind if `connectionString` is set as part of the preset.
+    !_rawOptions.pgPool || !_rawOptions.connectionString,
+    "Both `pgPool` and `connectionString` are set, at most one of these options should be provided",
+  );
+  let pgPool: Pool;
+  if (_rawOptions.pgPool) {
+    pgPool = _rawOptions.pgPool;
+    if (pgPool.listeners("error").length === 0) {
+      console.warn(
+        `Your pool doesn't have error handlers! See: https://err.red/wpeh`,
+      );
+      installErrorHandlers(compiledSharedOptions, releasers, pgPool);
+    }
+  } else if (connectionString) {
+    pgPool = makeNewPool(compiledSharedOptions, releasers, {
+      connectionString,
+      max: maxPoolSize,
+    });
+  } else if (process.env.PGDATABASE) {
+    pgPool = makeNewPool(compiledSharedOptions, releasers, {
+      /* Pool automatically pulls settings from envvars */
+      max: maxPoolSize,
+    });
+  } else {
+    throw new Error(
+      "You must either specify `pgPool` or `connectionString`, or you must make the `DATABASE_URL` or `PG*` environmental variables available.",
+    );
+  }
+
+  return pgPool;
+}
+
 function makeNewPool(
   compiledSharedOptions: CompiledSharedOptions,
   releasers: Releasers,
@@ -340,50 +384,6 @@ function installErrorHandlers(
   return pgPool;
 }
 
-export async function assertPool(
-  compiledSharedOptions: CompiledSharedOptions,
-  releasers: Releasers,
-): Promise<Pool> {
-  const {
-    resolvedPreset: {
-      worker: { maxPoolSize, connectionString },
-    },
-    _rawOptions,
-  } = compiledSharedOptions;
-  assert.ok(
-    // NOTE: we explicitly want `_rawOptions.connectionString` here - we don't
-    // mind if `connectionString` is set as part of the preset.
-    !_rawOptions.pgPool || !_rawOptions.connectionString,
-    "Both `pgPool` and `connectionString` are set, at most one of these options should be provided",
-  );
-  let pgPool: Pool;
-  if (_rawOptions.pgPool) {
-    pgPool = _rawOptions.pgPool;
-    if (pgPool.listeners("error").length === 0) {
-      console.warn(
-        `Your pool doesn't have error handlers! See: https://err.red/wpeh`,
-      );
-      installErrorHandlers(compiledSharedOptions, releasers, pgPool);
-    }
-  } else if (connectionString) {
-    pgPool = makeNewPool(compiledSharedOptions, releasers, {
-      connectionString,
-      max: maxPoolSize,
-    });
-  } else if (process.env.PGDATABASE) {
-    pgPool = makeNewPool(compiledSharedOptions, releasers, {
-      /* Pool automatically pulls settings from envvars */
-      max: maxPoolSize,
-    });
-  } else {
-    throw new Error(
-      "You must either specify `pgPool` or `connectionString`, or you must make the `DATABASE_URL` or `PG*` environmental variables available.",
-    );
-  }
-
-  return pgPool;
-}
-
 export type Release = () => PromiseOrDirect<void>;
 
 export async function withReleasers<T>(