rake-db 2.28.1 → 2.29.0

package/dist/index.js

@@ -5,17 +5,248 @@ var path = require('path');
 var node_url = require('node:url');
 var fs = require('fs/promises');
 
-class RakeDbError extends Error {
-}
-class NoPrimaryKey extends RakeDbError {
-}
+const ESC = "\x1B";
+const CSI = `${ESC}[`;
+const cursorShow = `${CSI}?25h`;
+const cursorHide = `${CSI}?25l`;
+const { stdin, stdout } = process;
+const visibleChars = (s) => s.replace(
+  // eslint-disable-next-line no-control-regex
+  /[\u001B\u009B][[\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\d/#&.:=?%@~_]+)*|[a-zA-Z\d]+(?:;[-a-zA-Z\d/#&.:=?%@~_]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PRZcf-ntqry=><~]))/g,
+  ""
+).length;
+const clear = (text) => {
+  const rows = text.split(/\r?\n/).reduce(
+    (rows2, line) => rows2 + 1 + Math.floor(Math.max(visibleChars(line) - 1, 0) / stdout.columns),
+    0
+  );
+  let clear2 = "";
+  for (let i = 0; i < rows; i++) {
+    clear2 += `${CSI}2K`;
+    if (i < rows - 1) {
+      clear2 += `${CSI}${i < rows - 1 ? "1A" : "G"}`;
+    }
+  }
+  return clear2;
+};
+const prompt = async ({
+  render,
+  onKeyPress,
+  validate,
+  value,
+  cursor: showCursor
+}) => {
+  stdin.resume();
+  if (stdin.isTTY) stdin.setRawMode(true);
+  stdin.setEncoding("utf-8");
+  if (!showCursor) stdout.write(cursorHide);
+  return new Promise((res) => {
+    let prevText;
+    const ctx = {
+      value,
+      submitted: false,
+      render() {
+        let text = (ctx.submitted ? pqb.colors.greenBold("\u2714") : pqb.colors.yellowBold("?")) + " " + render(ctx);
+        if (ctx.submitted) text += "\n";
+        stdout.write(prevText ? clear(prevText) + "\r" + text : text);
+        prevText = text;
+      },
+      submit(value2) {
+        if (value2 !== void 0) ctx.value = value2;
+        if (ctx.value === void 0 || validate && !validate?.(ctx)) return;
+        ctx.submitted = true;
+        ctx.render();
+        close();
+        res(ctx.value);
+      }
+    };
+    const close = () => {
+      if (!showCursor) stdout.write(cursorShow);
+      if (stdin.isTTY) stdin.setRawMode(false);
+      stdin.off("data", keypress);
+      stdin.pause();
+    };
+    const keypress = (s) => {
+      if (s === "" || s === "") {
+        close?.();
+        process.exit(0);
+      }
+      if (s === "\r" || s === "\n" || s === "\r\n") {
+        ctx.submit();
+      } else {
+        onKeyPress(ctx, s);
+      }
+    };
+    stdin.on("data", keypress);
+    ctx.render();
+  });
+};
+const defaultActive = (s) => `${pqb.colors.blueBold("\u276F")} ${s}`;
+const defaultInactive = (s) => `  ${s}`;
+const promptSelect = ({
+  message,
+  options,
+  active = defaultActive,
+  inactive = defaultInactive
+}) => prompt({
+  value: 0,
+  render(ctx) {
+    let text = `${message} ${pqb.colors.pale(
+      "Use arrows or jk. Press enter to submit."
+    )}
+`;
+    for (let i = 0; i < options.length; i++) {
+      text += (ctx.value === i ? active : inactive)(options[i]) + "\n";
+    }
+    return text;
+  },
+  onKeyPress(ctx, s) {
+    ctx.value = s === "\x1B[H" ? 0 : s === "\x1B[F" ? options.length - 1 : s === "\x1B[A" || s === "k" ? ctx.value === 0 ? options.length - 1 : ctx.value - 1 : s === "\x1B[B" || s === "j" || s === "	" ? ctx.value === options.length - 1 ? 0 : ctx.value + 1 : ctx.value;
+    ctx.render();
+  }
+});
+const promptConfirm = ({
+  message
+}) => prompt({
+  value: true,
+  render(ctx) {
+    return `${pqb.colors.bright(message)}
+${ctx.submitted ? `> ${ctx.value ? pqb.colors.greenBold("Yes") : pqb.colors.yellowBold("No")}` : pqb.colors.pale(`> (Y/n)`)}
+`;
+  },
+  onKeyPress(ctx, s) {
+    let ok;
+    if (s === "y" || s === "Y") ok = true;
+    else if (s === "n" || s === "N") ok = false;
+    if (ok !== void 0) {
+      ctx.submit(ok);
+    }
+  }
+});
+const promptText = ({
+  message,
+  default: def = "",
+  password,
+  min
+}) => {
+  let showDefault = true;
+  let x = 0;
+  const renderValue = (ctx) => password ? "*".repeat(ctx.value.length) : ctx.value;
+  return prompt({
+    value: def,
+    cursor: true,
+    validate: (ctx) => !min || ctx.value.length >= min,
+    render(ctx) {
+      let text = `${pqb.colors.bright(message)}
+> ${ctx.submitted ? renderValue(ctx) : showDefault ? pqb.colors.pale(def) + "\b".repeat(def.length) : ctx.value}`;
+      if (ctx.submitted) text += "\n";
+      return text;
+    },
+    onKeyPress(ctx, s) {
+      let value = showDefault ? "" : ctx.value;
+      if (s === "\x1B[D" && x > 0) {
+        x--;
+        stdout.write("\b");
+      } else if (s === "\x1B[C" && x < value.length) {
+        stdout.write(value[x]);
+        x++;
+      }
+      if (s !== "\x7F" && s !== "\x1B[3~" && !visibleChars(s)) return;
+      if (showDefault) {
+        showDefault = false;
+        stdout.write(" ".repeat(def.length) + "\b".repeat(def.length));
+      }
+      const prev = value;
+      const prevX = x;
+      if (s === "\x7F") {
+        if (x > 0) {
+          value = value.slice(0, x - 1) + value.slice(x);
+          x--;
+        }
+      } else if (s === "\x1B[3~") {
+        if (x < value.length) {
+          value = value.slice(0, x) + value.slice(x + 1);
+        }
+      } else {
+        value = value.slice(0, x) + s + value.slice(x);
+        x++;
+      }
+      ctx.value = value;
+      const spaces = prev.length - value.length;
+      stdout.write(
+        "\b".repeat(prevX) + renderValue(ctx) + (spaces > 0 ? " ".repeat(spaces) + "\b".repeat(spaces) : "") + "\b".repeat(value.length - x)
+      );
+    }
+  });
+};
 
-let currentChanges = [];
-const clearChanges = () => {
-  currentChanges = [];
+const getNonTransactionAdapter = (db) => "$adapter" in db ? db.$adapter : db;
+const getMaybeTransactionAdapter = (db) => "$qb" in db ? db.$qb.internal.transactionStorage.getStore()?.adapter || db.$adapter : db;
+const ensureTransaction = (db, fn) => {
+  const adapter = getMaybeTransactionAdapter(db);
+  return adapter.isInTransaction() ? fn(adapter) : adapter.transaction(void 0, fn);
+};
+const runSqlInSavePoint = async (db, sql, code) => {
+  const adapter = getMaybeTransactionAdapter(db);
+  try {
+    await adapter.query(
+      adapter.isInTransaction() ? `SAVEPOINT s; ${sql}; RELEASE SAVEPOINT s` : sql
+    );
+    return "done";
+  } catch (err) {
+    if (err.code === code) {
+      if (adapter.isInTransaction()) {
+        await adapter.query(`ROLLBACK TO SAVEPOINT s`);
+      }
+      return "already";
+    }
+    throw err;
+  }
 };
-const getCurrentChanges = () => currentChanges;
-const pushChange = (change) => currentChanges.push(change);
+
+class CreateOrDropError extends Error {
+  constructor(message, status, cause) {
+    super(message);
+    this.status = status;
+    this.cause = cause;
+  }
+}
+const createDatabase = async (db, {
+  database,
+  owner
+}) => {
+  return createOrDrop(
+    db,
+    `CREATE DATABASE "${database}"${owner ? ` OWNER "${owner}"` : ""}`
+  );
+};
+const dropDatabase = async (db, { database }) => {
+  return createOrDrop(db, `DROP DATABASE "${database}"`);
+};
+const createOrDrop = async (db, sql) => {
+  try {
+    const adapter = getNonTransactionAdapter(db);
+    await adapter.query(sql);
+    return "done";
+  } catch (error) {
+    const err = error;
+    if (typeof err.message === "string" && err.message.includes("sslmode=require")) {
+      throw new CreateOrDropError("SSL required", "ssl-required", err);
+    }
+    if (err.code === "42P04" || err.code === "3D000") {
+      return "already";
+    }
+    if (err.code === "42501") {
+      throw new CreateOrDropError("Insufficient privilege", "forbidden", err);
+    }
+    if (typeof err.message === "string" && err.message.includes("password authentication failed")) {
+      throw new CreateOrDropError("Authentication failed", "auth-failed", err);
+    }
+    throw err;
+  }
+};
+const createSchema$1 = async (db, sql) => runSqlInSavePoint(db, `CREATE SCHEMA ${sql}`, "42P06");
+const createTable$1 = async (db, sql) => runSqlInSavePoint(db, `CREATE TABLE ${sql}`, "42P07");
 
 const RAKE_DB_LOCK_KEY = "8582141715823621641";
 const getFirstWordAndRest = (input) => {
@@ -51,15 +282,18 @@ const quoteWithSchema = ({
   name
 }) => quoteTable(schema, name);
 const quoteTable = (schema, table) => schema ? `"${schema}"."${table}"` : `"${table}"`;
-const getSchemaAndTableFromName = (name) => {
+const getSchemaAndTableFromName = (config, name) => {
   const i = name.indexOf(".");
-  return i !== -1 ? [name.slice(0, i), name.slice(i + 1)] : [void 0, name];
+  return i !== -1 ? [name.slice(0, i), name.slice(i + 1)] : [
+    typeof config.schema === "function" ? config.schema() : config.schema,
+    name
+  ];
 };
-const quoteNameFromString = (string) => {
-  return quoteTable(...getSchemaAndTableFromName(string));
+const quoteNameFromString = (config, string) => {
+  return quoteTable(...getSchemaAndTableFromName(config, string));
 };
-const quoteCustomType = (s) => {
-  const [schema, type] = getSchemaAndTableFromName(s);
+const quoteCustomType = (config, s) => {
+  const [schema, type] = getSchemaAndTableFromName(config, s);
   return schema ? '"' + schema + '".' + type : type;
 };
 const quoteSchemaTable = (arg, excludeCurrentSchema) => {
@@ -71,8 +305,8 @@ const concatSchemaAndName = ({
 }, excludeCurrentSchema) => {
   return schema && schema !== excludeCurrentSchema ? `${schema}.${name}` : name;
 };
-const makePopulateEnumQuery = (item) => {
-  const [schema, name] = getSchemaAndTableFromName(item.enumName);
+const makePopulateEnumQuery = (config, item) => {
+  const [schema, name] = getSchemaAndTableFromName(config, item.enumName);
   return {
     text: `SELECT unnest(enum_range(NULL::${quoteTable(schema, name)}))::text`,
     then(result) {
@@ -96,115 +330,35 @@ const getCliParam = (args, name) => {
   return;
 };
 
-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 = pqb.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 makeChange = (config) => (fn) => {
+  const change = { fn, config };
+  pushChange(change);
+  return change;
 };
-const processRakeDbConfig = (config, args) => {
-  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 };
-  }
-  const transaction = getCliParam(args, "transaction");
-  if (transaction) {
-    if (transaction !== "single" && transaction !== "per-migration") {
-      throw new Error(
-        `Unsupported transaction param ${transaction}, expected single or per-migration`
-      );
-    }
-    result.transaction = transaction;
-  } else if (!result.transaction) {
-    result.transaction = "single";
-  }
-  return result;
+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();
+const columnTypeToSql = (config, item) => {
+  return item.data.isOfCustomType ? item instanceof pqb.DomainColumn ? quoteNameFromString(config, item.dataType) : quoteCustomType(config, item.toSQL()) : item.toSQL();
 };
 const getColumnName = (item, key, snakeCase) => {
   return item.data.name || (snakeCase ? pqb.toSnakeCase(key) : key);
 };
-const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
-  const line = [`"${name}" ${columnTypeToSql(item)}`];
+const columnToSql = (config, name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
+  const line = [`"${name}" ${columnTypeToSql(config, item)}`];
   if (item.data.compression) {
     line.push(`COMPRESSION ${item.data.compression}`);
   }
   if (item.data.collate) {
-    line.push(`COLLATE ${quoteNameFromString(item.data.collate)}`);
+    line.push(`COLLATE ${quoteNameFromString(config, item.data.collate)}`);
   }
   if (item.data.identity) {
-    line.push(identityToSql(item.data.identity));
+    line.push(identityToSql(config, item.data.identity));
   } else if (item.data.generated) {
     line.push(
       `GENERATED ALWAYS AS (${item.data.generated.toSQL({
@@ -238,6 +392,7 @@ const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
       }
       line.push(
         referencesToSql(
+          config,
           {
             columns: [name],
             ...foreignKey
@@ -261,11 +416,11 @@ const encodeColumnDefault = (def, values, column) => {
   }
   return null;
 };
-const identityToSql = (identity) => {
-  const options = sequenceOptionsToSql(identity);
+const identityToSql = (config, identity) => {
+  const options = sequenceOptionsToSql(config, identity);
   return `GENERATED ${identity.always ? "ALWAYS" : "BY DEFAULT"} AS IDENTITY${options ? ` (${options})` : ""}`;
 };
-const sequenceOptionsToSql = (item) => {
+const sequenceOptionsToSql = (config, item) => {
   const line = [];
   if (item.dataType) line.push(`AS ${item.dataType}`);
   if (item.increment !== void 0) line.push(`INCREMENT BY ${item.increment}`);
@@ -275,7 +430,7 @@ const sequenceOptionsToSql = (item) => {
   if (item.cache !== void 0) line.push(`CACHE ${item.cache}`);
   if (item.cycle) line.push(`CYCLE`);
   if (item.ownedBy) {
-    const [schema, table] = getSchemaAndTableFromName(item.ownedBy);
+    const [schema, table] = getSchemaAndTableFromName(config, item.ownedBy);
     line.push(`OWNED BY ${quoteTable(schema, table)}`);
   }
   return line.join(" ");
@@ -305,9 +460,9 @@ const addColumnComment = (comments, name, item) => {
     comments.push({ column: name, comment: item.data.comment });
   }
 };
-const getForeignKeyTable = (fnOrTable) => {
+const getForeignKeyTable = (config, fnOrTable) => {
   if (typeof fnOrTable === "string") {
-    return getSchemaAndTableFromName(fnOrTable);
+    return getSchemaAndTableFromName(config, fnOrTable);
   }
   const item = new (fnOrTable())();
   return [item.schema, item.table];
@@ -324,7 +479,7 @@ const getConstraintName = (table, constraint, snakeCase) => {
   if (constraint.identity) return `${table}_identity`;
   return `${table}_constraint`;
 };
-const constraintToSql = ({ name }, up, constraint, values, snakeCase) => {
+const constraintToSql = (config, { name }, up, constraint, values, snakeCase) => {
   const constraintName = constraint.name || getConstraintName(name, constraint, snakeCase);
   if (!up) {
     const { dropMode } = constraint;
@@ -332,7 +487,7 @@ const constraintToSql = ({ name }, up, constraint, values, snakeCase) => {
   }
   const sql = [`CONSTRAINT "${constraintName}"`];
   if (constraint.references) {
-    sql.push(foreignKeyToSql(constraint.references, snakeCase));
+    sql.push(foreignKeyToSql(config, constraint.references, snakeCase));
   }
   if (constraint.check) {
     sql.push(checkToSql(constraint.check, values));
@@ -342,13 +497,13 @@ const constraintToSql = ({ name }, up, constraint, values, snakeCase) => {
 const checkToSql = (check, values) => {
   return `CHECK (${check.toSQL({ values })})`;
 };
-const foreignKeyToSql = (item, snakeCase) => {
+const foreignKeyToSql = (config, item, snakeCase) => {
   return `FOREIGN KEY (${joinColumns(
     snakeCase ? item.columns.map(pqb.toSnakeCase) : item.columns
-  )}) ${referencesToSql(item, snakeCase)}`;
+  )}) ${referencesToSql(config, item, snakeCase)}`;
 };
-const referencesToSql = (references, snakeCase) => {
-  const [schema, table] = getForeignKeyTable(references.fnOrTable);
+const referencesToSql = (config, references, snakeCase) => {
+  const [schema, table] = getForeignKeyTable(config, references.fnOrTable);
   const sql = [
     `REFERENCES ${quoteTable(schema, table)}(${joinColumns(
       snakeCase ? references.foreignColumns.map(pqb.toSnakeCase) : references.foreignColumns
@@ -399,7 +554,7 @@ const getIndexOrExcludeName = (table, columns, suffix) => makeConstraintName(
 );
 const getIndexName = (table, columns) => getIndexOrExcludeName(table, columns, "idx");
 const getExcludeName = (table, columns) => getIndexOrExcludeName(table, columns, "exclude");
-const indexesToQuery = (up, { schema, name: tableName }, indexes, snakeCase, language) => {
+const indexesToQuery = (config, up, { schema, name: tableName }, indexes, snakeCase, language) => {
   return indexes.map((index) => {
     const { options } = index;
     const { columns, include, name } = getIndexOrExcludeMainOptions(
@@ -428,7 +583,7 @@ const indexesToQuery = (up, { schema, name: tableName }, indexes, snakeCase, lan
     const columnsSql = columns.map((column) => {
       let sql2 = [
         "expression" in column ? `(${column.expression})` : `"${column.column}"`,
-        column.collate && `COLLATE ${quoteNameFromString(column.collate)}`,
+        column.collate && `COLLATE ${quoteNameFromString(config, column.collate)}`,
         column.opclass,
         column.order
       ].filter((x) => !!x).join(" ");
@@ -472,7 +627,7 @@ const indexesToQuery = (up, { schema, name: tableName }, indexes, snakeCase, lan
     return { text: sql.join(" "), values };
   });
 };
-const excludesToQuery = (up, { schema, name: tableName }, excludes, snakeCase) => {
+const excludesToQuery = (config, up, { schema, name: tableName }, excludes, snakeCase) => {
   return excludes.map((exclude) => {
     const { options } = exclude;
     const { columns, include, name } = getIndexOrExcludeMainOptions(
@@ -492,7 +647,7 @@ const excludesToQuery = (up, { schema, name: tableName }, excludes, snakeCase) =
     const columnList = columns.map(
       (column) => [
         "expression" in column ? `(${column.expression})` : `"${column.column}"`,
-        column.collate && `COLLATE ${quoteNameFromString(column.collate)}`,
+        column.collate && `COLLATE ${quoteNameFromString(config, column.collate)}`,
         column.opclass,
         column.order,
         `WITH ${column.with}`
@@ -561,9 +716,16 @@ const cmpRawSql = (a, b) => {
 };
 const getMigrationsSchemaAndTable = (config) => {
   const [tableSchema, table] = getSchemaAndTableFromName(
+    config,
     config.migrationsTable
   );
-  const schema = tableSchema || (config.schema && config.schema !== "public" ? config.schema : void 0);
+  let schema = tableSchema;
+  if (!schema) {
+    schema = typeof config.schema === "function" ? config.schema() : config.schema;
+    if (schema === "public") {
+      schema = void 0;
+    }
+  }
   return { schema, table };
 };
 const migrationsSchemaTableSql = (config) => {
@@ -582,6 +744,11 @@ const tableMethods = {
   }
 };
 
+class RakeDbError extends Error {
+}
+class NoPrimaryKey extends RakeDbError {
+}
+
 const createTable = async (migration, up, tableName, first, second, third) => {
   let options;
   let fn;
@@ -620,6 +787,7 @@ const createTable = async (migration, up, tableName, first, second, third) => {
     shape = tableData = pqb.emptyObject;
   }
   const ast = makeAst$2(
+    migration.options,
     up,
     tableName,
     shape,
@@ -628,7 +796,7 @@ const createTable = async (migration, up, tableName, first, second, third) => {
     migration.options.noPrimaryKey
   );
   fn && validatePrimaryKey(ast);
-  const queries = astToQueries$1(ast, snakeCase, language);
+  const queries = astToQueries$1(migration.options, ast, snakeCase, language);
   for (const { then, ...query } of queries) {
     const result = await migration.adapter.arrays(interpolateSqlValues(query));
     then?.(result);
@@ -648,7 +816,7 @@ const createTable = async (migration, up, tableName, first, second, third) => {
     }
   };
 };
-const makeAst$2 = (up, tableName, shape, tableData, options, noPrimaryKey) => {
+const makeAst$2 = (config, up, tableName, shape, tableData, options, noPrimaryKey) => {
   const shapePKeys = [];
   for (const key in shape) {
     const column = shape[key];
@@ -657,7 +825,7 @@ const makeAst$2 = (up, tableName, shape, tableData, options, noPrimaryKey) => {
     }
   }
   const { primaryKey } = tableData;
-  const [schema, table] = getSchemaAndTableFromName(tableName);
+  const [schema, table] = getSchemaAndTableFromName(config, tableName);
   return {
     type: "table",
     action: up ? "create" : "drop",
@@ -697,13 +865,13 @@ You can suppress this error by setting { noPrimaryKey: true } after a table name
     }
   }
 };
-const astToQueries$1 = (ast, snakeCase, language) => {
+const astToQueries$1 = (config, ast, snakeCase, language) => {
   const queries = [];
   const { shape } = ast;
   for (const key in shape) {
     const item = shape[key];
     if (!(item instanceof pqb.EnumColumn)) continue;
-    queries.push(makePopulateEnumQuery(item));
+    queries.push(makePopulateEnumQuery(config, item));
   }
   if (ast.action === "drop") {
     queries.push({
@@ -724,7 +892,14 @@ const astToQueries$1 = (ast, snakeCase, language) => {
     addColumnComment(comments, name, item);
     lines.push(
       `
-  ${columnToSql(name, item, values, !!ast.primaryKey, snakeCase)}`
+  ${columnToSql(
+        config,
+        name,
+        item,
+        values,
+        !!ast.primaryKey,
+        snakeCase
+      )}`
     );
   }
   if (ast.primaryKey) {
@@ -742,6 +917,7 @@ const astToQueries$1 = (ast, snakeCase, language) => {
     lines.push(
       `
   ${constraintToSql(
+        config,
         ast,
         true,
         {
@@ -766,8 +942,8 @@ const astToQueries$1 = (ast, snakeCase, language) => {
 )`,
       values
     },
-    ...indexesToQuery(true, ast, indexes, snakeCase, language),
-    ...excludesToQuery(true, ast, excludes, snakeCase),
+    ...indexesToQuery(config, true, ast, indexes, snakeCase, language),
+    ...excludesToQuery(config, true, ast, excludes, snakeCase),
     ...commentsToQuery(ast, comments)
   );
   if (ast.comment) {
@@ -989,14 +1165,21 @@ const changeTable = async (migration, up, tableName, options, fn) => {
   tableChanger[pqb.snakeCaseKey] = snakeCase;
   addOrDropChanges.length = 0;
   const changeData = fn?.(tableChanger) || {};
-  const ast = makeAst$1(up, tableName, changeData, changeTableData, options);
-  const queries = astToQueries(ast, snakeCase, language);
+  const ast = makeAst$1(
+    migration.options,
+    up,
+    tableName,
+    changeData,
+    changeTableData,
+    options
+  );
+  const queries = astToQueries(migration.options, ast, snakeCase, language);
   for (const query of queries) {
     const result = await migration.adapter.arrays(interpolateSqlValues(query));
     query.then?.(result);
   }
 };
-const makeAst$1 = (up, name, changeData, changeTableData2, options) => {
+const makeAst$1 = (config, up, name, changeData, changeTableData2, options) => {
   const { comment } = options;
   const shape = {};
   const consumedChanges = {};
@@ -1041,7 +1224,7 @@ const makeAst$1 = (up, name, changeData, changeTableData2, options) => {
     );
     shape[name2] = arr;
   }
-  const [schema, table] = getSchemaAndTableFromName(name);
+  const [schema, table] = getSchemaAndTableFromName(config, name);
   return {
     type: "changeTable",
     schema,
@@ -1051,7 +1234,7 @@ const makeAst$1 = (up, name, changeData, changeTableData2, options) => {
     ...up ? changeTableData2 : { add: changeTableData2.drop, drop: changeTableData2.add }
   };
 };
-const astToQueries = (ast, snakeCase, language) => {
+const astToQueries = (config, ast, snakeCase, language) => {
   const queries = [];
   if (ast.comment !== void 0) {
     queries.push({
@@ -1071,6 +1254,7 @@ const astToQueries = (ast, snakeCase, language) => {
     if (Array.isArray(item)) {
       for (const it of item) {
         handlePrerequisitesForTableItem(
+          config,
           key,
           it,
           queries,
@@ -1081,6 +1265,7 @@ const astToQueries = (ast, snakeCase, language) => {
       }
     } else {
       handlePrerequisitesForTableItem(
+        config,
         key,
         item,
         queries,
@@ -1119,6 +1304,7 @@ const astToQueries = (ast, snakeCase, language) => {
     if (Array.isArray(item)) {
       for (const it of item) {
         handleTableItemChange(
+          config,
           key,
           it,
           ast,
@@ -1138,6 +1324,7 @@ const astToQueries = (ast, snakeCase, language) => {
       }
     } else {
       handleTableItemChange(
+        config,
         key,
         item,
         ast,
@@ -1170,7 +1357,14 @@ const astToQueries = (ast, snakeCase, language) => {
   prependAlterTable.push(
     ...dropConstraints.map(
       (foreignKey) => `
- DROP ${constraintToSql(ast, false, foreignKey, values, snakeCase)}`
+ DROP ${constraintToSql(
+        config,
+        ast,
+        false,
+        foreignKey,
+        values,
+        snakeCase
+      )}`
     )
   );
   alterTable.unshift(...prependAlterTable);
@@ -1188,7 +1382,14 @@ const astToQueries = (ast, snakeCase, language) => {
   alterTable.push(
     ...addConstraints.map(
       (foreignKey) => `
- ADD ${constraintToSql(ast, true, foreignKey, values, snakeCase)}`
+ ADD ${constraintToSql(
+        config,
+        ast,
+        true,
+        foreignKey,
+        values,
+        snakeCase
+      )}`
     )
   );
   const tableName = quoteWithSchema(ast);
@@ -1204,10 +1405,14 @@ const astToQueries = (ast, snakeCase, language) => {
   if (alterTable.length) {
     queries.push(alterTableSql(tableName, alterTable, values));
   }
-  queries.push(...indexesToQuery(false, ast, dropIndexes, snakeCase, language));
-  queries.push(...indexesToQuery(true, ast, addIndexes, snakeCase, language));
-  queries.push(...excludesToQuery(false, ast, dropExcludes, snakeCase));
-  queries.push(...excludesToQuery(true, ast, addExcludes, snakeCase));
+  queries.push(
+    ...indexesToQuery(config, false, ast, dropIndexes, snakeCase, language)
+  );
+  queries.push(
+    ...indexesToQuery(config, true, ast, addIndexes, snakeCase, language)
+  );
+  queries.push(...excludesToQuery(config, false, ast, dropExcludes, snakeCase));
+  queries.push(...excludesToQuery(config, true, ast, addExcludes, snakeCase));
   queries.push(...commentsToQuery(ast, comments));
   return queries;
 };
@@ -1216,11 +1421,11 @@ const alterTableSql = (tableName, lines, values) => ({
   ${lines.join(",\n  ")}`,
   values
 });
-const handlePrerequisitesForTableItem = (key, item, queries, addPrimaryKeys, dropPrimaryKeys, snakeCase) => {
+const handlePrerequisitesForTableItem = (config, key, item, queries, addPrimaryKeys, dropPrimaryKeys, snakeCase) => {
   if ("item" in item) {
     const { item: column } = item;
     if (column instanceof pqb.EnumColumn) {
-      queries.push(makePopulateEnumQuery(column));
+      queries.push(makePopulateEnumQuery(config, column));
     }
   }
   if (item.type === "add") {
@@ -1233,10 +1438,10 @@ const handlePrerequisitesForTableItem = (key, item, queries, addPrimaryKeys, dro
     }
   } else if (item.type === "change") {
     if (item.from.column instanceof pqb.EnumColumn) {
-      queries.push(makePopulateEnumQuery(item.from.column));
+      queries.push(makePopulateEnumQuery(config, item.from.column));
     }
     if (item.to.column instanceof pqb.EnumColumn) {
-      queries.push(makePopulateEnumQuery(item.to.column));
+      queries.push(makePopulateEnumQuery(config, item.to.column));
     }
     if (item.from.primaryKey) {
       dropPrimaryKeys.columns.push(
@@ -1252,7 +1457,7 @@ const handlePrerequisitesForTableItem = (key, item, queries, addPrimaryKeys, dro
     }
   }
 };
-const handleTableItemChange = (key, item, ast, alterTable, renameItems, values, addPrimaryKeys, addIndexes, dropIndexes, addExcludes, dropExcludes, addConstraints, dropConstraints, comments, snakeCase) => {
+const handleTableItemChange = (config, key, item, ast, alterTable, renameItems, values, addPrimaryKeys, addIndexes, dropIndexes, addExcludes, dropExcludes, addConstraints, dropConstraints, comments, snakeCase) => {
   if (item.type === "add") {
     const column = item.item;
     const name = getColumnName(column, key, snakeCase);
@@ -1261,6 +1466,7 @@ const handleTableItemChange = (key, item, ast, alterTable, renameItems, values,
     addColumnComment(comments, name, column);
     alterTable.push(
       `ADD COLUMN ${columnToSql(
+        config,
         name,
         column,
         values,
@@ -1283,10 +1489,10 @@ const handleTableItemChange = (key, item, ast, alterTable, renameItems, values,
     let changeType = false;
     if (to.type && (from.type !== to.type || from.collate !== to.collate)) {
       changeType = true;
-      const type = !to.column || to.column.data.isOfCustomType ? to.column && to.column instanceof pqb.DomainColumn ? quoteNameFromString(to.type) : quoteCustomType(to.type) : to.type;
+      const type = !to.column || to.column.data.isOfCustomType ? to.column && to.column instanceof pqb.DomainColumn ? quoteNameFromString(config, to.type) : quoteCustomType(config, to.type) : to.type;
       const using = item.using?.usingUp ? ` USING ${item.using.usingUp.toSQL({ values })}` : to.column instanceof pqb.EnumColumn ? ` USING "${name}"::text::${type}` : to.column instanceof pqb.ArrayColumn ? ` USING "${name}"::text[]::${type}` : "";
       alterTable.push(
-        `ALTER COLUMN "${name}" TYPE ${type}${to.collate ? ` COLLATE ${quoteNameFromString(to.collate)}` : ""}${using}`
+        `ALTER COLUMN "${name}" TYPE ${type}${to.collate ? ` COLLATE ${quoteNameFromString(config, to.collate)}` : ""}${using}`
       );
     }
     if (typeof from.identity !== typeof to.identity || !pqb.deepCompare(from.identity, to.identity)) {
@@ -1295,7 +1501,7 @@ const handleTableItemChange = (key, item, ast, alterTable, renameItems, values,
       }
       if (to.identity) {
         alterTable.push(
-          `ALTER COLUMN "${name}" ADD ${identityToSql(to.identity)}`
+          `ALTER COLUMN "${name}" ADD ${identityToSql(config, to.identity)}`
         );
       }
     }
@@ -1428,15 +1634,15 @@ const renameColumnSql = (from, to) => {
 };
 
 const createView = async (migration, up, name, options, sql) => {
-  const ast = makeAst(up, name, options, sql);
+  const ast = makeAst(migration.options, up, name, options, sql);
   const query = astToQuery(ast);
   await migration.adapter.arrays(interpolateSqlValues(query));
 };
-const makeAst = (up, fullName, options, sql) => {
+const makeAst = (config, up, fullName, options, sql) => {
   if (typeof sql === "string") {
     sql = pqb.raw({ raw: sql });
   }
-  const [schema, name] = getSchemaAndTableFromName(fullName);
+  const [schema, name] = getSchemaAndTableFromName(config, fullName);
   return {
     type: "view",
     action: up ? "create" : "drop",
@@ -2028,7 +2234,7 @@ class Migration {
    * @param values - object where keys are for old names, values are for new names
    */
   async renameEnumValues(enumName, values) {
-    const [schema, name] = getSchemaAndTableFromName(enumName);
+    const [schema, name] = getSchemaAndTableFromName(this.options, enumName);
     const ast = {
       type: "renameEnumValues",
       schema,
@@ -2292,9 +2498,16 @@ class Migration {
    * @param tableName - name of the table
    */
   async tableExists(tableName) {
+    let text = `SELECT 1 FROM "information_schema"."tables" WHERE "table_name" = $1`;
+    const [schema, table] = getSchemaAndTableFromName(this.options, tableName);
+    const values = [table];
+    if (schema) {
+      text += ' AND "table_schema" = $2';
+      values.push(schema);
+    }
     return queryExists(this, {
-      text: `SELECT 1 FROM "information_schema"."tables" WHERE "table_name" = $1`,
-      values: [tableName]
+      text,
+      values
     });
   }
   /**
@@ -2316,12 +2529,19 @@ class Migration {
    * @param columnName - name of the column
    */
   async columnExists(tableName, columnName) {
+    let text = `SELECT 1 FROM "information_schema"."columns" WHERE "table_name" = $1 AND "column_name" = $2`;
+    const [schema, table] = getSchemaAndTableFromName(this.options, tableName);
+    const values = [
+      table,
+      this.options.snakeCase ? pqb.toSnakeCase(columnName) : columnName
+    ];
+    if (schema) {
+      text += ' AND "table_schema" = $3';
+      values.push(schema);
+    }
     return queryExists(this, {
-      text: `SELECT 1 FROM "information_schema"."columns" WHERE "table_name" = $1 AND "column_name" = $2`,
-      values: [
-        tableName,
-        this.options.snakeCase ? pqb.toSnakeCase(columnName) : columnName
-      ]
+      text,
+      values
     });
   }
   /**
@@ -2401,7 +2621,7 @@ const createSchema = async (migration, up, name) => {
   );
 };
 const createExtension = async (migration, up, fullName, options) => {
-  const [schema, name] = getSchemaAndTableFromName(fullName);
+  const [schema, name] = getSchemaAndTableFromName(migration.options, fullName);
   const ast = {
     type: "extension",
     action: up ? "create" : "drop",
@@ -2418,7 +2638,7 @@ const createExtension = async (migration, up, fullName, options) => {
   await migration.adapter.query(query);
 };
 const createEnum = async (migration, up, name, values, options = {}) => {
-  const [schema, enumName] = getSchemaAndTableFromName(name);
+  const [schema, enumName] = getSchemaAndTableFromName(migration.options, name);
   const ast = {
     type: "enum",
     action: up ? "create" : "drop",
@@ -2437,7 +2657,10 @@ const createEnum = async (migration, up, name, values, options = {}) => {
   await migration.adapter.query(query);
 };
 const createDomain = async (migration, up, name, fn) => {
-  const [schema, domainName] = getSchemaAndTableFromName(name);
+  const [schema, domainName] = getSchemaAndTableFromName(
+    migration.options,
+    name
+  );
   const ast = {
     type: "domain",
     action: up ? "create" : "drop",
@@ -2450,7 +2673,10 @@ const createDomain = async (migration, up, name, fn) => {
   const quotedName = quoteWithSchema(ast);
   if (ast.action === "create") {
     const column = ast.baseType;
-    query = `CREATE DOMAIN ${quotedName} AS ${columnTypeToSql(column)}${column.data.collate ? `
+    query = `CREATE DOMAIN ${quotedName} AS ${columnTypeToSql(
+      migration.options,
+      column
+    )}${column.data.collate ? `
 COLLATE "${column.data.collate}"` : ""}${column.data.default !== void 0 ? `
 DEFAULT ${encodeColumnDefault(column.data.default, values)}` : ""}${!column.data.isNullable || column.data.checks ? "\n" : ""}${[
       !column.data.isNullable && "NOT NULL",
@@ -2467,7 +2693,10 @@ DEFAULT ${encodeColumnDefault(column.data.default, values)}` : ""}${!column.data
   );
 };
 const createCollation = async (migration, up, name, options) => {
-  const [schema, collationName] = getSchemaAndTableFromName(name);
+  const [schema, collationName] = getSchemaAndTableFromName(
+    migration.options,
+    name
+  );
   const ast = {
     type: "collation",
     action: up ? "create" : "drop",
@@ -2480,7 +2709,10 @@ const createCollation = async (migration, up, name, options) => {
   if (ast.action === "create") {
     query = `CREATE COLLATION${ast.createIfNotExists ? " IF NOT EXISTS" : ""} ${quotedName} `;
     if (ast.fromExisting) {
-      query += `FROM ${quoteNameFromString(ast.fromExisting)}`;
+      query += `FROM ${quoteNameFromString(
+        migration.options,
+        ast.fromExisting
+      )}`;
     } else {
       const config = [];
       if (ast.locale) config.push(`locale = '${ast.locale}'`);
@@ -2503,8 +2735,14 @@ const queryExists = (db, sql) => {
   return db.adapter.query(sql.text, sql.values).then(({ rowCount }) => rowCount > 0);
 };
 const renameType = async (migration, from, to, kind) => {
-  const [fromSchema, f] = getSchemaAndTableFromName(migration.up ? from : to);
-  const [toSchema, t] = getSchemaAndTableFromName(migration.up ? to : from);
+  const [fromSchema, f] = getSchemaAndTableFromName(
+    migration.options,
+    migration.up ? from : to
+  );
+  const [toSchema, t] = getSchemaAndTableFromName(
+    migration.options,
+    migration.up ? to : from
+  );
   const ast = {
     type: "renameType",
     kind,
@@ -2525,7 +2763,10 @@ const renameType = async (migration, from, to, kind) => {
   }
 };
 const renameTableItem = async (migration, tableName, from, to, kind) => {
-  const [schema, table] = getSchemaAndTableFromName(tableName);
+  const [schema, table] = getSchemaAndTableFromName(
+    migration.options,
+    tableName
+  );
   const [f, t] = migration.up ? [from, to] : [to, from];
   await migration.adapter.query(
     kind === "INDEX" ? `ALTER INDEX ${quoteTable(schema, f)} RENAME TO "${t}"` : `ALTER TABLE ${quoteTable(
@@ -2535,7 +2776,7 @@ const renameTableItem = async (migration, tableName, from, to, kind) => {
   );
 };
 const addOrDropEnumValues = async (migration, up, enumName, values, options) => {
-  const [schema, name] = getSchemaAndTableFromName(enumName);
+  const [schema, name] = getSchemaAndTableFromName(migration.options, enumName);
   const quotedName = quoteTable(schema, name);
   const ast = {
     type: "enumValues",
@@ -2571,7 +2812,7 @@ const addOrDropEnumValues = async (migration, up, enumName, values, options) =>
   );
 };
 const changeEnumValues = async (migration, enumName, fromValues, toValues) => {
-  const [schema, name] = getSchemaAndTableFromName(enumName);
+  const [schema, name] = getSchemaAndTableFromName(migration.options, enumName);
   if (!migration.up) {
     const values = fromValues;
     fromValues = toValues;
@@ -2594,7 +2835,8 @@ const changeEnumValues = async (migration, enumName, fromValues, toValues) => {
   );
 };
 const recreateEnum = async (migration, { schema, name }, values, errorMessage) => {
-  const defaultSchema = migration.options.schema ?? "public";
+  const configSchema = migration.options.schema;
+  const defaultSchema = (typeof configSchema === "function" ? configSchema() : void 0) ?? "public";
   const quotedName = quoteTable(schema, name);
   const relKinds = ["r", "m"];
   const { rows: tables } = await migration.adapter.query(
@@ -2664,8 +2906,7 @@ ${migrationCode}`
   );
   config.logger?.log(`Created ${pqb.pathToLog(filePath)}`);
 };
-const newMigration = async (config, [name]) => {
-  if (!name) throw new Error("Migration name is missing");
+const newMigration = async (config, name) => {
   const version = await makeFileVersion({}, config);
   await writeMigrationFile(config, version, name, makeContent(name));
 };
@@ -2721,16 +2962,9 @@ const fileNamesToChangeMigrationId = {
   timestamp: ".rename-to-timestamp.json"
 };
 const fileNamesToChangeMigrationIdMap = Object.fromEntries(
-  Object.entries(fileNamesToChangeMigrationId).map(([_, name]) => [name, true])
+  Object.entries(fileNamesToChangeMigrationId).map(([, name]) => [name, true])
 );
-const changeIds = async (adapters, config, [arg, digitsArg]) => {
-  if (arg !== "serial" && arg !== "timestamp") {
-    throw new Error(
-      `Pass "serial" or "timestamp" argument to the "change-ids" command`
-    );
-  }
-  let digits = digitsArg && parseInt(digitsArg);
-  if (!digits || isNaN(digits)) digits = 4;
+const changeIds = async (adapters, config, { format, digits = 4 }) => {
   const data = await getMigrations({}, config, true, false, (_, filePath) => {
     const fileName = path.basename(filePath);
     const match = fileName.match(/^(\d+)\D/);
@@ -2742,9 +2976,9 @@ const changeIds = async (adapters, config, [arg, digitsArg]) => {
     return match[1];
   });
   if (data.renameTo) {
-    if (arg === "serial" && typeof data.renameTo.to === "object" && digits === data.renameTo.to.serial || arg === "timestamp" && data.renameTo.to === "timestamp") {
+    if (format === "serial" && typeof data.renameTo.to === "object" && digits === data.renameTo.to.serial || format === "timestamp" && data.renameTo.to === "timestamp") {
       config.logger?.log(
-        config.migrations ? "`renameMigrations` setting is already set" : `${fileNamesToChangeMigrationId[arg]} already exists`
+        config.migrations ? "`renameMigrations` setting is already set" : `${fileNamesToChangeMigrationId[format]} already exists`
       );
       return;
     }
@@ -2757,15 +2991,15 @@ const changeIds = async (adapters, config, [arg, digitsArg]) => {
       );
     }
   }
-  const version = arg === "timestamp" ? parseInt(generateTimeStamp()) : 1;
+  const version = format === "timestamp" ? parseInt(generateTimeStamp()) : 1;
   const rename = Object.fromEntries(
     data.migrations.map((item, i) => [path.basename(item.path), version + i])
   );
   if (config.migrations) {
-    const to = arg === "timestamp" ? `'${arg}'` : `{ serial: ${digits} }`;
+    const to = format === "timestamp" ? `'${format}'` : `{ serial: ${digits} }`;
     config.logger?.log(
       `Save the following settings into your rake-db config under the \`migrations\` setting, it will instruct rake-db to rename migration entries during the next deploy:
-${arg !== "serial" || digits !== 4 ? `
+${format !== "serial" || digits !== 4 ? `
 migrationId: ${to},` : ""}
 renameMigrations: {
   to: ${to},
@@ -2774,14 +3008,14 @@ renameMigrations: {
     );
   } else {
     await fs.writeFile(
-      path.join(config.migrationsPath, fileNamesToChangeMigrationId[arg]),
+      path.join(config.migrationsPath, fileNamesToChangeMigrationId[format]),
       JSON.stringify(rename, null, 2)
     );
   }
   const values = data.migrations.map(
     (item, i) => {
       let newVersion = String(version + i);
-      if (arg === "serial") newVersion = newVersion.padStart(digits, "0");
+      if (format === "serial") newVersion = newVersion.padStart(digits, "0");
       const name = path.basename(item.path).slice(item.version.length + 1);
       return [item.version, name, newVersion];
     }
@@ -2818,9 +3052,9 @@ After setting \`renameMigrations\` (see above) and renaming the files, run the d
     })
   );
   config.logger?.log(
-    `Migration files were renamed, a config file ${fileNamesToChangeMigrationId[arg]} for renaming migrations after deploy was created, and migrations in local db were renamed successfully.
+    `Migration files were renamed, a config file ${fileNamesToChangeMigrationId[format]} for renaming migrations after deploy was created, and migrations in local db were renamed successfully.
 
-${arg === "timestamp" || digits !== 4 ? `Set \`migrationId\`: ${arg === "timestamp" ? `'timestamp'` : `{ serial: ${digits} }`}` : `Remove \`migrationId\``} setting in the rake-db config`
+${format === "timestamp" || digits !== 4 ? `Set \`migrationId\`: ${format === "timestamp" ? `'timestamp'` : `{ serial: ${digits} }`}` : `Remove \`migrationId\``} setting in the rake-db config`
   );
 };
 const renameMigrationVersionsInDb = async (config, adapter, values) => {
@@ -2998,35 +3232,26 @@ const saveMigratedVersion = async (db, version, name, config) => {
     [version, name]
   );
 };
-const createMigrationsTable = async (db, config) => {
-  const { schema } = getMigrationsSchemaAndTable(config);
+const createMigrationsSchemaAndTable = async (adapter, config) => {
+  const { schema, table } = getMigrationsSchemaAndTable(config);
   if (schema) {
-    try {
-      await db.query(`CREATE SCHEMA "${schema}"`);
-      config.logger?.log(`Created schema ${schema}`);
-    } catch (err) {
-      if (err.code !== "42P06") {
-        throw err;
-      }
+    const res2 = await createSchema$1(adapter, schema);
+    if (res2 === "done") {
+      config.logger?.log(`Created schema "${schema}"`);
     }
   }
-  try {
-    await db.query(
-      `CREATE TABLE ${migrationsSchemaTableSql(
-        config
-      )} ( version TEXT NOT NULL, name TEXT NOT NULL )`
+  const res = await createTable$1(
+    adapter,
+    `${schema ? `"${schema}"."${table}"` : `"${table}"`} (version TEXT NOT NULL, name TEXT NOT NULL)`
+  );
+  if (res === "done") {
+    config.logger?.log(
+      `Created migration versions table ${schema ? `"${schema}".` : ""}"${table}"`
     );
-    config.logger?.log("Created versions table");
-  } catch (err) {
-    if (err.code === "42P07") {
-      config.logger?.log("Versions table exists");
-    } else {
-      throw err;
-    }
   }
 };
-const deleteMigratedVersion = async (db, version, name, config) => {
-  const res = await db.silentArrays(
+const deleteMigratedVersion = async (adapter, version, name, config) => {
+  const res = await adapter.silentArrays(
     `DELETE FROM ${migrationsSchemaTableSql(
       config
     )} WHERE version = $1 AND name = $2`,
@@ -3116,91 +3341,76 @@ async function renameMigrations(config, trx, versions, renameTo) {
   return updatedVersions;
 }
 
-const transactionIfSingle = (params, fn) => {
-  return params.config.transaction === "single" ? transaction(params.adapter, fn) : fn(params.adapter);
-};
-function makeMigrateFn(up, fn) {
-  return async (params) => {
-    const ctx = params.ctx || {};
-    const set = await getMigrations(ctx, params.config, up);
-    const count = params.count ?? Infinity;
-    const force = params.force ?? false;
+const transactionIfSingle = (adapter, config, fn) => {
+  return !adapter.isInTransaction() && config.transaction === "single" ? transaction(adapter, fn) : fn(adapter);
+};
+function makeMigrateFn(up, defaultCount, fn) {
+  return async (db, config, params) => {
+    const ctx = params?.ctx || {};
+    const set = await getMigrations(ctx, config, up);
+    const count = params?.count ?? defaultCount;
+    const force = params?.force ?? false;
+    const adapter = getMaybeTransactionAdapter(db);
     let migrations;
     try {
-      await transactionIfSingle(params, async (trx) => {
+      await transactionIfSingle(adapter, config, async (trx) => {
         const versions = await getMigratedVersionsMap(
           ctx,
           trx,
-          params.config,
+          config,
           set.renameTo
         );
-        migrations = await fn(trx, params.config, set, versions, count, force);
+        migrations = await fn(trx, config, set, versions, count, force);
       });
     } catch (err) {
       if (err instanceof NoMigrationsTableError) {
-        await transactionIfSingle(params, async (trx) => {
-          await createMigrationsTable(trx, params.config);
+        await transactionIfSingle(adapter, config, async (trx) => {
+          await createMigrationsSchemaAndTable(trx, config);
           const versions = await getMigratedVersionsMap(
             ctx,
             trx,
-            params.config,
+            config,
             set.renameTo
           );
-          migrations = await fn(
-            trx,
-            params.config,
-            set,
-            versions,
-            count,
-            force
-          );
+          migrations = await fn(trx, config, set, versions, count, force);
         });
       } else {
         throw err;
       }
     }
-    params.config.afterChangeCommit?.({
-      adapter: params.adapter,
+    config.afterChangeCommit?.({
+      adapter,
       up,
       migrations
     });
   };
 }
-const makeMigrateCommand = (migrateFn, defaultCount) => {
-  return async (adapters, config, args) => {
-    const arg = args[0];
-    let force = arg === "force";
-    let count = defaultCount;
-    if (arg === "force") {
-      force = true;
-    } else {
-      force = false;
-      const num = arg === "all" ? Infinity : parseInt(arg || "");
-      if (!isNaN(num)) {
-        count = num;
-      }
-    }
-    for (const adapter of adapters) {
-      await migrateFn({ ctx: {}, adapter, config, count, force });
-    }
-  };
-};
 const migrate = makeMigrateFn(
   true,
+  Infinity,
   (trx, config, set, versions, count, force) => migrateOrRollback(trx, config, set, versions, count, true, false, force)
 );
-const migrateAndClose = async (params) => {
-  await migrate(params);
-  await params.adapter.close();
+const migrateAndClose = async (db, config, params) => {
+  const adapter = getMaybeTransactionAdapter(db);
+  await migrate(adapter, config, params);
+  await adapter.close();
+};
+const runMigration = async (db, migration) => {
+  await ensureTransaction(db, async (trx) => {
+    clearChanges();
+    const changes = await getChanges({ load: migration });
+    const config = changes[0]?.config;
+    await applyMigration(trx, true, changes, config);
+  });
 };
-const migrateCommand = makeMigrateCommand(migrate, Infinity);
 const rollback = makeMigrateFn(
   false,
+  1,
   (trx, config, set, versions, count, force) => migrateOrRollback(trx, config, set, versions, count, false, false, force)
 );
-const rollbackCommand = makeMigrateCommand(rollback, 1);
 const redo = makeMigrateFn(
   true,
+  1,
   async (trx, config, set, versions, count, force) => {
     set.migrations.reverse();
     await migrateOrRollback(trx, config, set, versions, count, false, true);
@@ -3218,7 +3428,6 @@ const redo = makeMigrateFn(
     );
   }
 );
-const redoCommand = makeMigrateCommand(redo, 1);
 const getDb = (adapter) => pqb.createDbWithAdapter({ adapter });
 const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, force, skipLock) => {
   const { sequence, map: versionsMap } = versions;
@@ -3257,7 +3466,7 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
   }
   let loggedAboutStarting = false;
   let migrations;
-  const migrationRunner = config.transaction === "single" ? runMigration : runMigrationInOwnTransaction;
+  const migrationRunner = trx.isInTransaction() || config.transaction === "single" ? applyMigration : runMigrationInOwnTransaction;
   for (const file of set.migrations) {
     if (up && versionsMap[file.version] || !up && !versionsMap[file.version]) {
       continue;
@@ -3325,347 +3534,53 @@ const checkMigrationOrder = (config, set, { sequence, map }, force) => {
           `Cannot migrate ${path.basename(
             file.path
           )} because the higher position ${map[versionToString(config, last)]} was already migrated.
-Run \`**db command** up force\` to rollback the above migrations and migrate all`
-        );
-      }
-      return version;
-    }
-  }
-  return;
-};
-const changeCache = {};
-const getChanges = async (file, config) => {
-  clearChanges();
-  let changes = file.path ? changeCache[file.path] : void 0;
-  if (!changes) {
-    const module = await file.load();
-    const exported = module?.default && pqb.toArray(module.default);
-    if (config?.forceDefaultExports && !exported) {
-      throw new RakeDbError(
-        `Missing a default export in ${file.path} migration`
-      );
-    }
-    changes = exported || getCurrentChanges();
-    if (file.path) changeCache[file.path] = changes;
-  }
-  return changes;
-};
-const runMigrationInOwnTransaction = (adapter, ...rest) => {
-  return transaction(adapter, (trx) => runMigration(trx, ...rest));
-};
-const runMigration = async (trx, up, changes, config) => {
-  const db = createMigrationInterface(trx, up, config);
-  if (changes.length) {
-    const from = up ? 0 : changes.length - 1;
-    const to = up ? changes.length : -1;
-    const step = up ? 1 : -1;
-    for (let i = from; i !== to; i += step) {
-      await changes[i].fn(db, up);
-    }
-  }
-  return db.adapter;
-};
-const changeMigratedVersion = async (adapter, up, file, config) => {
-  await (up ? saveMigratedVersion : deleteMigratedVersion)(
-    adapter,
-    file.version,
-    path.basename(file.path).slice(file.version.length + 1),
-    config
-  );
-};
-
-const ESC = "\x1B";
-const CSI = `${ESC}[`;
-const cursorShow = `${CSI}?25h`;
-const cursorHide = `${CSI}?25l`;
-const { stdin, stdout } = process;
-const visibleChars = (s) => s.replace(
-  // eslint-disable-next-line no-control-regex
-  /[\u001B\u009B][[\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\d/#&.:=?%@~_]+)*|[a-zA-Z\d]+(?:;[-a-zA-Z\d/#&.:=?%@~_]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[\dA-PRZcf-ntqry=><~]))/g,
-  ""
-).length;
-const clear = (text) => {
-  const rows = text.split(/\r?\n/).reduce(
-    (rows2, line) => rows2 + 1 + Math.floor(Math.max(visibleChars(line) - 1, 0) / stdout.columns),
-    0
-  );
-  let clear2 = "";
-  for (let i = 0; i < rows; i++) {
-    clear2 += `${CSI}2K`;
-    if (i < rows - 1) {
-      clear2 += `${CSI}${i < rows - 1 ? "1A" : "G"}`;
-    }
-  }
-  return clear2;
-};
-const prompt = async ({
-  render,
-  onKeyPress,
-  validate,
-  value,
-  cursor: showCursor
-}) => {
-  stdin.resume();
-  if (stdin.isTTY) stdin.setRawMode(true);
-  stdin.setEncoding("utf-8");
-  if (!showCursor) stdout.write(cursorHide);
-  return new Promise((res) => {
-    let prevText;
-    const ctx = {
-      value,
-      submitted: false,
-      render() {
-        let text = (ctx.submitted ? pqb.colors.greenBold("\u2714") : pqb.colors.yellowBold("?")) + " " + render(ctx);
-        if (ctx.submitted) text += "\n";
-        stdout.write(prevText ? clear(prevText) + "\r" + text : text);
-        prevText = text;
-      },
-      submit(value2) {
-        if (value2 !== void 0) ctx.value = value2;
-        if (ctx.value === void 0 || validate && !validate?.(ctx)) return;
-        ctx.submitted = true;
-        ctx.render();
-        close();
-        res(ctx.value);
-      }
-    };
-    const close = () => {
-      if (!showCursor) stdout.write(cursorShow);
-      if (stdin.isTTY) stdin.setRawMode(false);
-      stdin.off("data", keypress);
-      stdin.pause();
-    };
-    const keypress = (s) => {
-      if (s === "" || s === "") {
-        close?.();
-        process.exit(0);
-      }
-      if (s === "\r" || s === "\n" || s === "\r\n") {
-        ctx.submit();
-      } else {
-        onKeyPress(ctx, s);
-      }
-    };
-    stdin.on("data", keypress);
-    ctx.render();
-  });
-};
-const defaultActive = (s) => `${pqb.colors.blueBold("\u276F")} ${s}`;
-const defaultInactive = (s) => `  ${s}`;
-const promptSelect = ({
-  message,
-  options,
-  active = defaultActive,
-  inactive = defaultInactive
-}) => prompt({
-  value: 0,
-  render(ctx) {
-    let text = `${message} ${pqb.colors.pale(
-      "Use arrows or jk. Press enter to submit."
-    )}
-`;
-    for (let i = 0; i < options.length; i++) {
-      text += (ctx.value === i ? active : inactive)(options[i]) + "\n";
-    }
-    return text;
-  },
-  onKeyPress(ctx, s) {
-    ctx.value = s === "\x1B[H" ? 0 : s === "\x1B[F" ? options.length - 1 : s === "\x1B[A" || s === "k" ? ctx.value === 0 ? options.length - 1 : ctx.value - 1 : s === "\x1B[B" || s === "j" || s === "	" ? ctx.value === options.length - 1 ? 0 : ctx.value + 1 : ctx.value;
-    ctx.render();
-  }
-});
-const promptConfirm = ({
-  message
-}) => prompt({
-  value: true,
-  render(ctx) {
-    return `${pqb.colors.bright(message)}
-${ctx.submitted ? `> ${ctx.value ? pqb.colors.greenBold("Yes") : pqb.colors.yellowBold("No")}` : pqb.colors.pale(`> (Y/n)`)}
-`;
-  },
-  onKeyPress(ctx, s) {
-    let ok;
-    if (s === "y" || s === "Y") ok = true;
-    else if (s === "n" || s === "N") ok = false;
-    if (ok !== void 0) {
-      ctx.submit(ok);
-    }
-  }
-});
-const promptText = ({
-  message,
-  default: def = "",
-  password,
-  min
-}) => {
-  let showDefault = true;
-  let x = 0;
-  const renderValue = (ctx) => password ? "*".repeat(ctx.value.length) : ctx.value;
-  return prompt({
-    value: def,
-    cursor: true,
-    validate: (ctx) => !min || ctx.value.length >= min,
-    render(ctx) {
-      let text = `${pqb.colors.bright(message)}
-> ${ctx.submitted ? renderValue(ctx) : showDefault ? pqb.colors.pale(def) + "\b".repeat(def.length) : ctx.value}`;
-      if (ctx.submitted) text += "\n";
-      return text;
-    },
-    onKeyPress(ctx, s) {
-      let value = showDefault ? "" : ctx.value;
-      if (s === "\x1B[D" && x > 0) {
-        x--;
-        stdout.write("\b");
-      } else if (s === "\x1B[C" && x < value.length) {
-        stdout.write(value[x]);
-        x++;
-      }
-      if (s !== "\x7F" && s !== "\x1B[3~" && !visibleChars(s)) return;
-      if (showDefault) {
-        showDefault = false;
-        stdout.write(" ".repeat(def.length) + "\b".repeat(def.length));
-      }
-      const prev = value;
-      const prevX = x;
-      if (s === "\x7F") {
-        if (x > 0) {
-          value = value.slice(0, x - 1) + value.slice(x);
-          x--;
-        }
-      } else if (s === "\x1B[3~") {
-        if (x < value.length) {
-          value = value.slice(0, x) + value.slice(x + 1);
-        }
-      } else {
-        value = value.slice(0, x) + s + value.slice(x);
-        x++;
-      }
-      ctx.value = value;
-      const spaces = prev.length - value.length;
-      stdout.write(
-        "\b".repeat(prevX) + renderValue(ctx) + (spaces > 0 ? " ".repeat(spaces) + "\b".repeat(spaces) : "") + "\b".repeat(value.length - x)
-      );
-    }
-  });
-};
-
-const execute = async (adapter, sql) => {
-  try {
-    await adapter.query(sql);
-    return "ok";
-  } catch (error) {
-    const err = error;
-    if (typeof err.message === "string" && err.message.includes("sslmode=require")) {
-      return "ssl required";
-    }
-    if (err.code === "42P04" || err.code === "3D000") {
-      return "already";
-    } else if (err.code === "42501" || typeof err.message === "string" && err.message.includes("password authentication failed")) {
-      return "forbidden";
-    } else {
-      return { error };
-    }
-  } finally {
-    await adapter.close();
-  }
-};
-const createOrDrop = async (adapter, adminAdapter, config, args) => {
-  const params = {
-    database: adapter.getDatabase(),
-    user: adapter.getUser()
-  };
-  const result = await execute(
-    adminAdapter.reconfigure({ database: "postgres" }),
-    args.sql(params)
-  );
-  if (result === "ok") {
-    config.logger?.log(args.successMessage(params));
-  } else if (result === "already") {
-    config.logger?.log(args.alreadyMessage(params));
-  } else if (result === "ssl required") {
-    config.logger?.log(
-      "SSL is required: append ?ssl=true to the database url string"
-    );
-    return;
-  } else if (result === "forbidden") {
-    let message = `Permission denied to ${args.create ? "create" : "drop"} database.`;
-    const host = adminAdapter.getHost();
-    const isLocal = host === "localhost";
-    if (!isLocal) {
-      message += `
-Don't use this command for database service providers, only for a local db.`;
-    }
-    config.logger?.log(message);
-    const params2 = await askForAdminCredentials(args.create);
-    if (!params2) return;
-    await createOrDrop(adapter, adminAdapter.reconfigure(params2), config, args);
-    return;
-  } else {
-    throw result.error;
-  }
-  if (!args.create) return;
-  const newlyConnectedAdapter = adapter.reconfigure({});
-  await createMigrationsTable(newlyConnectedAdapter, config);
-  await newlyConnectedAdapter.close();
-};
-const createDb = async (adapters, config) => {
-  for (const adapter of adapters) {
-    await createOrDrop(adapter, adapter, config, {
-      sql({ database, user }) {
-        return `CREATE DATABASE "${database}"${user ? ` OWNER "${user}"` : ""}`;
-      },
-      successMessage({ database }) {
-        return `Database ${database} successfully created`;
-      },
-      alreadyMessage({ database }) {
-        return `Database ${database} already exists`;
-      },
-      create: true
-    });
-  }
-};
-const dropDb = async (adapters, config) => {
-  for (const adapter of adapters) {
-    await createOrDrop(adapter, adapter, config, {
-      sql({ database }) {
-        return `DROP DATABASE "${database}"`;
-      },
-      successMessage({ database }) {
-        return `Database ${database} was successfully dropped`;
-      },
-      alreadyMessage({ database }) {
-        return `Database ${database} does not exist`;
+Run \`**db command** up force\` to rollback the above migrations and migrate all`
+        );
       }
-    });
+      return version;
+    }
   }
+  return;
 };
-const resetDb = async (adapters, config) => {
-  await dropDb(adapters, config);
-  await createDb(adapters, config);
-  for (const adapter of adapters) {
-    await migrate({ adapter, config });
+const changeCache = {};
+const getChanges = async (file, config) => {
+  clearChanges();
+  let changes = file.path ? changeCache[file.path] : void 0;
+  if (!changes) {
+    const module = await file.load();
+    const exported = module?.default && pqb.toArray(module.default);
+    if (config?.forceDefaultExports && !exported) {
+      throw new RakeDbError(
+        `Missing a default export in ${file.path} migration`
+      );
+    }
+    changes = exported || getCurrentChanges();
+    if (file.path) changeCache[file.path] = changes;
   }
+  return changes;
 };
-const askForAdminCredentials = async (create) => {
-  const ok = await promptConfirm({
-    message: `Would you like to share admin credentials to ${create ? "create" : "drop"} a database?`
-  });
-  if (!ok) {
-    return;
+const runMigrationInOwnTransaction = (adapter, ...rest) => {
+  return transaction(adapter, (trx) => applyMigration(trx, ...rest));
+};
+const applyMigration = async (trx, up, changes, config) => {
+  const db = createMigrationInterface(trx, up, config);
+  if (changes.length) {
+    const from = up ? 0 : changes.length - 1;
+    const to = up ? changes.length : -1;
+    const step = up ? 1 : -1;
+    for (let i = from; i !== to; i += step) {
+      await changes[i].fn(db, up);
+    }
   }
-  const user = await promptText({
-    message: "Enter admin user:",
-    default: "postgres",
-    min: 1
-  });
-  const password = await promptText({
-    message: "Enter admin password:",
-    password: true
-  });
-  return {
-    user,
-    password: password || void 0
-  };
+  return db.adapter;
+};
+const changeMigratedVersion = async (adapter, up, file, config) => {
+  await (up ? saveMigratedVersion : deleteMigratedVersion)(
+    adapter,
+    file.version,
+    path.basename(file.path).slice(file.version.length + 1),
+    config
+  );
 };
 
 const runRecurrentMigrations = async (adapters, config) => {
@@ -3706,6 +3621,131 @@ const readdirRecursive = async (dirPath, cb) => {
   );
 };
 
+const createDatabaseCommand = (adapters, config, dontClose) => createOrDropDatabase("create", adapters, config, dontClose);
+const dropDatabaseCommand = (adapters, config) => createOrDropDatabase("drop", adapters, config);
+const createOrDropDatabase = async (action, adapters, config, dontClose) => {
+  const fn = action === "create" ? createDatabase : dropDatabase;
+  for (const adapter of adapters) {
+    const database = adapter.getDatabase();
+    const owner = adapter.getUser();
+    const res = await run(
+      adapter.reconfigure({ database: "postgres" }),
+      config,
+      {
+        command: (adapter2) => fn(adapter2, {
+          database,
+          owner
+        }),
+        doneMessage: () => `Database ${database} successfully ${action === "create" ? "created" : "dropped"}`,
+        alreadyMessage: () => `Database ${database} ${action === "create" ? "already exists" : "does not exist"}`,
+        deniedMessage: () => `Permission denied to ${action} database.`,
+        askAdminCreds: () => askForAdminCredentials(action === "create")
+      }
+    );
+    if (!res) continue;
+    if (action === "create") {
+      await adapter.transaction(void 0, async (tx) => {
+        if (config.schema) {
+          const quoted = `"${config.schema}"`;
+          const res2 = await createSchema$1(tx, quoted);
+          if (res2 === "done") {
+            config.logger?.log(`Created schema ${quoted}`);
+          }
+        }
+        await createMigrationsSchemaAndTable(tx, config);
+      });
+      if (!dontClose) {
+        await adapter.close();
+      }
+    }
+  }
+};
+const resetDatabaseCommand = async (adapters, config) => {
+  await createOrDropDatabase("create", adapters, config);
+  await createOrDropDatabase("drop", adapters, config, true);
+  for (const adapter of adapters) {
+    await migrate(adapter, config);
+  }
+  if (config.recurrentPath) {
+    await runRecurrentMigrations(adapters, config);
+  }
+  await Promise.all(adapters.map((adapter) => adapter.close()));
+};
+const run = async (adapter, config, params) => {
+  try {
+    const res = await params.command(adapter);
+    config.logger?.log(
+      res === "done" ? params.doneMessage() : params.alreadyMessage()
+    );
+    await adapter.close();
+    return true;
+  } catch (err) {
+    if (err instanceof CreateOrDropError) {
+      if (err.status === "ssl-required") {
+        config.logger?.log(
+          "SSL is required: append ?ssl=true to the database url string"
+        );
+        return false;
+      }
+      if (err.status === "forbidden" || err.status === "auth-failed") {
+        let message = params.deniedMessage();
+        const host = adapter.getHost();
+        const isLocal = host === "localhost";
+        if (!isLocal) {
+          message += `
+Don't use this command for database service providers, only for a local db.`;
+        }
+        config.logger?.log(message);
+        const creds = await params.askAdminCreds();
+        if (!creds) return false;
+        return run(adapter.reconfigure(creds), config, params);
+      }
+    }
+    throw err;
+  }
+};
+const askForAdminCredentials = async (create) => {
+  const ok = await promptConfirm({
+    message: `Would you like to share admin credentials to ${create ? "create" : "drop"} a database?`
+  });
+  if (!ok) {
+    return;
+  }
+  const user = await promptText({
+    message: "Enter admin user:",
+    default: "postgres",
+    min: 1
+  });
+  const password = await promptText({
+    message: "Enter admin password:",
+    password: true
+  });
+  return {
+    user,
+    password: password || void 0
+  };
+};
+
+const makeMigrateOrRollback = (fn) => async (adapters, config, args) => {
+  const arg = args[0];
+  let force;
+  let count;
+  if (arg === "force") {
+    force = true;
+  } else {
+    const num = arg === "all" ? Infinity : parseInt(arg || "");
+    if (!isNaN(num)) {
+      count = num;
+    }
+  }
+  for (const adapter of adapters) {
+    await fn(adapter, config, { ctx: {}, count, force });
+  }
+};
+const migrateCommand = makeMigrateOrRollback(migrate);
+const rollbackCommand = makeMigrateOrRollback(rollback);
+const redoCommand = makeMigrateOrRollback(redo);
+
 const astToGenerateItems = (config, asts, currentSchema) => {
   return asts.map((ast) => astToGenerateItem(config, ast, currentSchema));
 };
@@ -3717,7 +3757,10 @@ const astToGenerateItem = (config, ast, currentSchema) => {
   const resolveType = (type) => {
     let dep = typeSchemaCache.get(type);
     if (!dep) {
-      const [schema = currentSchema, name] = getSchemaAndTableFromName(type);
+      const [schema = currentSchema, name] = getSchemaAndTableFromName(
+        config,
+        type
+      );
       dep = `${schema}.${name}`;
       typeSchemaCache.set(type, dep);
     }
@@ -3907,7 +3950,10 @@ const analyzeTableColumns = (config, currentSchema, schema, table, deps, resolve
             config.snakeCase
           )
         );
-        const [s = currentSchema, t] = getForeignKeyTable(fkey.fnOrTable);
+        const [s = currentSchema, t] = getForeignKeyTable(
+          config,
+          fkey.fnOrTable
+        );
         const foreignTable = `${s}.${t}`;
         if (foreignTable !== table) {
           deps.push(foreignTable);
@@ -3952,6 +3998,7 @@ const analyzeTableData = (config, currentSchema, schema, table, keys, deps, data
       );
       if (constraint.references) {
         const [s = currentSchema, t] = getForeignKeyTable(
+          config,
           constraint.references.fnOrTable
         );
         deps.push(`${s}.${t}`);
@@ -5413,36 +5460,239 @@ const checkIfIsOuterRecursiveFkey = (data, table, references) => {
       break;
     }
   }
-  return false;
-};
+  return false;
+};
+
+const pullDbStructure = async (adapter, config) => {
+  const currentSchema = adapter.searchPath || "public";
+  const ctx = makeStructureToAstCtx(config, currentSchema);
+  const ast = await structureToAst(ctx, adapter, config);
+  const result = astToMigration(currentSchema, config, ast);
+  if (!result) return;
+  const version = await makeFileVersion({}, config);
+  await writeMigrationFile(config, version, "pull", result);
+  const silentQueries = Object.assign(adapter, {
+    silentQuery: adapter.query,
+    silentArrays: adapter.arrays
+  });
+  await saveMigratedVersion(silentQueries, version, "pull", config);
+  const unsupportedEntries = Object.entries(ctx.unsupportedTypes);
+  const len = unsupportedEntries.length;
+  if (len) {
+    let count = 0;
+    config.logger?.warn(
+      `Found unsupported types:
+${unsupportedEntries.map(([type, columns]) => {
+        count += columns.length;
+        return `- ${type} is used for column${columns.length > 1 ? "s" : ""} ${columns.join(", ")}`;
+      }).join("\n")}
+Append \`as\` method manually to ${count > 1 ? "these" : "this"} column${count > 1 ? "s" : ""} to treat ${count > 1 ? "them" : "it"} as other column type`
+    );
+  }
+  config.logger?.log("Database pulled successfully");
+};
+
+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, intermediateCallers2 = 0) => {
+  if (config.basePath && config.dbScript) return config;
+  let filePath = pqb.getStackTrace()?.[3 + intermediateCallers2]?.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;
+};
+let intermediateCallers = 0;
+const incrementIntermediateCaller = () => {
+  intermediateCallers++;
+};
+const makeRakeDbConfig = (config, args) => {
+  const ic = intermediateCallers;
+  intermediateCallers = 0;
+  const result = {
+    ...migrationConfigDefaults,
+    ...config,
+    __rakeDbConfig: true
+  };
+  if (!result.log) {
+    delete result.logger;
+  }
+  ensureBasePathAndDbScript(result, ic);
+  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 };
+  }
+  const transaction = getCliParam(args, "transaction");
+  if (transaction) {
+    if (transaction !== "single" && transaction !== "per-migration") {
+      throw new Error(
+        `Unsupported transaction param ${transaction}, expected single or per-migration`
+      );
+    }
+    result.transaction = transaction;
+  } else if (!result.transaction) {
+    result.transaction = "single";
+  }
+  let c = rakeDbCommands;
+  if (config.commands) {
+    c = { ...c };
+    const commands = config.commands;
+    for (const key in commands) {
+      const command = commands[key];
+      c[key] = typeof command === "function" ? { run: command } : command;
+    }
+  }
+  result.commands = c;
+  return result;
+};
+
+const listMigrationsStatuses = async (adapters, config, params) => {
+  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 = params?.showUrl;
+  const asIs = (s) => s;
+  const c = typeof config.log === "object" && config.log.colors === false ? {
+    yellow: asIs,
+    green: asIs,
+    red: asIs,
+    blue: asIs
+  } : pqb.colors;
+  const log = Object.values(map).map(({ databases, migrations: migrations2 }) => {
+    let log2 = ` ${c.yellow("Database:")} ${databases.join(", ")}`;
+    if (migrations2.length === 0) {
+      return log2 + `
 
-const pullDbStructure = async (adapter, config) => {
-  const currentSchema = adapter.searchPath || "public";
-  const ctx = makeStructureToAstCtx(config, currentSchema);
-  const ast = await structureToAst(ctx, adapter, config);
-  const result = astToMigration(currentSchema, config, ast);
-  if (!result) return;
-  const version = await makeFileVersion({}, config);
-  await writeMigrationFile(config, version, "pull", result);
-  const silentQueries = Object.assign(adapter, {
-    silentQuery: adapter.query,
-    silentArrays: adapter.arrays
-  });
-  await saveMigratedVersion(silentQueries, version, "pull", config);
-  const unsupportedEntries = Object.entries(ctx.unsupportedTypes);
-  const len = unsupportedEntries.length;
-  if (len) {
-    let count = 0;
-    config.logger?.warn(
-      `Found unsupported types:
-${unsupportedEntries.map(([type, columns]) => {
-        count += columns.length;
-        return `- ${type} is used for column${columns.length > 1 ? "s" : ""} ${columns.join(", ")}`;
-      }).join("\n")}
-Append \`as\` method manually to ${count > 1 ? "these" : "this"} column${count > 1 ? "s" : ""} to treat ${count > 1 ? "them" : "it"} as other column type`
+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;
   }
-  config.logger?.log("Database pulled successfully");
+  return chars;
 };
 
 const rebase = async (adapters, config) => {
@@ -5583,11 +5833,7 @@ const rebase = async (adapters, config) => {
     }
   };
   for (const adapter of adapters) {
-    await redo({
-      ctx,
-      adapter,
-      config: redoConfig
-    });
+    await redo(adapter, redoConfig, { ctx, count: Infinity });
   }
   for (let i = renames.length - 1; i >= 0; i--) {
     const [from, version] = renames[i];
@@ -5602,111 +5848,52 @@ const rebase = async (adapters, config) => {
   }
 };
 
-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
-  } : pqb.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 rakeDbAliases = {
   migrate: "up",
   rollback: "down",
   s: "status",
   rec: "recurrent"
 };
-const runCommand = async (adapters, config, args = process.argv.slice(2)) => {
+const rakeDbCliWithAdapter = (inputConfig, args = process.argv.slice(2)) => {
+  let config;
+  if ("__rakeDbConfig" in inputConfig) {
+    config = inputConfig;
+  } else {
+    incrementIntermediateCaller();
+    config = makeRakeDbConfig(inputConfig, args);
+  }
+  return {
+    change: makeChange(config),
+    async run(adapter, runArgs) {
+      const adapters = pqb.toArray(adapter);
+      try {
+        await runCommand(adapters, config, runArgs || args);
+      } catch (err) {
+        if (err instanceof RakeDbError) {
+          config.logger?.error(err.message);
+          process.exit(1);
+        }
+        throw err;
+      }
+    }
+  };
+};
+const setRakeDbCliRunFn = (rakeDbCli, mapper) => {
+  rakeDbCli.run = (adapter, inputConfig, args) => {
+    const { change, run } = rakeDbCli(inputConfig, args);
+    run(mapper(adapter));
+    return change;
+  };
+};
+setRakeDbCliRunFn(rakeDbCliWithAdapter, (x) => x);
+const runCommand = async (adapters, config, args) => {
   let arg = args[0]?.split(":")[0];
   if (rakeDbAliases[arg]) {
     args = [...args];
     arg = args[0] = rakeDbAliases[arg];
   }
   args.shift();
-  const command = rakeDbCommands[arg]?.run ?? config.commands[arg];
+  const command = config.commands[arg]?.run;
   if (command) {
     await command(adapters, config, args);
   } else if (config.logger) {
@@ -5714,8 +5901,8 @@ const runCommand = async (adapters, config, args = process.argv.slice(2)) => {
     let max = 0;
     let maxArgs = 0;
     const addedCommands = /* @__PURE__ */ new Map();
-    for (let key in rakeDbCommands) {
-      const command2 = rakeDbCommands[key];
+    for (let key in config.commands) {
+      const command2 = config.commands[key];
       const added = addedCommands.get(command2);
       if (added) key = added[0] += `, ${key}`;
       if (key.length > max) max = key.length;
@@ -5726,7 +5913,11 @@ const runCommand = async (adapters, config, args = process.argv.slice(2)) => {
           ...Object.keys(command2.helpArguments).map((key2) => key2.length + 5)
         );
       }
-      const helpBlock = [key, command2.help, command2.helpArguments];
+      const helpBlock = [
+        key,
+        command2.help || "undocumented custom command",
+        command2.helpArguments
+      ];
       addedCommands.set(command2, helpBlock);
       if (command2.helpAfter) {
         const i = commandsHelp.findIndex(([key2]) => key2 === command2.helpAfter);
@@ -5762,15 +5953,16 @@ ${Object.entries(helpArguments).map(
     }).join("\n\n")}
 `);
   }
-  return {
-    adapters,
-    config,
-    args
-  };
 };
 const close = (adapters) => Promise.all(adapters.map((adapter) => adapter.close()));
+const maybeRunRecurrent = async (adapters, config) => {
+  config.recurrentPath && await runRecurrentMigrations(
+    adapters,
+    config
+  );
+};
 const upCommand = {
-  run: (adapters, config, args) => migrateCommand(adapters, config, args).then(() => runRecurrentMigrations(adapters, config)).then(() => close(adapters)),
+  run: (adapters, config, args) => migrateCommand(adapters, config, args).then(() => maybeRunRecurrent(adapters, config)).then(() => close(adapters)),
   help: "migrate pending migrations",
   helpArguments: {
     "no arguments": "migrate all pending",
@@ -5788,36 +5980,40 @@ const downCommand = {
   }
 };
 const statusCommand = {
-  run: listMigrationsStatuses,
+  run(adapters, config, args) {
+    const showUrl = args.includes("p") || args.includes("path");
+    return listMigrationsStatuses(adapters, config, { showUrl });
+  },
   help: "list migrations statuses",
   helpArguments: {
     "no arguments": `does not print file paths`,
     "p, path": "also print file paths"
   }
 };
-const recurrentCommand = {
-  run: (adapters, config) => runRecurrentMigrations(adapters, config).then(() => close(adapters)),
+const recurrent = {
+  async run(adapters, config) {
+    if (!config.recurrentPath) return;
+    await maybeRunRecurrent(adapters, config).then(() => close(adapters));
+  },
   help: "run recurrent migrations"
 };
 const rakeDbCommands = {
   create: {
-    run: createDb,
+    run: (adapters, config) => createDatabaseCommand(adapters, config),
     help: "create databases"
   },
   drop: {
-    run: dropDb,
+    run: dropDatabaseCommand,
     help: "drop databases"
   },
   reset: {
-    run: (adapters, config) => resetDb(adapters, config).then(() => runRecurrentMigrations(adapters, config)).then(() => close(adapters)),
+    run: (adapters, config) => resetDatabaseCommand(adapters, config),
     help: "drop, create and migrate databases"
   },
   up: upCommand,
-  migrate: upCommand,
   down: downCommand,
-  rollback: downCommand,
   redo: {
-    run: (adapters, config, args) => redoCommand(adapters, config, args).then(() => runRecurrentMigrations(adapters, config)).then(() => close(adapters)),
+    run: (adapters, config, args) => redoCommand(adapters, config, args).then(() => maybeRunRecurrent(adapters, config)).then(() => close(adapters)),
     help: "rollback and migrate, run recurrent"
   },
   pull: {
@@ -5825,19 +6021,32 @@ const rakeDbCommands = {
     help: "generate a combined migration for an existing database"
   },
   new: {
-    run: (_, config, args) => newMigration(config, args),
+    run(_, config, args) {
+      const [name] = args;
+      if (!name) throw new Error("Migration name is missing");
+      return newMigration(config, name);
+    },
     help: "create new migration file"
   },
-  s: statusCommand,
   status: statusCommand,
-  rec: recurrentCommand,
-  recurrent: recurrentCommand,
+  recurrent,
   rebase: {
     run: (adapters, config) => rebase(adapters, config).then(() => close(adapters)),
     help: "move local migrations below the new ones from upstream"
   },
   "change-ids": {
-    run: changeIds,
+    run(adapters, config, [format, digitsArg]) {
+      if (format !== "serial" && format !== "timestamp") {
+        throw new Error(
+          `Pass "serial" or "timestamp" argument to the "change-ids" command`
+        );
+      }
+      const digits = digitsArg ? parseInt(digitsArg) : void 0;
+      if (digits && isNaN(digits)) {
+        throw new Error(`Second argument is optional and must be an integer`);
+      }
+      return changeIds(adapters, config, { format, digits });
+    },
     help: "change migrations ids format",
     helpArguments: {
       serial: "change ids to 4 digit serial",
@@ -5846,68 +6055,10 @@ const rakeDbCommands = {
     }
   }
 };
-
-const rakeDbWithAdapters = (adapters, partialConfig, args = process.argv.slice(2)) => {
-  const config = processRakeDbConfig(partialConfig, args);
-  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 () => {
-    const adapter = qb.internal.transactionStorage.getStore()?.adapter;
-    for (const load of files) {
-      clearChanges();
-      const changes = await getChanges({ load });
-      const config = changes[0]?.config;
-      await runMigration(adapter, true, changes, config);
-    }
-  });
-};
-const makeMigrateAdapter = (config) => {
-  const conf = ensureMigrationsPath(ensureBasePathAndDbScript(config || {}));
-  return async (adapter, params) => {
-    await migrateAndClose({
-      adapter,
-      ...params,
-      config: {
-        ...conf,
-        columnTypes: conf.columnTypes || pqb.makeColumnTypes(pqb.defaultSchemaConfig),
-        migrationId: conf.migrationId || migrationConfigDefaults.migrationId,
-        migrationsTable: conf.migrationsTable || migrationConfigDefaults.migrationsTable,
-        import: conf.import || migrationConfigDefaults.import,
-        transaction: conf.transaction || "single"
-      }
-    });
-  };
-};
+for (const key in rakeDbAliases) {
+  const command = rakeDbAliases[key];
+  if (command) rakeDbCommands[key] = rakeDbCommands[command];
+}
 
 exports.RakeDbError = RakeDbError;
 exports.astToMigration = astToMigration;
@@ -5922,23 +6073,24 @@ exports.getExcludeName = getExcludeName;
 exports.getIndexName = getIndexName;
 exports.getMigrationsSchemaAndTable = getMigrationsSchemaAndTable;
 exports.getSchemaAndTableFromName = getSchemaAndTableFromName;
+exports.incrementIntermediateCaller = incrementIntermediateCaller;
 exports.instantiateDbColumn = instantiateDbColumn;
 exports.introspectDbSchema = introspectDbSchema;
-exports.makeChange = makeChange;
 exports.makeDomainsMap = makeDomainsMap;
 exports.makeFileVersion = makeFileVersion;
-exports.makeMigrateAdapter = makeMigrateAdapter;
+exports.makeRakeDbConfig = makeRakeDbConfig;
 exports.makeStructureToAstCtx = makeStructureToAstCtx;
 exports.migrate = migrate;
 exports.migrateAndClose = migrateAndClose;
-exports.migrateFiles = migrateFiles;
 exports.migrationConfigDefaults = migrationConfigDefaults;
-exports.processRakeDbConfig = processRakeDbConfig;
 exports.promptSelect = promptSelect;
+exports.rakeDbCliWithAdapter = rakeDbCliWithAdapter;
 exports.rakeDbCommands = rakeDbCommands;
-exports.rakeDbWithAdapters = rakeDbWithAdapters;
-exports.runCommand = runCommand;
+exports.redo = redo;
+exports.rollback = rollback;
+exports.runMigration = runMigration;
 exports.saveMigratedVersion = saveMigratedVersion;
+exports.setRakeDbCliRunFn = setRakeDbCliRunFn;
 exports.structureToAst = structureToAst;
 exports.tableToAst = tableToAst;
 exports.writeMigrationFile = writeMigrationFile;