rake-db 2.27.12 → 2.27.14

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import * as orchid_core from 'orchid-core';
-import { MaybeArray, RawSQLBase, ColumnDataCheckBase, RecordString, ColumnTypeBase, EmptyObject, ColumnSchemaConfig, QueryLogOptions, AdapterBase, MaybePromise, QueryLogObject, QueryBase } from 'orchid-core';
 import * as pqb from 'pqb';
 import { ColumnsShape, Db, TableData, NoPrimaryKeyOption, ColumnType, EnumColumn, DefaultColumnTypes, DefaultSchemaConfig, DbResult, TableDataFn, TableDataItem, DbDomainArg, raw, SearchWeight, ColumnsByType, DbStructureDomainsMap } from 'pqb';
+import * as orchid_core from 'orchid-core';
+import { MaybeArray, RawSQLBase, ColumnDataCheckBase, RecordString, ColumnTypeBase, EmptyObject, ColumnSchemaConfig, QueryLogOptions, AdapterBase, MaybePromise, QueryLogObject, QueryBase } from 'orchid-core';
 
 interface CreateTableResult<Table extends string, Shape extends ColumnsShape> {
     table: Db<Table, Shape>;
@@ -1495,17 +1495,6 @@ interface RakeDbChangeFnWithPromise<CT> extends RakeDbChangeFn<CT> {
  */
 declare const rakeDbWithAdapters: RakeDbFn<AdapterBase[]>;
 declare const makeChange: (config: RakeDbConfig<ColumnSchemaConfig, unknown>) => (fn: ChangeCallback<unknown>) => MigrationChange;
-declare const runCommand: <SchemaConfig extends ColumnSchemaConfig<orchid_core.ColumnTypeBase<orchid_core.ColumnTypeSchemaArg, unknown, any, any, unknown, unknown, any, unknown, any, orchid_core.ColumnDataBase>>, CT>(adapters: AdapterBase[], config: RakeDbConfig<SchemaConfig, CT>, args?: string[]) => Promise<RakeDbResult>;
-interface RakeDbCommand {
-    run(adapters: AdapterBase[], config: AnyRakeDbConfig, args: string[]): MaybePromise<unknown>;
-    help: string;
-    helpArguments?: RecordString;
-    helpAfter?: string;
-}
-interface RakeDbCommands {
-    [K: string]: RakeDbCommand;
-}
-declare const rakeDbCommands: RakeDbCommands;
 
 declare const encodeColumnDefault: (def: unknown, values: unknown[], column?: ColumnTypeBase) => string | null;
 declare const getConstraintName: (table: string, constraint: {
@@ -1764,4 +1753,16 @@ declare const makeMigrateAdapter: (config?: Partial<MigrateFnConfig>) => ((adapt
 declare class RakeDbError extends Error {
 }
 
+declare const runCommand: <SchemaConfig extends ColumnSchemaConfig<orchid_core.ColumnTypeBase<orchid_core.ColumnTypeSchemaArg, unknown, any, any, unknown, unknown, any, unknown, any, orchid_core.ColumnDataBase>>, CT>(adapters: AdapterBase[], config: RakeDbConfig<SchemaConfig, CT>, args?: string[]) => Promise<RakeDbResult>;
+interface RakeDbCommand {
+    run(adapters: AdapterBase[], config: AnyRakeDbConfig, args: string[]): MaybePromise<unknown>;
+    help: string;
+    helpArguments?: RecordString;
+    helpAfter?: string;
+}
+interface RakeDbCommands {
+    [K: string]: RakeDbCommand;
+}
+declare const rakeDbCommands: RakeDbCommands;
+
 export { type AnyRakeDbConfig, type ChangeCallback, type DbMigration, DbStructure, type InputRakeDbConfig, type InputRakeDbConfigBase, type IntrospectedStructure, type MigrateFnConfig, RakeDbAst, type RakeDbChangeFn, type RakeDbChangeFnWithPromise, type RakeDbConfig, RakeDbError, type RakeDbFn, type SilentQueries, type StructureToAstCtx, type StructureToAstTableData, astToMigration, concatSchemaAndName, createMigrationInterface, dbColumnToAst, encodeColumnDefault, getConstraintName, getDbStructureTableData, getDbTableColumnsChecks, getExcludeName, getIndexName, getSchemaAndTableFromName, instantiateDbColumn, introspectDbSchema, makeChange, makeDomainsMap, makeFileVersion, makeMigrateAdapter, makeStructureToAstCtx, migrate, migrateAndClose, migrateFiles, migrationConfigDefaults, processRakeDbConfig, promptSelect, rakeDbCommands, rakeDbWithAdapters, runCommand, saveMigratedVersion, structureToAst, tableToAst, writeMigrationFile };

package/dist/index.js

@@ -8,6 +8,99 @@ var fs = require('fs/promises');
 require('url');
 require('node:path');
 
+class RakeDbError extends Error {
+}
+class NoPrimaryKey extends RakeDbError {
+}
+
+let currentChanges = [];
+const clearChanges = () => {
+  currentChanges = [];
+};
+const getCurrentChanges = () => currentChanges;
+const pushChange = (change) => currentChanges.push(change);
+
+const migrationConfigDefaults = {
+  schemaConfig: pqb.defaultSchemaConfig,
+  migrationsPath: path.join("src", "db", "migrations"),
+  migrationId: { serial: 4 },
+  migrationsTable: "schemaMigrations",
+  snakeCase: false,
+  commands: {},
+  log: true,
+  logger: console,
+  import() {
+    throw new Error(
+      "Add `import: (path) => import(path),` setting to `rakeDb` config"
+    );
+  }
+};
+const ensureMigrationsPath = (config) => {
+  if (!config.migrationsPath) {
+    config.migrationsPath = migrationConfigDefaults.migrationsPath;
+  }
+  if (!path.isAbsolute(config.migrationsPath)) {
+    config.migrationsPath = path.resolve(
+      config.basePath,
+      config.migrationsPath
+    );
+  }
+  return config;
+};
+const ensureBasePathAndDbScript = (config, intermediateCallers = 0) => {
+  if (config.basePath && config.dbScript) return config;
+  let filePath = orchidCore.getStackTrace()?.[3 + intermediateCallers].getFileName();
+  if (!filePath) {
+    throw new Error(
+      "Failed to determine path to db script. Please set basePath option of rakeDb"
+    );
+  }
+  if (filePath.startsWith("file://")) {
+    filePath = node_url.fileURLToPath(filePath);
+  }
+  const ext = path.extname(filePath);
+  if (ext !== ".ts" && ext !== ".js" && ext !== ".mjs") {
+    throw new Error(
+      `Add a .ts suffix to the "${path.basename(filePath)}" when calling it`
+    );
+  }
+  config.basePath = path.dirname(filePath);
+  config.dbScript = path.basename(filePath);
+  return config;
+};
+const processRakeDbConfig = (config) => {
+  const result = { ...migrationConfigDefaults, ...config };
+  if (!result.log) {
+    delete result.logger;
+  }
+  ensureBasePathAndDbScript(result, 1);
+  ensureMigrationsPath(result);
+  if (!result.recurrentPath) {
+    result.recurrentPath = path.join(
+      result.migrationsPath,
+      "recurrent"
+    );
+  }
+  if ("recurrentPath" in result && !path.isAbsolute(result.recurrentPath)) {
+    result.recurrentPath = path.resolve(result.basePath, result.recurrentPath);
+  }
+  if ("baseTable" in config && config.baseTable) {
+    const { types, snakeCase, language } = config.baseTable.prototype;
+    result.columnTypes = types || pqb.makeColumnTypes(pqb.defaultSchemaConfig);
+    if (snakeCase) result.snakeCase = true;
+    if (language) result.language = language;
+  } else {
+    const ct = "columnTypes" in config && config.columnTypes;
+    result.columnTypes = (typeof ct === "function" ? ct(
+      pqb.makeColumnTypes(pqb.defaultSchemaConfig)
+    ) : ct) || pqb.makeColumnTypes(pqb.defaultSchemaConfig);
+  }
+  if (config.migrationId === "serial") {
+    result.migrationId = { serial: 4 };
+  }
+  return result;
+};
+
 const getFirstWordAndRest = (input) => {
   const i = input.search(/(?=[A-Z])|[-_ ]/);
   if (i !== -1) {
@@ -75,13 +168,6 @@ const transaction = (adapter, fn) => {
 };
 const queryLock = (trx) => trx.query(`SELECT pg_advisory_xact_lock('${RAKE_DB_LOCK_KEY}')`);
 
-let currentChanges = [];
-const clearChanges = () => {
-  currentChanges = [];
-};
-const getCurrentChanges = () => currentChanges;
-const pushChange = (change) => currentChanges.push(change);
-
 const versionToString = (config, version) => config.migrationId === "timestamp" ? `${version}` : `${version}`.padStart(config.migrationId.serial, "0");
 const columnTypeToSql = (item) => {
   return item.data.isOfCustomType ? item instanceof pqb.DomainColumn ? quoteNameFromString(item.dataType) : quoteCustomType(item.toSQL()) : item.toSQL();
@@ -465,11 +551,6 @@ const tableMethods = {
   }
 };
 
-class RakeDbError extends Error {
-}
-class NoPrimaryKey extends RakeDbError {
-}
-
 const createTable = async (migration, up, tableName, first, second, third) => {
   let options;
   let fn;
@@ -3053,7 +3134,6 @@ const makeMigrateCommand = (migrateFn, defaultCount) => {
     }
     for (const adapter of adapters) {
       await migrateFn({ ctx: {}, adapter, config, count, force });
-      await adapter.close();
     }
   };
 };
@@ -3523,7 +3603,7 @@ const resetDb = async (adapters, config) => {
   await dropDb(adapters, config);
   await createDb(adapters, config);
   for (const adapter of adapters) {
-    await migrateAndClose({ adapter, config });
+    await migrate({ adapter, config });
   }
 };
 const askForAdminCredentials = async (create) => {
@@ -3548,6 +3628,44 @@ const askForAdminCredentials = async (create) => {
   };
 };
 
+const runRecurrentMigrations = async (adapters, config) => {
+  let dbs;
+  let files = 0;
+  await readdirRecursive(config.recurrentPath, async (path) => {
+    files++;
+    dbs ?? (dbs = adapters.map((adapter) => pqb.createDbWithAdapter({ adapter })));
+    const sql = await fs.readFile(path, "utf-8");
+    await Promise.all(
+      dbs.map(async (db) => {
+        await db.adapter.arrays(sql);
+      })
+    );
+  });
+  if (files > 0) {
+    config.logger?.log(
+      `Applied ${files} recurrent migration file${files > 1 ? "s" : ""}`
+    );
+  }
+};
+const readdirRecursive = async (dirPath, cb) => {
+  const list = await fs.readdir(dirPath).catch((err) => {
+    if (err.code !== "ENOENT") throw err;
+    return;
+  });
+  if (!list) return;
+  await Promise.all(
+    list.map(async (item) => {
+      const path$1 = path.join(dirPath, item);
+      const info = await fs.stat(path$1);
+      if (info.isDirectory()) {
+        await readdirRecursive(path$1, cb);
+      } else if (info.isFile() && path$1.endsWith(".sql")) {
+        await cb(path$1);
+      }
+    })
+  );
+};
+
 const filterSchema = (table) => `${table} !~ '^pg_' AND ${table} != 'information_schema'`;
 const jsonAgg = (sql2, as) => `(SELECT coalesce(json_agg(t.*), '[]') FROM (${sql2}) t) AS "${as}"`;
 const columnsSql = ({
@@ -5259,7 +5377,6 @@ const pullDbStructure = async (adapter, config) => {
   const currentSchema = adapter.schema || "public";
   const ctx = makeStructureToAstCtx(config, currentSchema);
   const ast = await structureToAst(ctx, adapter, config);
-  await adapter.close();
   const result = astToMigration(currentSchema, config, ast);
   if (!result) return;
   const version = await makeFileVersion({}, config);
@@ -5283,220 +5400,6 @@ Append \`as\` method manually to ${count > 1 ? "these" : "this"} column${count >
     );
   }
   config.logger?.log("Database pulled successfully");
-  adapter.close();
-};
-
-const runRecurrentMigrations = async (adapters, config) => {
-  let dbs;
-  let files = 0;
-  await readdirRecursive(config.recurrentPath, async (path) => {
-    files++;
-    dbs ?? (dbs = adapters.map((adapter) => pqb.createDbWithAdapter({ adapter })));
-    const sql = await fs.readFile(path, "utf-8");
-    await Promise.all(
-      dbs.map(async (db) => {
-        await db.adapter.arrays(sql);
-      })
-    );
-  });
-  if (dbs) {
-    await Promise.all(dbs.map((db) => db.close()));
-    if (files > 0) {
-      config.logger?.log(
-        `Applied ${files} recurrent migration file${files > 1 ? "s" : ""}`
-      );
-    }
-  }
-};
-const readdirRecursive = async (dirPath, cb) => {
-  const list = await fs.readdir(dirPath).catch((err) => {
-    if (err.code !== "ENOENT") throw err;
-    return;
-  });
-  if (!list) return;
-  await Promise.all(
-    list.map(async (item) => {
-      const path$1 = path.join(dirPath, item);
-      const info = await fs.stat(path$1);
-      if (info.isDirectory()) {
-        await readdirRecursive(path$1, cb);
-      } else if (info.isFile() && path$1.endsWith(".sql")) {
-        await cb(path$1);
-      }
-    })
-  );
-};
-
-const listMigrationsStatuses = async (adapters, config, args) => {
-  const ctx = {};
-  const [{ migrations }, ...migrated] = await Promise.all([
-    getMigrations(ctx, config, true),
-    ...adapters.map((adapter) => getMigratedVersionsMap(ctx, adapter, config))
-  ]);
-  const map = {};
-  let maxVersionLength = 12;
-  let maxNameLength = 4;
-  for (let i = 0; i < adapters.length; i++) {
-    const list = migrated[i];
-    const key = Object.entries(list.map).map(([version, up]) => `${version}${up ? "t" : "f"}`).join("");
-    const database = adapters[i].getDatabase();
-    if (map[key]) {
-      map[key].databases.push(database);
-      continue;
-    }
-    map[key] = {
-      databases: [database],
-      migrations: migrations.map((item) => {
-        if (item.version.length > maxVersionLength) {
-          maxVersionLength = item.version.length;
-        }
-        const name = path.parse(item.path).name.slice(item.version.length + 1).replace(
-          /([a-z])([A-Z])/g,
-          (_, a, b) => `${a} ${b.toLocaleLowerCase()}`
-        ).replace(/[-_](.)/g, (_, char) => ` ${char.toLocaleLowerCase()}`).replace(/^\w/, (match) => match.toLocaleUpperCase());
-        if (name.length > maxNameLength) {
-          maxNameLength = name.length;
-        }
-        return {
-          up: !!list.map[item.version],
-          version: item.version,
-          name,
-          url: node_url.pathToFileURL(item.path)
-        };
-      })
-    };
-  }
-  const showUrl = args.includes("p") || args.includes("path");
-  const asIs = (s) => s;
-  const c = typeof config.log === "object" && config.log.colors === false ? {
-    yellow: asIs,
-    green: asIs,
-    red: asIs,
-    blue: asIs
-  } : colors;
-  const log = Object.values(map).map(({ databases, migrations: migrations2 }) => {
-    let log2 = ` ${c.yellow("Database:")} ${databases.join(", ")}`;
-    if (migrations2.length === 0) {
-      return log2 + `
-
-No migrations available`;
-    }
-    const lineSeparator = c.yellow(
-      makeChars(14 + maxVersionLength + maxNameLength, "-")
-    );
-    const columnSeparator = c.yellow("|");
-    log2 += "\n\n " + c.yellow(
-      `Status | Migration ID${makeChars(
-        maxVersionLength - 12,
-        " "
-      )} | Name
-${lineSeparator}`
-    );
-    for (const migration of migrations2) {
-      log2 += `
-  ${migration.up ? ` ${c.green("Up")} ` : c.red("Down")}  ${columnSeparator} ${c.blue(migration.version)}${makeChars(
-        maxVersionLength - migration.version.length,
-        " "
-      )} ${columnSeparator} ${migration.name}`;
-      if (showUrl) {
-        log2 += `
-${migration.url}
-`;
-      }
-    }
-    return log2 += showUrl ? lineSeparator : `
-${lineSeparator}`;
-  }).join("\n\n");
-  (config.logger ?? console).log(log);
-  await Promise.all(adapters.map((adapter) => adapter.close()));
-};
-const makeChars = (count, char) => {
-  let chars = "";
-  for (let i = 0; i < count; i++) {
-    chars += char;
-  }
-  return chars;
-};
-
-const migrationConfigDefaults = {
-  schemaConfig: pqb.defaultSchemaConfig,
-  migrationsPath: path.join("src", "db", "migrations"),
-  migrationId: { serial: 4 },
-  migrationsTable: "schemaMigrations",
-  snakeCase: false,
-  commands: {},
-  log: true,
-  logger: console,
-  import() {
-    throw new Error(
-      "Add `import: (path) => import(path),` setting to `rakeDb` config"
-    );
-  }
-};
-const ensureMigrationsPath = (config) => {
-  if (!config.migrationsPath) {
-    config.migrationsPath = migrationConfigDefaults.migrationsPath;
-  }
-  if (!path.isAbsolute(config.migrationsPath)) {
-    config.migrationsPath = path.resolve(
-      config.basePath,
-      config.migrationsPath
-    );
-  }
-  return config;
-};
-const ensureBasePathAndDbScript = (config, intermediateCallers = 0) => {
-  if (config.basePath && config.dbScript) return config;
-  let filePath = orchidCore.getStackTrace()?.[3 + intermediateCallers].getFileName();
-  if (!filePath) {
-    throw new Error(
-      "Failed to determine path to db script. Please set basePath option of rakeDb"
-    );
-  }
-  if (filePath.startsWith("file://")) {
-    filePath = node_url.fileURLToPath(filePath);
-  }
-  const ext = path.extname(filePath);
-  if (ext !== ".ts" && ext !== ".js" && ext !== ".mjs") {
-    throw new Error(
-      `Add a .ts suffix to the "${path.basename(filePath)}" when calling it`
-    );
-  }
-  config.basePath = path.dirname(filePath);
-  config.dbScript = path.basename(filePath);
-  return config;
-};
-const processRakeDbConfig = (config) => {
-  const result = { ...migrationConfigDefaults, ...config };
-  if (!result.log) {
-    delete result.logger;
-  }
-  ensureBasePathAndDbScript(result, 1);
-  ensureMigrationsPath(result);
-  if (!result.recurrentPath) {
-    result.recurrentPath = path.join(
-      result.migrationsPath,
-      "recurrent"
-    );
-  }
-  if ("recurrentPath" in result && !path.isAbsolute(result.recurrentPath)) {
-    result.recurrentPath = path.resolve(result.basePath, result.recurrentPath);
-  }
-  if ("baseTable" in config && config.baseTable) {
-    const { types, snakeCase, language } = config.baseTable.prototype;
-    result.columnTypes = types || pqb.makeColumnTypes(pqb.defaultSchemaConfig);
-    if (snakeCase) result.snakeCase = true;
-    if (language) result.language = language;
-  } else {
-    const ct = "columnTypes" in config && config.columnTypes;
-    result.columnTypes = (typeof ct === "function" ? ct(
-      pqb.makeColumnTypes(pqb.defaultSchemaConfig)
-    ) : ct) || pqb.makeColumnTypes(pqb.defaultSchemaConfig);
-  }
-  if (config.migrationId === "serial") {
-    result.migrationId = { serial: 4 };
-  }
-  return result;
 };
 
 const rebase = async (adapters, config) => {
@@ -5513,7 +5416,6 @@ const rebase = async (adapters, config) => {
     await getMigrations(ctx, config, true, true),
     ...adapters.map((adapter) => getMigratedVersionsMap(ctx, adapter, config))
   ]);
-  await Promise.all(adapters.map((adapter) => adapter.close()));
   const files = set.migrations.map((file) => ({
     ...file,
     name: path.basename(file.path),
@@ -5643,7 +5545,6 @@ const rebase = async (adapters, config) => {
       adapter,
       config: redoConfig
     });
-    await adapter.close();
   }
   for (let i = renames.length - 1; i >= 0; i--) {
     const [from, version] = renames[i];
@@ -5658,37 +5559,97 @@ const rebase = async (adapters, config) => {
   }
 };
 
-const rakeDbWithAdapters = (adapters, partialConfig, args = process.argv.slice(2)) => {
-  const config = processRakeDbConfig(partialConfig);
-  const promise = runCommand(
-    adapters,
-    config,
-    args
-  ).catch((err) => {
-    if (err instanceof RakeDbError) {
-      config.logger?.error(err.message);
-      process.exit(1);
+const listMigrationsStatuses = async (adapters, config, args) => {
+  const ctx = {};
+  const [{ migrations }, ...migrated] = await Promise.all([
+    getMigrations(ctx, config, true),
+    ...adapters.map((adapter) => getMigratedVersionsMap(ctx, adapter, config))
+  ]);
+  const map = {};
+  let maxVersionLength = 12;
+  let maxNameLength = 4;
+  for (let i = 0; i < adapters.length; i++) {
+    const list = migrated[i];
+    const key = Object.entries(list.map).map(([version, up]) => `${version}${up ? "t" : "f"}`).join("");
+    const database = adapters[i].getDatabase();
+    if (map[key]) {
+      map[key].databases.push(database);
+      continue;
     }
-    throw err;
-  });
-  return Object.assign(makeChange(config), {
-    promise
-  });
-};
-rakeDbWithAdapters.lazy = (adapters, partialConfig) => {
-  const config = processRakeDbConfig(partialConfig);
-  return {
-    change: makeChange(config),
-    run(args, conf) {
-      return runCommand(adapters, conf ? { ...config, ...conf } : config, args);
+    map[key] = {
+      databases: [database],
+      migrations: migrations.map((item) => {
+        if (item.version.length > maxVersionLength) {
+          maxVersionLength = item.version.length;
+        }
+        const name = path.parse(item.path).name.slice(item.version.length + 1).replace(
+          /([a-z])([A-Z])/g,
+          (_, a, b) => `${a} ${b.toLocaleLowerCase()}`
+        ).replace(/[-_](.)/g, (_, char) => ` ${char.toLocaleLowerCase()}`).replace(/^\w/, (match) => match.toLocaleUpperCase());
+        if (name.length > maxNameLength) {
+          maxNameLength = name.length;
+        }
+        return {
+          up: !!list.map[item.version],
+          version: item.version,
+          name,
+          url: node_url.pathToFileURL(item.path)
+        };
+      })
+    };
+  }
+  const showUrl = args.includes("p") || args.includes("path");
+  const asIs = (s) => s;
+  const c = typeof config.log === "object" && config.log.colors === false ? {
+    yellow: asIs,
+    green: asIs,
+    red: asIs,
+    blue: asIs
+  } : colors;
+  const log = Object.values(map).map(({ databases, migrations: migrations2 }) => {
+    let log2 = ` ${c.yellow("Database:")} ${databases.join(", ")}`;
+    if (migrations2.length === 0) {
+      return log2 + `
+
+No migrations available`;
     }
-  };
+    const lineSeparator = c.yellow(
+      makeChars(14 + maxVersionLength + maxNameLength, "-")
+    );
+    const columnSeparator = c.yellow("|");
+    log2 += "\n\n " + c.yellow(
+      `Status | Migration ID${makeChars(
+        maxVersionLength - 12,
+        " "
+      )} | Name
+${lineSeparator}`
+    );
+    for (const migration of migrations2) {
+      log2 += `
+  ${migration.up ? ` ${c.green("Up")} ` : c.red("Down")}  ${columnSeparator} ${c.blue(migration.version)}${makeChars(
+        maxVersionLength - migration.version.length,
+        " "
+      )} ${columnSeparator} ${migration.name}`;
+      if (showUrl) {
+        log2 += `
+${migration.url}
+`;
+      }
+    }
+    return log2 += showUrl ? lineSeparator : `
+${lineSeparator}`;
+  }).join("\n\n");
+  (config.logger ?? console).log(log);
+  await Promise.all(adapters.map((adapter) => adapter.close()));
 };
-const makeChange = (config) => (fn) => {
-  const change = { fn, config };
-  pushChange(change);
-  return change;
+const makeChars = (count, char) => {
+  let chars = "";
+  for (let i = 0; i < count; i++) {
+    chars += char;
+  }
+  return chars;
 };
+
 const rakeDbAliases = {
   migrate: "up",
   rollback: "down",
@@ -5764,10 +5725,9 @@ ${Object.entries(helpArguments).map(
     args
   };
 };
+const close = (adapters) => Promise.all(adapters.map((adapter) => adapter.close()));
 const upCommand = {
-  run: (adapters, config, args) => migrateCommand(adapters, config, args).then(
-    () => runRecurrentMigrations(adapters, config)
-  ),
+  run: (adapters, config, args) => migrateCommand(adapters, config, args).then(() => runRecurrentMigrations(adapters, config)).then(() => close(adapters)),
   help: "migrate pending migrations",
   helpArguments: {
     "no arguments": "migrate all pending",
@@ -5776,7 +5736,7 @@ const upCommand = {
   }
 };
 const downCommand = {
-  run: (adapters, config, args) => rollbackCommand(adapters, config, args),
+  run: (adapters, config, args) => rollbackCommand(adapters, config, args).then(() => close(adapters)),
   help: "rollback migrated migrations",
   helpArguments: {
     "no arguments": "rollback one last migration",
@@ -5793,7 +5753,7 @@ const statusCommand = {
   }
 };
 const recurrentCommand = {
-  run: runRecurrentMigrations,
+  run: (adapters, config) => runRecurrentMigrations(adapters, config).then(() => close(adapters)),
   help: "run recurrent migrations"
 };
 const rakeDbCommands = {
@@ -5806,9 +5766,7 @@ const rakeDbCommands = {
     help: "drop databases"
   },
   reset: {
-    run: (adapters, config) => resetDb(adapters, config).then(
-      () => runRecurrentMigrations(adapters, config)
-    ),
+    run: (adapters, config) => resetDb(adapters, config).then(() => runRecurrentMigrations(adapters, config)).then(() => close(adapters)),
     help: "drop, create and migrate databases"
   },
   up: upCommand,
@@ -5816,13 +5774,11 @@ const rakeDbCommands = {
   down: downCommand,
   rollback: downCommand,
   redo: {
-    run: (adapters, config, args) => redoCommand(adapters, config, args).then(
-      () => runRecurrentMigrations(adapters, config)
-    ),
+    run: (adapters, config, args) => redoCommand(adapters, config, args).then(() => runRecurrentMigrations(adapters, config)).then(() => close(adapters)),
     help: "rollback and migrate, run recurrent"
   },
   pull: {
-    run: ([adapter], config) => pullDbStructure(adapter, config),
+    run: ([adapter], config) => pullDbStructure(adapter, config).then(() => close([adapter])),
     help: "generate a combined migration for an existing database"
   },
   new: {
@@ -5834,7 +5790,7 @@ const rakeDbCommands = {
   rec: recurrentCommand,
   recurrent: recurrentCommand,
   rebase: {
-    run: rebase,
+    run: (adapters, config) => rebase(adapters, config).then(() => close(adapters)),
     help: "move local migrations below the new ones from upstream"
   },
   "change-ids": {
@@ -5848,6 +5804,38 @@ const rakeDbCommands = {
   }
 };
 
+const rakeDbWithAdapters = (adapters, partialConfig, args = process.argv.slice(2)) => {
+  const config = processRakeDbConfig(partialConfig);
+  const promise = runCommand(
+    adapters,
+    config,
+    args
+  ).catch((err) => {
+    if (err instanceof RakeDbError) {
+      config.logger?.error(err.message);
+      process.exit(1);
+    }
+    throw err;
+  });
+  return Object.assign(makeChange(config), {
+    promise
+  });
+};
+rakeDbWithAdapters.lazy = (adapters, partialConfig) => {
+  const config = processRakeDbConfig(partialConfig);
+  return {
+    change: makeChange(config),
+    run(args, conf) {
+      return runCommand(adapters, conf ? { ...config, ...conf } : config, args);
+    }
+  };
+};
+const makeChange = (config) => (fn) => {
+  const change = { fn, config };
+  pushChange(change);
+  return change;
+};
+
 const migrateFiles = async (db, files) => {
   const qb = db.$qb;
   await qb.ensureTransaction(async () => {