rake-db 2.30.8 → 2.31.0

package/dist/index.mjs

@@ -1,247 +1,8 @@
-import { colors, singleQuote, isRawSQL, escapeForMigration, ArrayColumn, toSnakeCase, toCamelCase, DomainColumn, toArray, EnumColumn, defaultSchemaConfig, snakeCaseKey, getColumnTypes, parseTableData, emptyObject, escapeString, tableDataMethods, setCurrentColumnName, consumeColumnName, Column, parseTableDataInput, UnknownColumn, setDefaultLanguage, deepCompare, raw, logParamToLogObject, createDbWithAdapter, getImportPath, pathToLog, emptyArray, exhaustive, codeToString, addCode, quoteObjectKey, pushTableDataCode, rawSqlToCode, primaryKeyInnerToCode, indexInnerToCode, excludeInnerToCode, constraintInnerToCode, referencesArgsToCode, backtickQuote, TimestampTZColumn, TimestampColumn, makeColumnsByType, RawSql, CustomTypeColumn, assignDbDataToColumn, PostgisGeographyPointColumn, makeColumnTypes, getStackTrace } from 'pqb';
+import { singleQuote, makeColumnTypes, defaultSchemaConfig, isRawSQL, escapeForMigration, ArrayColumn, toSnakeCase, toCamelCase, DomainColumn, toArray, EnumColumn, snakeCaseKey, getColumnTypes, parseTableData, emptyObject, escapeString, tableDataMethods, setCurrentColumnName, consumeColumnName, Column, parseTableDataInput, UnknownColumn, setDefaultLanguage, deepCompare, raw, logParamToLogObject, createDbWithAdapter, getImportPath, pathToLog, emptyArray, colors, exhaustive, codeToString, addCode, quoteObjectKey, pushTableDataCode, rawSqlToCode, primaryKeyInnerToCode, indexInnerToCode, excludeInnerToCode, constraintInnerToCode, referencesArgsToCode, backtickQuote, TimestampTZColumn, TimestampColumn, makeColumnsByType, RawSql, CustomTypeColumn, assignDbDataToColumn, PostgisGeographyPointColumn, getStackTrace } from 'pqb/internal';
 import path, { join } from 'path';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import fs, { mkdir, writeFile, readdir, stat, readFile } from 'fs/promises';
-
-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 ? colors.greenBold("\u2714") : 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) => `${colors.blueBold("\u276F")} ${s}`;
-const defaultInactive = (s) => `  ${s}`;
-const promptSelect = ({
-  message,
-  options,
-  active = defaultActive,
-  inactive = defaultInactive
-}) => prompt({
-  value: 0,
-  render(ctx) {
-    let text = `${message} ${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 `${colors.bright(message)}
-${ctx.submitted ? `> ${ctx.value ? colors.greenBold("Yes") : colors.yellowBold("No")}` : 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 = `${colors.bright(message)}
-> ${ctx.submitted ? renderValue(ctx) : showDefault ? 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 getMaybeTransactionAdapter = (db) => "$getAdapter" in db ? db.$getAdapter() : db;
-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;
-  }
-};
-
-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 = getMaybeTransactionAdapter(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 dropSchema = async (db, sql) => runSqlInSavePoint(db, `DROP SCHEMA ${sql}`, "3F000");
-const createTable$1 = async (db, sql) => runSqlInSavePoint(db, `CREATE TABLE ${sql}`, "42P07");
-const dropTable = async (db, sql) => runSqlInSavePoint(db, `DROP TABLE ${sql}`, "42P01");
+import path$1 from 'node:path';
 
 const RAKE_DB_LOCK_KEY = "8582141715823621641";
 const getFirstWordAndRest = (input) => {
@@ -330,10 +91,13 @@ const getCliParam = (args, name) => {
   return;
 };
 
-const makeChange = (config) => (fn) => {
-  const change = { fn, config };
-  pushChange(change);
-  return change;
+const createMigrationChangeFn = (config) => {
+  const conf = config.columnTypes ? config : { columnTypes: makeColumnTypes(defaultSchemaConfig) };
+  return (fn) => {
+    const change = { fn, config: conf };
+    pushChange(change);
+    return change;
+  };
 };
 let currentChanges = [];
 const clearChanges = () => {
@@ -750,7 +514,7 @@ class RakeDbError extends Error {
 class NoPrimaryKey extends RakeDbError {
 }
 
-const createTable = async (migration, up, tableName, first, second, third) => {
+const createTable$1 = async (migration, up, tableName, first, second, third) => {
   let options;
   let fn;
   let dataFn;
@@ -1979,27 +1743,37 @@ const createMigrationInterface = (tx, up, config) => {
     );
   };
   Object.assign(adapter, { silentQuery: query, silentArrays: arrays });
-  const db = createDbWithAdapter({
-    adapter,
-    columnTypes: config.columnTypes
-  });
-  const { prototype: proto } = Migration;
-  for (const key of Object.getOwnPropertyNames(proto)) {
-    db[key] = proto[key];
-  }
-  return Object.assign(db, {
+  const dbPerColumnTypes = /* @__PURE__ */ new Map();
+  return {
     adapter,
-    log,
-    up,
-    options: config
-  });
+    getDb(columnTypes) {
+      let db = dbPerColumnTypes.get(columnTypes);
+      if (!db) {
+        db = createDbWithAdapter({
+          adapter,
+          columnTypes
+        });
+        const { prototype: proto } = Migration;
+        for (const key of Object.getOwnPropertyNames(proto)) {
+          db[key] = proto[key];
+        }
+        return Object.assign(db, {
+          adapter,
+          log,
+          up,
+          options: config
+        });
+      }
+      return db;
+    }
+  };
 };
 class Migration {
   createTable(tableName, first, second, third) {
-    return createTable(this, this.up, tableName, first, second, third);
+    return createTable$1(this, this.up, tableName, first, second, third);
   }
   dropTable(tableName, first, second, third) {
-    return createTable(this, !this.up, tableName, first, second, third);
+    return createTable$1(this, !this.up, tableName, first, second, third);
   }
   changeTable(tableName, cbOrOptions, cb) {
     const [fn, options] = typeof cbOrOptions === "function" ? [cbOrOptions, {}] : [cb, cbOrOptions];
@@ -2332,7 +2106,7 @@ class Migration {
    * @param schemaName - name of the schema
    */
   createSchema(schemaName) {
-    return createSchema(this, this.up, schemaName);
+    return createSchema$1(this, this.up, schemaName);
   }
   /**
    * Renames a database schema, renames it backwards on roll back.
@@ -2359,7 +2133,7 @@ class Migration {
    * @param schemaName - name of the schema
    */
   dropSchema(schemaName) {
-    return createSchema(this, !this.up, schemaName);
+    return createSchema$1(this, !this.up, schemaName);
   }
   /**
    * `createExtension` creates a database extension, and removes it on rollback.
@@ -2920,7 +2694,7 @@ const addCheck = (migration, up, tableName, check) => {
     ...t.add(t.check(check))
   }));
 };
-const createSchema = async (migration, up, name) => {
+const createSchema$1 = async (migration, up, name) => {
   const ast = {
     type: "schema",
     action: up ? "create" : "drop",
@@ -3406,7 +3180,7 @@ const getMigrations = async (ctx, config, up, allowDuplicates, getVersion = getM
 function getMigrationsFromConfig(config, allowDuplicates, getVersion = getMigrationVersionOrThrow) {
   const result = [];
   const versions = {};
-  const { migrations, basePath } = config;
+  const { migrations } = config;
   for (const key in migrations) {
     const version = getVersion(config, path.basename(key));
     if (versions[version] && !allowDuplicates) {
@@ -3416,7 +3190,7 @@ function getMigrationsFromConfig(config, allowDuplicates, getVersion = getMigrat
     }
     versions[version] = key;
     result.push({
-      path: path.resolve(basePath, key),
+      path: key,
       version,
       load: migrations[key]
     });
@@ -3466,7 +3240,7 @@ async function getMigrationsFromFiles(config, allowDuplicates, getVersion = getM
         }
         data.renameTo = {
           to: config.migrationId,
-          map: () => renameMigrationsMap(config, file.name)
+          map: () => renameMigrationsMap(migrationsPath, file.name)
         };
         return data;
       } else {
@@ -3505,8 +3279,8 @@ Run \`**db command** rebase\` to reorganize files with duplicated versions.`
   result.migrations.sort(sortMigrationsAsc);
   return result;
 }
-const renameMigrationsMap = async (config, fileName) => {
-  const filePath = path.join(config.migrationsPath, fileName);
+const renameMigrationsMap = async (migrationsPath, fileName) => {
+  const filePath = path.join(migrationsPath, fileName);
   const json = await fs.readFile(filePath, "utf-8");
   let data;
   try {
@@ -3557,10 +3331,75 @@ function getDigitsPrefix(name) {
   return value;
 }
 
-const saveMigratedVersion = async (db, version, name, config) => {
-  await db.silentArrays(
-    `INSERT INTO ${migrationsSchemaTableSql(
-      db,
+const getMaybeTransactionAdapter = (db) => "$getAdapter" in db ? db.$getAdapter() : db;
+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;
+  }
+};
+
+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 = getMaybeTransactionAdapter(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 = async (db, sql) => runSqlInSavePoint(db, `CREATE SCHEMA ${sql}`, "42P06");
+const dropSchema = async (db, sql) => runSqlInSavePoint(db, `DROP SCHEMA ${sql}`, "3F000");
+const createTable = async (db, sql) => runSqlInSavePoint(db, `CREATE TABLE ${sql}`, "42P07");
+const dropTable = async (db, sql) => runSqlInSavePoint(db, `DROP TABLE ${sql}`, "42P01");
+
+const saveMigratedVersion = async (db, version, name, config) => {
+  await db.silentArrays(
+    `INSERT INTO ${migrationsSchemaTableSql(
+      db,
       config
     )}(version, name) VALUES ($1, $2)`,
     [version, name]
@@ -3570,12 +3409,12 @@ const createMigrationsSchemaAndTable = async (db, config) => {
   const adapter = getMaybeTransactionAdapter(db);
   const { schema, table } = getMigrationsSchemaAndTable(adapter, config);
   if (schema) {
-    const res2 = await createSchema$1(db, schema);
+    const res2 = await createSchema(db, schema);
     if (res2 === "done") {
       config.logger?.log(`Created schema "${schema}"`);
     }
   }
-  const res = await createTable$1(
+  const res = await createTable(
     db,
     `${schema ? `"${schema}"."${table}"` : `"${table}"`} (version TEXT NOT NULL, name TEXT NOT NULL)`
   );
@@ -3600,53 +3439,62 @@ const deleteMigratedVersion = async (adapter, version, name, config) => {
 class NoMigrationsTableError extends Error {
 }
 const getMigratedVersionsMap = async (ctx, adapter, config, renameTo) => {
+  const table = migrationsSchemaTableSql(adapter, config);
+  const inTransaction = "isInTransaction" in adapter && adapter.isInTransaction();
+  let result;
   try {
-    const table = migrationsSchemaTableSql(adapter, config);
-    const result = await adapter.arrays(
+    if (inTransaction) {
+      await adapter.query(`SAVEPOINT check_migrations_table`);
+    }
+    result = await adapter.arrays(
       `SELECT * FROM ${table} ORDER BY version`
     );
-    if (!result.fields[1]) {
-      const { migrations } = await getMigrations(ctx, config, true);
-      const map = {};
-      for (const item of migrations) {
-        const name = path.basename(item.path);
-        map[item.version] = name.slice(getDigitsPrefix(name).length + 1);
-      }
-      for (const row of result.rows) {
-        const [version] = row;
-        const name = map[version];
-        if (!name) {
-          throw new Error(
-            `Migration for version ${version} is stored in db but is not found among available migrations`
-          );
-        }
-        row[1] = name;
-      }
-      await adapter.arrays(`ALTER TABLE ${table} ADD COLUMN name TEXT`);
-      await Promise.all(
-        result.rows.map(
-          ([version, name]) => adapter.arrays(`UPDATE ${table} SET name = $2 WHERE version = $1`, [
-            version,
-            name
-          ])
-        )
-      );
-      await adapter.arrays(
-        `ALTER TABLE ${table} ALTER COLUMN name SET NOT NULL`
-      );
+    if (inTransaction) {
+      await adapter.query(`RELEASE SAVEPOINT check_migrations_table`);
     }
-    let versions = Object.fromEntries(result.rows);
-    if (renameTo) {
-      versions = await renameMigrations(config, adapter, versions, renameTo);
-    }
-    return { map: versions, sequence: result.rows.map((row) => +row[0]) };
   } catch (err) {
     if (err.code === "42P01") {
+      if (inTransaction) {
+        await adapter.query(`ROLLBACK TO SAVEPOINT check_migrations_table`);
+      }
       throw new NoMigrationsTableError();
     } else {
       throw err;
     }
   }
+  if (!result.fields[1]) {
+    const { migrations } = await getMigrations(ctx, config, true);
+    const map = {};
+    for (const item of migrations) {
+      const name = path.basename(item.path);
+      map[item.version] = name.slice(getDigitsPrefix(name).length + 1);
+    }
+    for (const row of result.rows) {
+      const [version] = row;
+      const name = map[version];
+      if (!name) {
+        throw new Error(
+          `Migration for version ${version} is stored in db but is not found among available migrations`
+        );
+      }
+      row[1] = name;
+    }
+    await adapter.arrays(`ALTER TABLE ${table} ADD COLUMN name TEXT`);
+    await Promise.all(
+      result.rows.map(
+        ([version, name]) => adapter.arrays(`UPDATE ${table} SET name = $2 WHERE version = $1`, [
+          version,
+          name
+        ])
+      )
+    );
+    await adapter.arrays(`ALTER TABLE ${table} ALTER COLUMN name SET NOT NULL`);
+  }
+  let versions = Object.fromEntries(result.rows);
+  if (renameTo) {
+    versions = await renameMigrations(config, adapter, versions, renameTo);
+  }
+  return { map: versions, sequence: result.rows.map((row) => +row[0]) };
 };
 async function renameMigrations(config, trx, versions, renameTo) {
   let first;
@@ -3677,11 +3525,35 @@ async function renameMigrations(config, trx, versions, renameTo) {
   return updatedVersions;
 }
 
+const migrateConfigDefaults = {
+  migrationId: { serial: 4 },
+  migrationsTable: "schemaMigrations",
+  transaction: "single"
+};
+const handleConfigLogger = (config) => {
+  return config.log === true ? config.logger || console : config.log === false ? void 0 : config.logger;
+};
+const processMigrateConfig = (config) => {
+  let migrationsPath;
+  if (!("migrations" in config)) {
+    migrationsPath = config.migrationsPath ? config.migrationsPath : path$1.join("src", "db", "migrations");
+    if (config.basePath && !path$1.isAbsolute(migrationsPath)) {
+      migrationsPath = path$1.resolve(config.basePath, migrationsPath);
+    }
+  }
+  return {
+    ...migrateConfigDefaults,
+    ...config,
+    migrationsPath,
+    logger: handleConfigLogger(config)
+  };
+};
 const transactionIfSingle = (adapter, config, fn) => {
   return config.transaction === "single" ? transaction(adapter, config, fn) : fn(adapter);
 };
 function makeMigrateFn(up, defaultCount, fn) {
-  return async (db, config, params) => {
+  return async (db, publicConfig, params) => {
+    const config = processMigrateConfig(publicConfig);
     const ctx = params?.ctx || {};
     const set = await getMigrations(ctx, config, up);
     const count = params?.count ?? defaultCount;
@@ -3724,7 +3596,16 @@ function makeMigrateFn(up, defaultCount, fn) {
 const migrate = makeMigrateFn(
   true,
   Infinity,
-  (trx, config, set, versions, count, force) => migrateOrRollback(trx, config, set, versions, count, true, false, force)
+  (trx, config, set, versions, count, force) => migrateOrRollback(
+    trx,
+    config,
+    set,
+    versions,
+    count,
+    true,
+    false,
+    force
+  )
 );
 const migrateAndClose = async (db, config, params) => {
   const adapter = getMaybeTransactionAdapter(db);
@@ -3732,26 +3613,46 @@ const migrateAndClose = async (db, config, params) => {
   await adapter.close();
 };
 async function runMigration(db, ...args) {
-  const [config, migration] = args.length === 1 ? [{}, args[0]] : [args[0], args[1]];
+  const [rawConfig, migration] = args.length === 1 ? [{}, args[0]] : [args[0], args[1]];
+  const config = {
+    ...rawConfig,
+    logger: handleConfigLogger(rawConfig)
+  };
   const adapter = getMaybeTransactionAdapter(db);
   await transaction(adapter, config, async (trx) => {
     clearChanges();
     const changes = await getChanges({ load: migration });
-    const config2 = changes[0]?.config;
-    await applyMigration(trx, true, changes, config2);
+    await applyMigration(trx, true, changes, config);
   });
 }
 const rollback = makeMigrateFn(
   false,
   1,
-  (trx, config, set, versions, count, force) => migrateOrRollback(trx, config, set, versions, count, false, false, force)
+  (trx, config, set, versions, count, force) => migrateOrRollback(
+    trx,
+    config,
+    set,
+    versions,
+    count,
+    false,
+    false,
+    force
+  )
 );
 const redo = makeMigrateFn(
   true,
   1,
   async (trx, config, set, versions, count, force) => {
     set.migrations.reverse();
-    await migrateOrRollback(trx, config, set, versions, count, false, true);
+    await migrateOrRollback(
+      trx,
+      config,
+      set,
+      versions,
+      count,
+      false,
+      true
+    );
     set.migrations.reverse();
     return migrateOrRollback(
       trx,
@@ -3822,7 +3723,7 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
     await changeMigratedVersion(adapter, up, file, config);
     (migrations ?? (migrations = [])).push(file);
     if (up) {
-      const name = path.basename(file.path);
+      const name = path$1.basename(file.path);
       versionsMap[file.version] = name;
       sequence.push(+file.version);
     } else {
@@ -3869,7 +3770,7 @@ const checkMigrationOrder = (config, set, { sequence, map }, force) => {
       if (version > last || map[file.version]) continue;
       if (!force) {
         throw new Error(
-          `Cannot migrate ${path.basename(
+          `Cannot migrate ${path$1.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`
@@ -3905,151 +3806,342 @@ const runMigrationInOwnTransaction = (adapter, up, changes, config) => {
   );
 };
 const applyMigration = async (trx, up, changes, config) => {
-  const db = createMigrationInterface(trx, up, config);
+  const { adapter, getDb: getDb2 } = 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 change = changes[i];
+      const db = getDb2(change.config.columnTypes);
+      await change.fn(db, up);
     }
   }
-  return db.adapter;
+  return adapter;
 };
 const changeMigratedVersion = async (adapter, up, file, config) => {
   await (up ? saveMigratedVersion : deleteMigratedVersion)(
     adapter,
     file.version,
-    path.basename(file.path).slice(file.version.length + 1),
+    path$1.basename(file.path).slice(file.version.length + 1),
     config
   );
 };
 
-const runRecurrentMigrations = async (adapters, config) => {
-  let dbs;
-  let files = 0;
-  await readdirRecursive(config.recurrentPath, async (path) => {
-    files++;
-    dbs ?? (dbs = adapters.map((adapter) => createDbWithAdapter({ adapter })));
-    const sql = await readFile(path, "utf-8");
-    await Promise.all(
-      dbs.map(async (db) => {
-        await db.adapter.arrays(sql);
-      })
-    );
-  });
-  if (files > 0) {
-    config.logger?.log(
-      `Applied ${files} recurrent migration file${files > 1 ? "s" : ""}`
+const rakeDbConfigDefaults = {
+  ...migrateConfigDefaults,
+  schemaConfig: defaultSchemaConfig,
+  snakeCase: false,
+  commands: {},
+  log: true,
+  logger: console,
+  import() {
+    throw new Error(
+      "Add `import: (path) => import(path),` setting to `rakeDb` config"
     );
   }
 };
-const readdirRecursive = async (dirPath, cb) => {
-  const list = await readdir(dirPath).catch((err) => {
-    if (err.code !== "ENOENT") throw err;
-    return;
-  });
-  if (!list) return;
-  await Promise.all(
-    list.map(async (item) => {
-      const path = join(dirPath, item);
-      const info = await stat(path);
-      if (info.isDirectory()) {
-        await readdirRecursive(path, cb);
-      } else if (info.isFile() && path.endsWith(".sql")) {
-        await cb(path);
-      }
-    })
-  );
-};
 
-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(async (tx) => {
-        const schema = tx.getSchema();
-        if (schema) {
-          const quoted = `"${typeof schema === "function" ? schema() : 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("drop", adapters, config);
-  await createOrDropDatabase("create", 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);
-      }
+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"}`;
     }
-    throw err;
   }
+  return clear2;
 };
-const askForAdminCredentials = async (create) => {
-  const ok = await promptConfirm({
-    message: `Would you like to share admin credentials to ${create ? "create" : "drop"} a database?`
+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 ? colors.greenBold("\u2714") : 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) => `${colors.blueBold("\u276F")} ${s}`;
+const defaultInactive = (s) => `  ${s}`;
+const promptSelect = ({
+  message,
+  options,
+  active = defaultActive,
+  inactive = defaultInactive
+}) => prompt({
+  value: 0,
+  render(ctx) {
+    let text = `${message} ${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 `${colors.bright(message)}
+${ctx.submitted ? `> ${ctx.value ? colors.greenBold("Yes") : colors.yellowBold("No")}` : 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 = `${colors.bright(message)}
+> ${ctx.submitted ? renderValue(ctx) : showDefault ? 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 runRecurrentMigrations = async (adapters, config) => {
+  let dbs;
+  let files = 0;
+  await readdirRecursive(config.recurrentPath, async (path) => {
+    files++;
+    dbs ?? (dbs = adapters.map((adapter) => createDbWithAdapter({ adapter })));
+    const sql = await readFile(path, "utf-8");
+    await Promise.all(
+      dbs.map(async (db) => {
+        await db.adapter.arrays(sql);
+      })
+    );
+  });
+  if (files > 0) {
+    config.logger?.log(
+      `Applied ${files} recurrent migration file${files > 1 ? "s" : ""}`
+    );
+  }
+};
+const readdirRecursive = async (dirPath, cb) => {
+  const list = await readdir(dirPath).catch((err) => {
+    if (err.code !== "ENOENT") throw err;
+    return;
+  });
+  if (!list) return;
+  await Promise.all(
+    list.map(async (item) => {
+      const path = join(dirPath, item);
+      const info = await stat(path);
+      if (info.isDirectory()) {
+        await readdirRecursive(path, cb);
+      } else if (info.isFile() && path.endsWith(".sql")) {
+        await cb(path);
+      }
+    })
+  );
+};
+
+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(async (tx) => {
+        const schema = tx.getSchema();
+        if (schema) {
+          const quoted = `"${typeof schema === "function" ? schema() : schema}"`;
+          const res2 = await createSchema(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("drop", adapters, config);
+  await createOrDropDatabase("create", 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;
@@ -6004,195 +6096,83 @@ const dbConstraintToTableConstraint = (ctx, table, item) => {
     references: references ? {
       columns: references.columns,
       fnOrTable: getReferencesTable(ctx, references),
-      foreignColumns: references.foreignColumns,
-      options: {
-        match: matchMap[references.match],
-        onUpdate: fkeyActionMap[references.onUpdate],
-        onDelete: fkeyActionMap[references.onDelete]
-      }
-    } : void 0,
-    check: check ? raw({ raw: check.expression }) : void 0
-  };
-  const name = item.name && item.name !== getConstraintName(table.name, constraint, ctx.snakeCase) ? item.name : void 0;
-  if (name) {
-    constraint.name = name;
-    if (constraint.references?.options) {
-      constraint.references.options.name = name;
-    }
-  }
-  return constraint;
-};
-const makeIndexOrExcludeOptions = (tableName, index, key) => {
-  return {
-    name: index.name !== (key === "indexes" ? getIndexName : getExcludeName)(
-      tableName,
-      index.columns
-    ) ? index.name : void 0,
-    using: index.using === "btree" ? void 0 : index.using,
-    unique: index.unique || void 0,
-    include: index.include,
-    nullsNotDistinct: index.nullsNotDistinct || void 0,
-    with: index.with,
-    tablespace: index.tablespace,
-    where: index.where
-  };
-};
-const checkIfIsOuterRecursiveFkey = (data, table, references) => {
-  const referencesId = `${references.foreignSchema}.${references.foreignTable}`;
-  const tableId = `${table.schemaName}.${table.name}`;
-  for (const other of data.tables) {
-    const id = `${other.schemaName}.${other.name}`;
-    if (referencesId === id) {
-      for (const c of data.constraints) {
-        if (c.tableName === other.name && c.schemaName === other.schemaName && c.references?.foreignTable === table.name && c.references.foreignSchema === table.schemaName && tableId < id) {
-          return true;
-        }
-      }
-      break;
-    }
-  }
-  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: 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 = 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 = 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 || makeColumnTypes(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(
-      makeColumnTypes(defaultSchemaConfig)
-    ) : ct) || makeColumnTypes(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`
-      );
+      foreignColumns: references.foreignColumns,
+      options: {
+        match: matchMap[references.match],
+        onUpdate: fkeyActionMap[references.onUpdate],
+        onDelete: fkeyActionMap[references.onDelete]
+      }
+    } : void 0,
+    check: check ? raw({ raw: check.expression }) : void 0
+  };
+  const name = item.name && item.name !== getConstraintName(table.name, constraint, ctx.snakeCase) ? item.name : void 0;
+  if (name) {
+    constraint.name = name;
+    if (constraint.references?.options) {
+      constraint.references.options.name = name;
     }
-    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;
+  return constraint;
+};
+const makeIndexOrExcludeOptions = (tableName, index, key) => {
+  return {
+    name: index.name !== (key === "indexes" ? getIndexName : getExcludeName)(
+      tableName,
+      index.columns
+    ) ? index.name : void 0,
+    using: index.using === "btree" ? void 0 : index.using,
+    unique: index.unique || void 0,
+    include: index.include,
+    nullsNotDistinct: index.nullsNotDistinct || void 0,
+    with: index.with,
+    tablespace: index.tablespace,
+    where: index.where
+  };
+};
+const checkIfIsOuterRecursiveFkey = (data, table, references) => {
+  const referencesId = `${references.foreignSchema}.${references.foreignTable}`;
+  const tableId = `${table.schemaName}.${table.name}`;
+  for (const other of data.tables) {
+    const id = `${other.schemaName}.${other.name}`;
+    if (referencesId === id) {
+      for (const c of data.constraints) {
+        if (c.tableName === other.name && c.schemaName === other.schemaName && c.references?.foreignTable === table.name && c.references.foreignSchema === table.schemaName && tableId < id) {
+          return true;
+        }
+      }
+      break;
     }
   }
-  result.commands = c;
-  return result;
+  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 listMigrationsStatuses = async (adapters, config, params) => {
@@ -6358,85 +6338,275 @@ const rebase = async (adapters, config) => {
         renames.push(values);
         renamesMap[file.path] = values;
       }
-      if (moveFile === prev) {
-        if (prev.serial < minVersionToMigrate)
-          minVersionToMigrate = prev.serial;
-        newVersion = prev.serial + move;
-        let item = [prev.path, newVersion];
-        if (renamesMap[prev.path]) {
-          renamesMap[prev.path] = item;
-          for (let i2 = renames.length - 1; i2 >= 0; i2--) {
-            const rename = renames[i2];
-            rename[1]--;
-            renames[i2] = item;
-            if (rename[0] === prev.path) break;
-            renamesMap[item[0]] = item;
-            item = rename;
-          }
-        } else {
-          renames.push(item);
-          renamesMap[prev.path] = item;
-        }
+      if (moveFile === prev) {
+        if (prev.serial < minVersionToMigrate)
+          minVersionToMigrate = prev.serial;
+        newVersion = prev.serial + move;
+        let item = [prev.path, newVersion];
+        if (renamesMap[prev.path]) {
+          renamesMap[prev.path] = item;
+          for (let i2 = renames.length - 1; i2 >= 0; i2--) {
+            const rename = renames[i2];
+            rename[1]--;
+            renames[i2] = item;
+            if (rename[0] === prev.path) break;
+            renamesMap[item[0]] = item;
+            item = rename;
+          }
+        } else {
+          renames.push(item);
+          renamesMap[prev.path] = item;
+        }
+      }
+    }
+    if (file.name !== migratedName && newVersion > maxNewVersion) {
+      maxNewVersion = newVersion;
+    }
+  }
+  if (!renames.length && !migratedFiles.length) return;
+  maxNewVersion++;
+  renames.push(
+    ...migratedFiles.map((file, i) => {
+      const rename = [file.path, maxNewVersion + i];
+      renamesMap[file.path] = rename;
+      return rename;
+    })
+  );
+  if (!renames.length) return;
+  const migrationsDown = files.filter(
+    (file) => combinedVersionsMap[file.version] === file.name && file.serial >= minVersionToMigrate
+  );
+  const migrationsUp = files.reduce((files2, file) => {
+    const rename = renamesMap[file.path];
+    if (rename) {
+      const version = String(rename[1]).padStart(4, "0");
+      files2.push({
+        ...file,
+        path: path.join(
+          path.dirname(rename[0]),
+          version + path.basename(rename[0]).slice(version.length)
+        ),
+        version
+      });
+    } else if (!combinedVersionsMap[file.version] || file.serial >= minVersionToMigrate) {
+      files2.push(file);
+    }
+    return files2;
+  }, []).sort((a, b) => +b.version - +a.version);
+  set.migrations = migrationsDown;
+  const redoConfig = {
+    ...config,
+    async afterRollback() {
+      set.migrations = migrationsUp;
+    },
+    async afterMigrate() {
+      set.migrations = migrationsDown;
+    }
+  };
+  for (const adapter of adapters) {
+    await redo(adapter, redoConfig, { ctx, count: Infinity });
+  }
+  for (let i = renames.length - 1; i >= 0; i--) {
+    const [from, version] = renames[i];
+    const prefix = String(version).padStart(4, "0");
+    await fs.rename(
+      from,
+      path.join(
+        path.dirname(from),
+        prefix + path.basename(from).slice(prefix.length)
+      )
+    );
+  }
+};
+
+const close = (adapters) => Promise.all(adapters.map((adapter) => adapter.close()));
+const maybeRunRecurrent = async (adapters, config) => {
+  config.recurrentPath && await runRecurrentMigrations(
+    adapters,
+    config
+  );
+};
+const rakeDbAliases$1 = {
+  migrate: "up",
+  rollback: "down",
+  s: "status",
+  rec: "recurrent"
+};
+const upCommand = {
+  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",
+    "a number": "run a specific number of pending migrations",
+    force: "enforce migrating a pending file in the middle"
+  }
+};
+const downCommand = {
+  run: (adapters, config, args) => rollbackCommand(adapters, config, args).then(() => close(adapters)),
+  help: "rollback migrated migrations",
+  helpArguments: {
+    "no arguments": "rollback one last migration",
+    "a number": "rollback a specified number",
+    all: "rollback all migrations"
+  }
+};
+const statusCommand = {
+  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 recurrent = {
+  async run(adapters, config) {
+    if (!config.recurrentPath) return;
+    await maybeRunRecurrent(adapters, config).then(() => close(adapters));
+  },
+  help: "run recurrent migrations"
+};
+const rakeDbCommands = {
+  create: {
+    run: (adapters, config) => createDatabaseCommand(adapters, config),
+    help: "create databases"
+  },
+  drop: {
+    run: dropDatabaseCommand,
+    help: "drop databases"
+  },
+  reset: {
+    run: (adapters, config) => resetDatabaseCommand(adapters, config),
+    help: "drop, create and migrate databases"
+  },
+  up: upCommand,
+  down: downCommand,
+  redo: {
+    run: (adapters, config, args) => redoCommand(adapters, config, args).then(() => maybeRunRecurrent(adapters, config)).then(() => close(adapters)),
+    help: "rollback and migrate, run recurrent"
+  },
+  pull: {
+    run: ([adapter], config) => pullDbStructure(adapter, config).then(() => close([adapter])),
+    help: "generate a combined migration for an existing database"
+  },
+  new: {
+    run(_, config, args) {
+      const [name] = args;
+      if (!name) throw new Error("Migration name is missing");
+      return newMigration(config, name);
+    },
+    help: "create new migration file"
+  },
+  status: statusCommand,
+  recurrent,
+  rebase: {
+    run: (adapters, config) => rebase(adapters, config).then(() => close(adapters)),
+    help: "move local migrations below the new ones from upstream"
+  },
+  "change-ids": {
+    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`);
       }
-    }
-    if (file.name !== migratedName && newVersion > maxNewVersion) {
-      maxNewVersion = newVersion;
+      return changeIds(adapters, config, { format, digits });
+    },
+    help: "change migrations ids format",
+    helpArguments: {
+      serial: "change ids to 4 digit serial",
+      "serial *number*": "change ids to serial number of custom length",
+      timestamp: "change timestamps"
     }
   }
-  if (!renames.length && !migratedFiles.length) return;
-  maxNewVersion++;
-  renames.push(
-    ...migratedFiles.map((file, i) => {
-      const rename = [file.path, maxNewVersion + i];
-      renamesMap[file.path] = rename;
-      return rename;
-    })
-  );
-  if (!renames.length) return;
-  const migrationsDown = files.filter(
-    (file) => combinedVersionsMap[file.version] === file.name && file.serial >= minVersionToMigrate
-  );
-  const migrationsUp = files.reduce((files2, file) => {
-    const rename = renamesMap[file.path];
-    if (rename) {
-      const version = String(rename[1]).padStart(4, "0");
-      files2.push({
-        ...file,
-        path: path.join(
-          path.dirname(rename[0]),
-          version + path.basename(rename[0]).slice(version.length)
-        ),
-        version
-      });
-    } else if (!combinedVersionsMap[file.version] || file.serial >= minVersionToMigrate) {
-      files2.push(file);
-    }
-    return files2;
-  }, []).sort((a, b) => +b.version - +a.version);
-  set.migrations = migrationsDown;
-  const redoConfig = {
+};
+for (const key in rakeDbAliases$1) {
+  const command = rakeDbAliases$1[key];
+  if (command) rakeDbCommands[key] = rakeDbCommands[command];
+}
+let intermediateCallers = 0;
+const incrementIntermediateCaller = () => {
+  intermediateCallers++;
+};
+const ensureBasePathAndDbScript = (config, intermediateCallers2 = 0) => {
+  if (config.basePath && config.dbScript) return config;
+  let filePath = 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 = 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 makeRakeDbConfig = (config, args) => {
+  const ic = intermediateCallers;
+  intermediateCallers = 0;
+  const result = {
+    ...rakeDbConfigDefaults,
     ...config,
-    async afterRollback() {
-      set.migrations = migrationsUp;
-    },
-    async afterMigrate() {
-      set.migrations = migrationsDown;
-    }
+    __rakeDbConfig: true
   };
-  for (const adapter of adapters) {
-    await redo(adapter, redoConfig, { ctx, count: Infinity });
+  ensureBasePathAndDbScript(result, ic);
+  Object.assign(result, processMigrateConfig(result));
+  if (!result.recurrentPath && result.migrationsPath) {
+    result.recurrentPath = path.join(result.migrationsPath, "recurrent");
   }
-  for (let i = renames.length - 1; i >= 0; i--) {
-    const [from, version] = renames[i];
-    const prefix = String(version).padStart(4, "0");
-    await fs.rename(
-      from,
-      path.join(
-        path.dirname(from),
-        prefix + path.basename(from).slice(prefix.length)
-      )
-    );
+  if (result.recurrentPath && !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 || makeColumnTypes(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(
+      makeColumnTypes(defaultSchemaConfig)
+    ) : ct) || makeColumnTypes(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 rakeDbAliases = {
@@ -6454,7 +6624,7 @@ const rakeDbCliWithAdapter = (inputConfig, args = process.argv.slice(2)) => {
     config = makeRakeDbConfig(inputConfig, args);
   }
   return {
-    change: makeChange(config),
+    change: createMigrationChangeFn(config),
     async run(adapter, runArgs) {
       const adapters = toArray(adapter);
       try {
@@ -6548,111 +6718,6 @@ ${Object.entries(helpArguments).map(
 `);
   }
 };
-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(() => maybeRunRecurrent(adapters, config)).then(() => close(adapters)),
-  help: "migrate pending migrations",
-  helpArguments: {
-    "no arguments": "migrate all pending",
-    "a number": "run a specific number of pending migrations",
-    force: "enforce migrating a pending file in the middle"
-  }
-};
-const downCommand = {
-  run: (adapters, config, args) => rollbackCommand(adapters, config, args).then(() => close(adapters)),
-  help: "rollback migrated migrations",
-  helpArguments: {
-    "no arguments": "rollback one last migration",
-    "a number": "rollback a specified number",
-    all: "rollback all migrations"
-  }
-};
-const statusCommand = {
-  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 recurrent = {
-  async run(adapters, config) {
-    if (!config.recurrentPath) return;
-    await maybeRunRecurrent(adapters, config).then(() => close(adapters));
-  },
-  help: "run recurrent migrations"
-};
-const rakeDbCommands = {
-  create: {
-    run: (adapters, config) => createDatabaseCommand(adapters, config),
-    help: "create databases"
-  },
-  drop: {
-    run: dropDatabaseCommand,
-    help: "drop databases"
-  },
-  reset: {
-    run: (adapters, config) => resetDatabaseCommand(adapters, config),
-    help: "drop, create and migrate databases"
-  },
-  up: upCommand,
-  down: downCommand,
-  redo: {
-    run: (adapters, config, args) => redoCommand(adapters, config, args).then(() => maybeRunRecurrent(adapters, config)).then(() => close(adapters)),
-    help: "rollback and migrate, run recurrent"
-  },
-  pull: {
-    run: ([adapter], config) => pullDbStructure(adapter, config).then(() => close([adapter])),
-    help: "generate a combined migration for an existing database"
-  },
-  new: {
-    run(_, config, args) {
-      const [name] = args;
-      if (!name) throw new Error("Migration name is missing");
-      return newMigration(config, name);
-    },
-    help: "create new migration file"
-  },
-  status: statusCommand,
-  recurrent,
-  rebase: {
-    run: (adapters, config) => rebase(adapters, config).then(() => close(adapters)),
-    help: "move local migrations below the new ones from upstream"
-  },
-  "change-ids": {
-    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",
-      "serial *number*": "change ids to serial number of custom length",
-      timestamp: "change ids to timestamps"
-    }
-  }
-};
-for (const key in rakeDbAliases) {
-  const command = rakeDbAliases[key];
-  if (command) rakeDbCommands[key] = rakeDbCommands[command];
-}
 
-export { RakeDbError, astToMigration, concatSchemaAndName, createDatabase, createMigrationInterface, createMigrationsSchemaAndTable, createSchema$1 as createSchema, createTable$1 as createTable, dbColumnToAst, dropDatabase, dropSchema, dropTable, encodeColumnDefault, getConstraintName, getDbStructureTableData, getDbTableColumnsChecks, getDbVersion, getExcludeName, getIndexName, getMigrationsSchemaAndTable, getSchemaAndTableFromName, incrementIntermediateCaller, instantiateDbColumn, introspectDbSchema, makeDomainsMap, makeFileVersion, makeRakeDbConfig, makeStructureToAstCtx, migrate, migrateAndClose, migrationConfigDefaults, promptSelect, rakeDbCliWithAdapter, rakeDbCommands, redo, rollback, runMigration, saveMigratedVersion, setRakeDbCliRunFn, structureToAst, tableToAst, writeMigrationFile };
+export { RakeDbError, astToMigration, concatSchemaAndName, createDatabase, createMigrationChangeFn, createMigrationInterface, createMigrationsSchemaAndTable, createSchema, createTable, dbColumnToAst, dropDatabase, dropSchema, dropTable, encodeColumnDefault, getConstraintName, getDbStructureTableData, getDbTableColumnsChecks, getDbVersion, getExcludeName, getIndexName, getMigrationsSchemaAndTable, getSchemaAndTableFromName, incrementIntermediateCaller, instantiateDbColumn, introspectDbSchema, makeDomainsMap, makeFileVersion, makeStructureToAstCtx, migrate, migrateAndClose, promptSelect, rakeDbCliWithAdapter, rakeDbCommands, rakeDbConfigDefaults, redo, rollback, runMigration, saveMigratedVersion, setRakeDbCliRunFn, structureToAst, tableToAst, writeMigrationFile };
 //# sourceMappingURL=index.mjs.map