rake-db 2.14.4 → 2.15.0

package/dist/index.mjs

@@ -1,206 +1,11 @@
-import { defaultSchemaConfig, makeColumnTypes, quote, EnumColumn, getColumnTypes, getTableData, ColumnType, resetTableData, UnknownColumn, raw, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, simplifyColumnDefault, instantiateColumn, DomainColumn, CustomTypeColumn, ArrayColumn, getConstraintKind, primaryKeyToCode, indexToCode, constraintToCode, referencesArgsToCode, constraintPropsToCode, TimestampTZColumn, makeColumnsByType } from 'pqb';
-import { getStackTrace, singleQuote, toSnakeCase, isRawSQL, toArray, snakeCaseKey, emptyObject, setCurrentColumnName, consumeColumnName, setDefaultLanguage, ColumnTypeBase, deepCompare, pathToLog, emptyArray, getImportPath, toCamelCase, codeToString, addCode, quoteObjectKey, backtickQuote } from 'orchid-core';
+import { quote, EnumColumn, defaultSchemaConfig, getColumnTypes, getTableData, ColumnType, resetTableData, UnknownColumn, raw, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, makeColumnTypes, simplifyColumnDefault, instantiateColumn, DomainColumn, CustomTypeColumn, ArrayColumn, getConstraintKind, primaryKeyToCode, indexToCode, constraintToCode, referencesArgsToCode, constraintPropsToCode, TimestampTZColumn, makeColumnsByType } from 'pqb';
+import { singleQuote, emptyArray, toSnakeCase, isRawSQL, toArray, snakeCaseKey, emptyObject, setCurrentColumnName, consumeColumnName, setDefaultLanguage, ColumnTypeBase, deepCompare, getImportPath, pathToLog, getStackTrace, toCamelCase, codeToString, addCode, quoteObjectKey, backtickQuote } from 'orchid-core';
 import path, { join } from 'path';
-import { readdir, mkdir, writeFile, stat, readFile } from 'fs/promises';
+import { pathToFileURL, fileURLToPath } from 'node:url';
+import fs, { mkdir, writeFile, readdir, stat, readFile } from 'fs/promises';
 import prompts from 'prompts';
-import { fileURLToPath, pathToFileURL } from 'node:url';
+import { redo as redo$1 } from 'rake-db';
 
-var __defProp$7 = Object.defineProperty;
-var __defProps$5 = Object.defineProperties;
-var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
-var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
-var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$7 = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp$7.call(b, prop))
-      __defNormalProp$7(a, prop, b[prop]);
-  if (__getOwnPropSymbols$7)
-    for (var prop of __getOwnPropSymbols$7(b)) {
-      if (__propIsEnum$7.call(b, prop))
-        __defNormalProp$7(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
-var __objRest$2 = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp$7.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$7)
-    for (var prop of __getOwnPropSymbols$7(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$7.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-const migrationConfigDefaults = {
-  schemaConfig: defaultSchemaConfig,
-  migrationsPath: path.join("src", "db", "migrations"),
-  migrationsTable: "schemaMigrations",
-  snakeCase: false,
-  commands: {},
-  import: (path2) => {
-    return import(path2).catch((err) => {
-      if (err.code === "ERR_UNKNOWN_FILE_EXTENSION") {
-        require(path2);
-      } else {
-        throw err;
-      }
-    });
-  },
-  log: true,
-  logger: console,
-  useCodeUpdater: true
-};
-const processRakeDbConfig = (config) => {
-  var _a, _b;
-  const result = __spreadValues$7(__spreadValues$7({}, migrationConfigDefaults), config);
-  if (!result.recurrentPath) {
-    result.recurrentPath = path.join(result.migrationsPath, "recurrent");
-  }
-  if (config.appCodeUpdater && (!("baseTable" in config) || !config.baseTable)) {
-    throw new Error(
-      "`baseTable` option is required in `rakeDb` for `appCodeUpdater`"
-    );
-  }
-  if (!result.log) {
-    delete result.logger;
-  }
-  if (!result.basePath || !result.dbScript) {
-    let filePath = (_a = getStackTrace()) == null ? void 0 : _a[3].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`
-      );
-    }
-    result.basePath = path.dirname(filePath);
-    result.dbScript = path.basename(filePath);
-  }
-  if ("migrationsPath" in result && !path.isAbsolute(result.migrationsPath)) {
-    result.migrationsPath = path.resolve(
-      result.basePath,
-      result.migrationsPath
-    );
-  }
-  if ("recurrentPath" in result && !path.isAbsolute(result.recurrentPath)) {
-    result.recurrentPath = path.resolve(result.basePath, result.recurrentPath);
-  }
-  if ("baseTable" in config) {
-    const proto = (_b = config.baseTable) == null ? void 0 : _b.prototype;
-    result.columnTypes = proto.types || makeColumnTypes(defaultSchemaConfig);
-    if (proto.snakeCase)
-      result.snakeCase = true;
-    if (proto.language)
-      result.language = proto.language;
-  } else {
-    const ct = "columnTypes" in config && config.columnTypes;
-    result.columnTypes = (typeof ct === "function" ? ct(
-      makeColumnTypes(defaultSchemaConfig)
-    ) : ct) || makeColumnTypes;
-  }
-  return result;
-};
-const getDatabaseAndUserFromOptions = (options) => {
-  if (options.databaseURL) {
-    const url = new URL(options.databaseURL);
-    return {
-      database: url.pathname.slice(1),
-      user: url.username
-    };
-  } else {
-    return {
-      database: options.database,
-      user: options.user
-    };
-  }
-};
-const setAdapterOptions = (options, set) => {
-  if (options.databaseURL) {
-    const url = new URL(options.databaseURL);
-    if ("database" in set) {
-      url.pathname = `/${set.database}`;
-    }
-    if (set.user !== void 0) {
-      url.username = set.user;
-    }
-    if (set.password !== void 0) {
-      url.password = set.password;
-    }
-    return __spreadProps$5(__spreadValues$7({}, options), { databaseURL: url.toString() });
-  } else {
-    return __spreadValues$7(__spreadValues$7({}, options), set);
-  }
-};
-const setAdminCredentialsToOptions = async (options, create) => {
-  const confirm = await prompts([
-    {
-      message: `Would you like to share admin credentials to ${create ? "create" : "drop"} a database`,
-      type: "confirm",
-      name: "confirm",
-      initial: true
-    }
-  ]);
-  if (!confirm.confirm) {
-    return;
-  }
-  const values = await prompts([
-    {
-      message: "Enter admin user:",
-      type: "text",
-      name: "user",
-      initial: "postgres",
-      min: 1
-    },
-    {
-      message: "Enter admin password:",
-      type: "password",
-      name: "password"
-    }
-  ]);
-  return setAdapterOptions(options, __spreadProps$5(__spreadValues$7({}, values), {
-    password: values.password || void 0
-  }));
-};
-const createSchemaMigrations = async (db, config) => {
-  var _a, _b, _c;
-  const { schema } = db;
-  if (schema && schema !== "public") {
-    try {
-      await db.query(`CREATE SCHEMA "${schema}"`);
-      (_a = config.logger) == null ? void 0 : _a.log(`Created schema ${schema}`);
-    } catch (err) {
-      if (err.code !== "42P06") {
-        throw err;
-      }
-    }
-  }
-  try {
-    await db.query(
-      `CREATE TABLE ${quoteWithSchema({
-        name: config.migrationsTable
-      })} ( version TEXT NOT NULL )`
-    );
-    (_b = config.logger) == null ? void 0 : _b.log("Created versions table");
-  } catch (err) {
-    if (err.code === "42P07") {
-      (_c = config.logger) == null ? void 0 : _c.log("Versions table exists");
-    } else {
-      throw err;
-    }
-  }
-};
 const getFirstWordAndRest = (input) => {
   const index = input.search(/(?=[A-Z])|[-_]/);
   if (index !== -1) {
@@ -228,73 +33,6 @@ const getTextAfterTo = (input) => {
 const getTextAfterFrom = (input) => {
   return getTextAfterRegExp(input, /(From|-from|_from)[A-Z-_]/, 4);
 };
-const getMigrations = async (_a, up) => {
-  var _b = _a, {
-    migrations
-  } = _b, config = __objRest$2(_b, [
-    "migrations"
-  ]);
-  return migrations ? getMigrationsFromConfig(__spreadProps$5(__spreadValues$7({}, config), { migrations }), up) : getMigrationsFromFiles(config, up);
-};
-function getMigrationsFromConfig(config, up) {
-  const result = [];
-  const { migrations, basePath } = config;
-  for (const key in migrations) {
-    result.push({
-      path: path.resolve(basePath, key),
-      version: getVersion(path.basename(key)),
-      load: migrations[key]
-    });
-  }
-  return up ? result : result.reverse();
-}
-async function getMigrationsFromFiles(config, up) {
-  const { migrationsPath, import: imp } = config;
-  let files;
-  try {
-    files = await readdir(migrationsPath);
-  } catch (_) {
-    return [];
-  }
-  files = files.filter((file) => path.basename(file).includes("."));
-  files = (up ? sortAsc : sortDesc)(files);
-  return files.map((file) => {
-    checkExt(file);
-    const filePath = path.resolve(migrationsPath, file);
-    return {
-      path: filePath,
-      version: getVersion(file),
-      async load() {
-        try {
-          await imp(filePath);
-        } catch (err) {
-          if (err.code !== "ERR_UNSUPPORTED_ESM_URL_SCHEME")
-            throw err;
-          await imp(pathToFileURL(filePath).pathname);
-        }
-      }
-    };
-  });
-}
-function checkExt(filePath) {
-  const ext = path.extname(filePath);
-  if (ext !== ".ts" && ext !== ".js" && ext !== ".mjs") {
-    throw new Error(
-      `Only .ts, .js, and .mjs files are supported for migration, received: ${path}`
-    );
-  }
-}
-function getVersion(path2) {
-  const timestampMatch = path2.match(/^(\d{14})\D/);
-  if (!timestampMatch) {
-    throw new Error(
-      `Migration file name should start with 14 digit version, received ${path2}`
-    );
-  }
-  return timestampMatch[1];
-}
-const sortAsc = (arr) => arr.sort();
-const sortDesc = (arr) => arr.sort((a, b) => a > b ? -1 : 1);
 const joinColumns = (columns) => {
   return columns.map((column) => `"${column}"`).join(", ");
 };
@@ -330,6 +68,14 @@ const makePopulateEnumQuery = (item) => {
     }
   };
 };
+const begin = {
+  text: "BEGIN",
+  values: emptyArray
+};
+const transaction = (adapter, fn) => {
+  return adapter.transaction(begin, fn);
+};
+const queryLock = (trx) => trx.query(`SELECT pg_advisory_xact_lock('${RAKE_DB_LOCK_KEY}')`);
 
 let currentChanges = [];
 const clearChanges = () => {
@@ -338,25 +84,25 @@ const clearChanges = () => {
 const getCurrentChanges = () => currentChanges;
 const pushChange = (fn) => currentChanges.push(fn);
 
-var __defProp$6 = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
-var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
-var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$6 = (a, b) => {
+var __defProp$a = Object.defineProperty;
+var __defProps$7 = Object.defineProperties;
+var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$a = Object.getOwnPropertySymbols;
+var __hasOwnProp$a = Object.prototype.hasOwnProperty;
+var __propIsEnum$a = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$a = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$6.call(b, prop))
-      __defNormalProp$6(a, prop, b[prop]);
-  if (__getOwnPropSymbols$6)
-    for (var prop of __getOwnPropSymbols$6(b)) {
-      if (__propIsEnum$6.call(b, prop))
-        __defNormalProp$6(a, prop, b[prop]);
+    if (__hasOwnProp$a.call(b, prop))
+      __defNormalProp$a(a, prop, b[prop]);
+  if (__getOwnPropSymbols$a)
+    for (var prop of __getOwnPropSymbols$a(b)) {
+      if (__propIsEnum$a.call(b, prop))
+        __defNormalProp$a(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
 const columnTypeToSql = (item) => {
   return item.data.isOfCustomType ? `"${item.toSQL()}"` : item.toSQL();
 };
@@ -450,7 +196,7 @@ const addColumnIndex = (indexes, name, item) => {
   if (item.data.indexes) {
     indexes.push(
       ...item.data.indexes.map((index) => ({
-        columns: [__spreadProps$4(__spreadValues$6({}, index), { column: name })],
+        columns: [__spreadProps$7(__spreadValues$a({}, index), { column: name })],
         options: index
       }))
     );
@@ -632,33 +378,33 @@ class RakeDbError extends Error {
 class NoPrimaryKey extends RakeDbError {
 }
 
-var __defProp$5 = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
-var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
-var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$5 = (a, b) => {
+var __defProp$9 = Object.defineProperty;
+var __defProps$6 = Object.defineProperties;
+var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
+var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
+var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$9 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$5.call(b, prop))
-      __defNormalProp$5(a, prop, b[prop]);
-  if (__getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(b)) {
-      if (__propIsEnum$5.call(b, prop))
-        __defNormalProp$5(a, prop, b[prop]);
+    if (__hasOwnProp$9.call(b, prop))
+      __defNormalProp$9(a, prop, b[prop]);
+  if (__getOwnPropSymbols$9)
+    for (var prop of __getOwnPropSymbols$9(b)) {
+      if (__propIsEnum$9.call(b, prop))
+        __defNormalProp$9(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
 var __objRest$1 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$5.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$9.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$5)
-    for (var prop of __getOwnPropSymbols$5(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$5.call(source, prop))
+  if (source != null && __getOwnPropSymbols$9)
+    for (var prop of __getOwnPropSymbols$9(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$9.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -710,14 +456,14 @@ const makeAst$2 = (up, tableName, shape, tableData, options, noPrimaryKey) => {
   }
   const { primaryKey } = tableData;
   const [schema, table] = getSchemaAndTableFromName(tableName);
-  return __spreadProps$3(__spreadValues$5(__spreadProps$3(__spreadValues$5({
+  return __spreadProps$6(__spreadValues$9(__spreadProps$6(__spreadValues$9({
     type: "table",
     action: up ? "create" : "drop",
     schema,
     name: table,
     shape
   }, tableData), {
-    primaryKey: shapePKeys.length <= 1 ? primaryKey : primaryKey ? __spreadProps$3(__spreadValues$5({}, primaryKey), { columns: [...shapePKeys, ...primaryKey.columns] }) : { columns: shapePKeys }
+    primaryKey: shapePKeys.length <= 1 ? primaryKey : primaryKey ? __spreadProps$6(__spreadValues$9({}, primaryKey), { columns: [...shapePKeys, ...primaryKey.columns] }) : { columns: shapePKeys }
   }), options), {
     noPrimaryKey: options.noPrimaryKey ? "ignore" : noPrimaryKey || "error"
   });
@@ -794,8 +540,8 @@ const astToQueries$1 = (ast, snakeCase, language) => {
   ${constraintToSql(
         ast,
         true,
-        __spreadProps$3(__spreadValues$5({}, item), {
-          references: item.references ? __spreadProps$3(__spreadValues$5({}, item.references), {
+        __spreadProps$6(__spreadValues$9({}, item), {
+          references: item.references ? __spreadProps$6(__spreadValues$9({}, item.references), {
             columns: item.references.columns.map(
               (column) => getColumnName(shape[column], column, snakeCase)
             )
@@ -807,8 +553,8 @@ const astToQueries$1 = (ast, snakeCase, language) => {
     );
   });
   indexes.push(
-    ...((_b = ast.indexes) == null ? void 0 : _b.map((index) => __spreadProps$3(__spreadValues$5({}, index), {
-      columns: index.columns.map((item) => __spreadValues$5(__spreadValues$5({}, item), "column" in item ? {
+    ...((_b = ast.indexes) == null ? void 0 : _b.map((index) => __spreadProps$6(__spreadValues$9({}, index), {
+      columns: index.columns.map((item) => __spreadValues$9(__spreadValues$9({}, item), "column" in item ? {
         column: getColumnName(shape[item.column], item.column, snakeCase)
       } : {}))
     }))) || []
@@ -830,25 +576,25 @@ const astToQueries$1 = (ast, snakeCase, language) => {
   return queries;
 };
 
-var __defProp$4 = Object.defineProperty;
-var __defProps$2 = Object.defineProperties;
-var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
-var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
-var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$4 = (a, b) => {
+var __defProp$8 = Object.defineProperty;
+var __defProps$5 = Object.defineProperties;
+var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
+var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
+var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$8 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$4.call(b, prop))
-      __defNormalProp$4(a, prop, b[prop]);
-  if (__getOwnPropSymbols$4)
-    for (var prop of __getOwnPropSymbols$4(b)) {
-      if (__propIsEnum$4.call(b, prop))
-        __defNormalProp$4(a, prop, b[prop]);
+    if (__hasOwnProp$8.call(b, prop))
+      __defNormalProp$8(a, prop, b[prop]);
+  if (__getOwnPropSymbols$8)
+    for (var prop of __getOwnPropSymbols$8(b)) {
+      if (__propIsEnum$8.call(b, prop))
+        __defNormalProp$8(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
+var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const newChangeTableData = () => ({
   add: {},
   drop: {}
@@ -864,7 +610,7 @@ const mergeTableData = (a, b) => {
     } else {
       a.primaryKey = {
         columns: [...a.primaryKey.columns, ...b.primaryKey.columns],
-        options: __spreadValues$4(__spreadValues$4({}, a.primaryKey.options), b.primaryKey.options)
+        options: __spreadValues$8(__spreadValues$8({}, a.primaryKey.options), b.primaryKey.options)
       };
     }
   }
@@ -927,7 +673,7 @@ const addOrDrop = (type, item, options) => {
         check: item.data.check
       }
     });
-    return __spreadValues$4({
+    return __spreadValues$8({
       type: "change",
       from: type === "add" ? empty : add2,
       to: type === "add" ? add2 : empty
@@ -945,7 +691,7 @@ const columnTypeToColumnChange = (item) => {
     if (foreignKeys == null ? void 0 : foreignKeys.some((it) => "fn" in it)) {
       throw new Error("Callback in foreignKey is not allowed in migration");
     }
-    return __spreadProps$2(__spreadValues$4({
+    return __spreadProps$5(__spreadValues$8({
       column: item,
       type: item.toSQL(),
       nullable: item.data.isNullable,
@@ -957,7 +703,7 @@ const columnTypeToColumnChange = (item) => {
   return item.to;
 };
 const nameKey = Symbol("name");
-const tableChangeMethods = __spreadProps$2(__spreadValues$4({}, tableMethods), {
+const tableChangeMethods = __spreadProps$5(__spreadValues$8({}, tableMethods), {
   name(name) {
     setCurrentColumnName(name);
     const types = Object.create(this);
@@ -967,7 +713,7 @@ const tableChangeMethods = __spreadProps$2(__spreadValues$4({}, tableMethods), {
   add,
   drop,
   change(from, to, options) {
-    return __spreadValues$4({
+    return __spreadValues$8({
       type: "change",
       name: this[nameKey],
       from: columnTypeToColumnChange(from),
@@ -1029,18 +775,18 @@ const makeAst$1 = (up, name, changeData, changeTableData2, options) => {
     }
     if ("type" in item) {
       if (up) {
-        shape[key] = item.type === "change" && item.usingUp ? __spreadProps$2(__spreadValues$4({}, item), { using: item.usingUp }) : item;
+        shape[key] = item.type === "change" && item.usingUp ? __spreadProps$5(__spreadValues$8({}, item), { using: item.usingUp }) : item;
       } else {
         if (item.type === "rename") {
-          shape[item.name] = __spreadProps$2(__spreadValues$4({}, item), { name: key });
+          shape[item.name] = __spreadProps$5(__spreadValues$8({}, item), { name: key });
         } else {
-          shape[key] = item.type === "add" ? __spreadProps$2(__spreadValues$4({}, item), { type: "drop" }) : item.type === "drop" ? __spreadProps$2(__spreadValues$4({}, item), { type: "add" }) : item.type === "change" ? __spreadProps$2(__spreadValues$4({}, item), { from: item.to, to: item.from, using: item.usingDown }) : item;
+          shape[key] = item.type === "add" ? __spreadProps$5(__spreadValues$8({}, item), { type: "drop" }) : item.type === "drop" ? __spreadProps$5(__spreadValues$8({}, item), { type: "add" }) : item.type === "change" ? __spreadProps$5(__spreadValues$8({}, item), { from: item.to, to: item.from, using: item.usingDown }) : item;
         }
       }
     }
   }
   const [schema, table] = getSchemaAndTableFromName(name);
-  return __spreadValues$4({
+  return __spreadValues$8({
     type: "changeTable",
     schema,
     name: table,
@@ -1234,7 +980,7 @@ const astToQueries = (ast, snakeCase, language) => {
           if (fromIndex) {
             dropIndexes.push({
               columns: [
-                __spreadValues$4({
+                __spreadValues$8({
                   column: name
                 }, fromIndex)
               ],
@@ -1244,7 +990,7 @@ const astToQueries = (ast, snakeCase, language) => {
           if (toIndex) {
             addIndexes.push({
               columns: [
-                __spreadValues$4({
+                __spreadValues$8({
                   column: name
                 }, toIndex)
               ],
@@ -1309,13 +1055,13 @@ const mapIndexesForSnakeCase = (indexes, snakeCase) => {
   return (indexes == null ? void 0 : indexes.map((index) => ({
     options: index.options,
     columns: snakeCase ? index.columns.map(
-      (item) => "column" in item ? __spreadProps$2(__spreadValues$4({}, item), { column: toSnakeCase(item.column) }) : item
+      (item) => "column" in item ? __spreadProps$5(__spreadValues$8({}, item), { column: toSnakeCase(item.column) }) : item
     ) : index.columns
   }))) || [];
 };
 const mapConstraintsToSnakeCase = (foreignKeys, snakeCase) => {
-  return (foreignKeys == null ? void 0 : foreignKeys.map((item) => __spreadProps$2(__spreadValues$4({}, item), {
-    references: item.references ? snakeCase ? __spreadProps$2(__spreadValues$4({}, item.references), {
+  return (foreignKeys == null ? void 0 : foreignKeys.map((item) => __spreadProps$5(__spreadValues$8({}, item), {
+    references: item.references ? snakeCase ? __spreadProps$5(__spreadValues$8({}, item.references), {
       columns: item.references.columns.map(toSnakeCase)
     }) : item.references : void 0
   }))) || [];
@@ -1383,25 +1129,25 @@ const astToQuery = (ast) => {
   };
 };
 
-var __defProp$3 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
-var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
-var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$3 = (a, b) => {
+var __defProp$7 = Object.defineProperty;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
+var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
+var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$7 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$3.call(b, prop))
-      __defNormalProp$3(a, prop, b[prop]);
-  if (__getOwnPropSymbols$3)
-    for (var prop of __getOwnPropSymbols$3(b)) {
-      if (__propIsEnum$3.call(b, prop))
-        __defNormalProp$3(a, prop, b[prop]);
+    if (__hasOwnProp$7.call(b, prop))
+      __defNormalProp$7(a, prop, b[prop]);
+  if (__getOwnPropSymbols$7)
+    for (var prop of __getOwnPropSymbols$7(b)) {
+      if (__propIsEnum$7.call(b, prop))
+        __defNormalProp$7(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const createMigrationInterface = (tx, up, config, asts) => {
   const adapter = new TransactionAdapter(tx, tx.client, tx.types);
   const { query, arrays } = adapter;
@@ -2040,7 +1786,7 @@ const wrapWithLog = async (log, query, fn) => {
   if (!log) {
     return fn();
   } else {
-    const sql = typeof query === "string" ? { text: query, values: [] } : query.values ? query : __spreadProps$1(__spreadValues$3({}, query), { values: [] });
+    const sql = typeof query === "string" ? { text: query, values: [] } : query.values ? query : __spreadProps$4(__spreadValues$7({}, query), { values: [] });
     const logData = log.beforeQuery(sql);
     try {
       const result = await fn();
@@ -2058,19 +1804,19 @@ const addColumn = (migration, up, tableName, columnName, fn) => {
   }));
 };
 const addIndex = (migration, up, tableName, columns, options) => {
-  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$3({}, t.add(t.index(columns, options))));
+  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$7({}, t.add(t.index(columns, options))));
 };
 const addForeignKey = (migration, up, tableName, columns, foreignTable, foreignColumns, options) => {
-  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$3({}, t.add(t.foreignKey(columns, foreignTable, foreignColumns, options))));
+  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$7({}, t.add(t.foreignKey(columns, foreignTable, foreignColumns, options))));
 };
 const addPrimaryKey = (migration, up, tableName, columns, options) => {
-  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$3({}, t.add(t.primaryKey(columns, options))));
+  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$7({}, t.add(t.primaryKey(columns, options))));
 };
 const addCheck = (migration, up, tableName, check) => {
-  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$3({}, t.add(t.check(check))));
+  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$7({}, t.add(t.check(check))));
 };
 const addConstraint = (migration, up, tableName, constraint) => {
-  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$3({}, t.add(t.constraint(constraint))));
+  return changeTable(migration, up, tableName, {}, (t) => __spreadValues$7({}, t.add(t.constraint(constraint))));
 };
 const createSchema$1 = async (migration, up, name) => {
   const ast = {
@@ -2084,7 +1830,7 @@ const createSchema$1 = async (migration, up, name) => {
   migration.migratedAsts.push(ast);
 };
 const createExtension$1 = async (migration, up, name, options) => {
-  const ast = __spreadValues$3({
+  const ast = __spreadValues$7({
     type: "extension",
     action: up ? "create" : "drop",
     name
@@ -2100,7 +1846,7 @@ const createExtension$1 = async (migration, up, name, options) => {
 };
 const createEnum$1 = async (migration, up, name, values, options = {}) => {
   const [schema, enumName] = getSchemaAndTableFromName(name);
-  const ast = __spreadValues$3({
+  const ast = __spreadValues$7({
     type: "enum",
     action: up ? "create" : "drop",
     schema,
@@ -2119,7 +1865,7 @@ const createEnum$1 = async (migration, up, name, values, options = {}) => {
 };
 const createDomain$1 = async (migration, up, name, fn, options) => {
   const [schema, domainName] = getSchemaAndTableFromName(name);
-  const ast = __spreadValues$3({
+  const ast = __spreadValues$7({
     type: "domain",
     action: up ? "create" : "drop",
     schema,
@@ -2147,7 +1893,7 @@ DEFAULT ${ast.default.toSQL({ values })}` : ""}${ast.notNull || ast.check ? "\n"
 };
 const createCollation$1 = async (migration, up, name, options) => {
   const [schema, collationName] = getSchemaAndTableFromName(name);
-  const ast = __spreadValues$3({
+  const ast = __spreadValues$7({
     type: "collation",
     action: up ? "create" : "drop",
     schema,
@@ -2189,28 +1935,357 @@ const queryExists = (db, sql) => {
   return db.adapter.query(sql).then(({ rowCount }) => rowCount > 0);
 };
 
-const saveMigratedVersion = async (db, version, config) => {
-  await db.silentArrays(
-    `INSERT INTO ${quoteWithSchema({
-      name: config.migrationsTable
-    })} VALUES ('${version}')`
+const writeMigrationFile = async (config, version, name, content) => {
+  var _a;
+  await mkdir(config.migrationsPath, { recursive: true });
+  const filePath = path.resolve(config.migrationsPath, `${version}_${name}.ts`);
+  const importPath = getImportPath(
+    filePath,
+    path.join(config.basePath, config.dbScript)
+  );
+  await writeFile(filePath, content(importPath, name));
+  (_a = config.logger) == null ? void 0 : _a.log(`Created ${pathToLog(filePath)}`);
+};
+const generate = async (config, [name]) => {
+  if (!name)
+    throw new Error("Migration name is missing");
+  const version = await makeFileVersion({}, config);
+  await writeMigrationFile(config, version, name, makeContent);
+};
+const makeFileVersion = async (ctx, config) => {
+  if (config.migrationId === "timestamp") {
+    return generateTimeStamp();
+  } else {
+    const {
+      migrations: [first]
+    } = await getMigrations(ctx, config, false);
+    return first ? String(parseInt(first.version) + 1).padStart(4, "0") : "0001";
+  }
+};
+const generateTimeStamp = () => {
+  const now = /* @__PURE__ */ new Date();
+  return [
+    now.getUTCFullYear(),
+    now.getUTCMonth() + 1,
+    now.getUTCDate(),
+    now.getUTCHours(),
+    now.getUTCMinutes(),
+    now.getUTCSeconds()
+  ].map((value) => value < 10 ? `0${value}` : value).join("");
+};
+const makeContent = (importPath, name) => {
+  let content = `import { change } from '${importPath}';
+
+change(async (db) => {`;
+  const [first, rest] = getFirstWordAndRest(name);
+  if (rest) {
+    if (first === "create" || first === "drop") {
+      content += `
+  await db.${first === "create" ? "createTable" : "dropTable"}('${rest}', (t) => ({
+    
+  }));`;
+    } else if (first === "change") {
+      content += `
+  await db.changeTable('${rest}', (t) => ({
+    
+  }));`;
+    } else if (first === "add" || first === "remove") {
+      const table = first === "add" ? getTextAfterTo(rest) : getTextAfterFrom(rest);
+      content += `
+  await db.changeTable(${table ? `'${table}'` : "tableName"}, (t) => ({
+    
+  }));`;
+    }
+  }
+  return content + "\n});\n";
+};
+
+const fileNamesToChangeMigrationId = {
+  serial: ".rename-to-serial.json",
+  timestamp: ".rename-to-timestamp.json"
+};
+const fileNamesToChangeMigrationIdMap = Object.fromEntries(
+  Object.entries(fileNamesToChangeMigrationId).map(([_, name]) => [name, true])
+);
+const changeIds = async (options, config, [arg]) => {
+  var _a;
+  if (arg !== "serial" && arg !== "timestamp") {
+    throw new Error(
+      `Pass "serial" or "timestamp" argument to the "change-ids" command`
+    );
+  }
+  if (config.migrations) {
+    throw new Error(
+      `Cannot change migrations ids when migrations set is defined in the config`
+    );
+  }
+  const data = await getMigrationsFromFiles(config, false, (_, filePath) => {
+    const fileName = path.basename(filePath);
+    const match = fileName.match(/^(\d+)\D/);
+    if (!match) {
+      throw new Error(
+        `Migration file name should start digits, received ${fileName}`
+      );
+    }
+    return match[1];
+  });
+  if (data.renameTo) {
+    if (data.renameTo === arg) {
+      (_a = config.logger) == null ? void 0 : _a.log(`${fileNamesToChangeMigrationId[arg]} already exists`);
+      return;
+    }
+    await fs.unlink(
+      path.join(
+        config.migrationsPath,
+        fileNamesToChangeMigrationId[data.renameTo]
+      )
+    );
+  }
+  const version = arg === "timestamp" ? parseInt(generateTimeStamp()) : 1;
+  const rename = Object.fromEntries(
+    data.migrations.map((item, i) => [path.basename(item.path), version + i])
+  );
+  await fs.writeFile(
+    path.join(config.migrationsPath, fileNamesToChangeMigrationId[arg]),
+    JSON.stringify(rename, null, 2)
+  );
+  const values = [];
+  await Promise.all(
+    data.migrations.map(async (item, i) => {
+      let newVersion = String(version + i);
+      if (arg === "serial")
+        newVersion = newVersion.padStart(4, "0");
+      const name = path.basename(item.path).slice(item.version.length + 1);
+      await fs.rename(
+        item.path,
+        path.join(path.dirname(item.path), `${newVersion}_${name}`)
+      );
+      values.push([item.version, name, newVersion]);
+    })
   );
+  if (!values.length)
+    return;
+  await options.map((opts) => {
+    const adapter = new Adapter(opts);
+    renameMigrationVersionsInDb(config, adapter, values).then(
+      () => adapter.close()
+    );
+  });
 };
-const removeMigratedVersion = async (db, version, config) => {
-  await db.silentArrays(
-    `DELETE FROM ${quoteWithSchema({
+const renameMigrationVersionsInDb = async (config, adapter, values) => {
+  await adapter.arrays({
+    text: `UPDATE ${quoteWithSchema({
       name: config.migrationsTable
-    })} WHERE version = '${version}'`
+    })} AS t SET version = v.version FROM (VALUES ${values.map(
+      ([oldVersion, , newVersion], i) => `('${oldVersion}', $${i + 1}, '${newVersion}')`
+    ).join(
+      ", "
+    )}) v(oldVersion, name, version) WHERE t.version = v.oldVersion`,
+    values: values.map(([, name]) => name)
+  });
+};
+
+var __defProp$6 = Object.defineProperty;
+var __defProps$3 = Object.defineProperties;
+var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
+var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
+var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$6 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$6.call(b, prop))
+      __defNormalProp$6(a, prop, b[prop]);
+  if (__getOwnPropSymbols$6)
+    for (var prop of __getOwnPropSymbols$6(b)) {
+      if (__propIsEnum$6.call(b, prop))
+        __defNormalProp$6(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+const getMigrations = async (ctx, config, up, allowDuplicates) => {
+  var _a;
+  return ((_a = ctx.migrationsPromise) != null ? _a : ctx.migrationsPromise = config.migrations ? getMigrationsFromConfig(__spreadProps$3(__spreadValues$6({}, config), { migrations: config.migrations })) : getMigrationsFromFiles(config, allowDuplicates)).then(
+    (data) => up ? data : { renameTo: data.renameTo, migrations: [...data.migrations].reverse() }
   );
 };
+function getMigrationsFromConfig(config, allowDuplicates) {
+  const result = [];
+  const versions = {};
+  const { migrations, basePath } = config;
+  for (const key in migrations) {
+    const version = getMigrationVersionOrThrow(config, path.basename(key));
+    if (versions[version] && !allowDuplicates) {
+      throw new Error(
+        `Migration ${key} has the same version as ${versions[version]}`
+      );
+    }
+    versions[version] = key;
+    result.push({
+      path: path.resolve(basePath, key),
+      version,
+      load: migrations[key]
+    });
+  }
+  return Promise.resolve({
+    migrations: result
+  });
+}
+const sortMigrationsAsc = (a, b) => +a.version - +b.version;
+async function getMigrationsFromFiles(config, allowDuplicates, getVersion = getMigrationVersionOrThrow) {
+  const { migrationsPath, import: imp } = config;
+  const entries = await readdir(migrationsPath, { withFileTypes: true }).catch(
+    () => []
+  );
+  const versions = {};
+  const result = entries.reduce(
+    (data, file) => {
+      if (!file.isFile())
+        return data;
+      if (fileNamesToChangeMigrationIdMap[file.name]) {
+        if (data.renameTo) {
+          throw new Error(
+            `Both files for renaming to serial and timestamp found, only one must remain`
+          );
+        }
+        data.renameTo = file.name === ".rename-to-serial.json" ? "serial" : "timestamp";
+        return data;
+      } else {
+        checkExt(file.name);
+      }
+      const version = getVersion(config, file.name);
+      const filePath = path.resolve(migrationsPath, file.name);
+      if (versions[version] && !allowDuplicates) {
+        throw new Error(
+          `Migration ${pathToFileURL(
+            filePath
+          )} has the same version as ${pathToFileURL(
+            versions[version]
+          )}
+Run \`**db command** rebase\` to reorganize files with duplicated versions.`
+        );
+      }
+      versions[version] = filePath;
+      data.migrations.push({
+        path: filePath,
+        version,
+        async load() {
+          try {
+            await imp(this.path);
+          } catch (err) {
+            if (err.code !== "ERR_UNSUPPORTED_ESM_URL_SCHEME")
+              throw err;
+            await imp(pathToFileURL(this.path).pathname);
+          }
+        }
+      });
+      return data;
+    },
+    { migrations: [] }
+  );
+  result.migrations.sort(sortMigrationsAsc);
+  return result;
+}
+function checkExt(filePath) {
+  const ext = path.extname(filePath);
+  if (ext !== ".ts" && ext !== ".js" && ext !== ".mjs") {
+    throw new Error(
+      `Only .ts, .js, and .mjs files are supported for migration, received: ${filePath}`
+    );
+  }
+}
+function getMigrationVersionOrThrow(config, filePath) {
+  const name = path.basename(filePath);
+  const value = getMigrationVersion(config, name);
+  if (value)
+    return value;
+  if (config.migrationId === "timestamp") {
+    throw new Error(
+      `Migration file name should start with 14 digit timestamp, received ${name}`
+    );
+  } else {
+    throw new Error(
+      `Migration file name should start with 4 digit serial number, received ${name}.
+You can automatically change migration ids to serial by running \`*db-command* change-ids serial\`.
+To keep using timestamp ids, set \`migrationId\` option of rake-db to 'timestamp'.`
+    );
+  }
+}
+function getMigrationVersion(config, name) {
+  var _a;
+  return (_a = config.migrationId === "timestamp" ? name.match(/^(\d{14})(_|\b)/) : name.match(/^(\d{4})(_|\b)/)) == null ? void 0 : _a[1];
+}
+function getDigitsPrefix(name) {
+  var _a;
+  const value = (_a = name.match(/^(\d+)\D/)) == null ? void 0 : _a[1];
+  if (!value) {
+    throw new Error(
+      `Migration file should be prefixed with a serial number, received ${name}`
+    );
+  }
+  return value;
+}
+
+const saveMigratedVersion = async (db, version, name, config) => {
+  await db.silentArrays({
+    text: `INSERT INTO ${quoteWithSchema({
+      name: config.migrationsTable
+    })}(version, name) VALUES ($1, $2)`,
+    values: [version, name]
+  });
+};
+const removeMigratedVersion = async (db, version, name, config) => {
+  const res = await db.silentArrays({
+    text: `DELETE FROM ${quoteWithSchema({
+      name: config.migrationsTable
+    })} WHERE version = $1 AND name = $2`,
+    values: [version, name]
+  });
+  if (res.rowCount === 0) {
+    throw new Error(`Migration ${version}_${name} was not found in db`);
+  }
+};
 class NoMigrationsTableError extends Error {
 }
-const getMigratedVersionsMap = async (db, config) => {
+const getMigratedVersionsMap = async (ctx, adapter, config) => {
   try {
-    const result = await db.arrays(
-      `SELECT * FROM ${quoteWithSchema({ name: config.migrationsTable })}`
-    );
-    return Object.fromEntries(result.rows.map((row) => [row[0], true]));
+    const table = quoteWithSchema({
+      name: config.migrationsTable
+    });
+    const result = await adapter.arrays(`SELECT * FROM ${table}`);
+    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);
+      }
+      const data = result.rows.map(
+        ([version]) => {
+          const name = map[version];
+          if (!name) {
+            throw new Error(
+              `Migration for version ${version} is stored in db but is not found among available migrations`
+            );
+          }
+          return { version, name };
+        }
+      );
+      await adapter.arrays(`ALTER TABLE ${table} ADD COLUMN name TEXT`);
+      await Promise.all(
+        data.map(
+          ({ version, name }) => adapter.arrays({
+            text: `UPDATE ${table} SET name = $2 WHERE version = $1`,
+            values: [version, name]
+          })
+        )
+      );
+      await adapter.arrays(
+        `ALTER TABLE ${table} ALTER COLUMN name SET NOT NULL`
+      );
+    }
+    return Object.fromEntries(result.rows);
   } catch (err) {
     if (err.code === "42P01") {
       throw new NoMigrationsTableError();
@@ -2220,26 +2295,55 @@ const getMigratedVersionsMap = async (db, config) => {
   }
 };
 
-var __defProp$2 = Object.defineProperty;
-var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
-var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
-var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$2 = (a, b) => {
+const createMigrationsTable = async (db, config) => {
+  var _a, _b, _c;
+  const { schema } = db;
+  if (schema && schema !== "public") {
+    try {
+      await db.query(`CREATE SCHEMA "${schema}"`);
+      (_a = config.logger) == null ? void 0 : _a.log(`Created schema ${schema}`);
+    } catch (err) {
+      if (err.code !== "42P06") {
+        throw err;
+      }
+    }
+  }
+  try {
+    await db.query(
+      `CREATE TABLE ${quoteWithSchema({
+        name: config.migrationsTable
+      })} ( version TEXT NOT NULL, name TEXT NOT NULL )`
+    );
+    (_b = config.logger) == null ? void 0 : _b.log("Created versions table");
+  } catch (err) {
+    if (err.code === "42P07") {
+      (_c = config.logger) == null ? void 0 : _c.log("Versions table exists");
+    } else {
+      throw err;
+    }
+  }
+};
+
+var __defProp$5 = Object.defineProperty;
+var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
+var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
+var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$5 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$2.call(b, prop))
-      __defNormalProp$2(a, prop, b[prop]);
-  if (__getOwnPropSymbols$2)
-    for (var prop of __getOwnPropSymbols$2(b)) {
-      if (__propIsEnum$2.call(b, prop))
-        __defNormalProp$2(a, prop, b[prop]);
+    if (__hasOwnProp$5.call(b, prop))
+      __defNormalProp$5(a, prop, b[prop]);
+  if (__getOwnPropSymbols$5)
+    for (var prop of __getOwnPropSymbols$5(b)) {
+      if (__propIsEnum$5.call(b, prop))
+        __defNormalProp$5(a, prop, b[prop]);
     }
   return a;
 };
 const RAKE_DB_LOCK_KEY = "8582141715823621641";
 function makeMigrateFn(defaultCount, up, fn) {
-  return async (options, config, args = []) => {
-    const files = await getMigrations(config, up);
+  return async (ctx, options, config, args = []) => {
+    const set = await getMigrations(ctx, config, up);
     const count = getCount(args);
     const conf = prepareConfig(config, args, count);
     const asts = [];
@@ -2250,21 +2354,22 @@ function makeMigrateFn(defaultCount, up, fn) {
     for (const opts of arrOptions) {
       const adapter = new Adapter(opts);
       try {
-        await adapter.transaction(begin, async (trx) => {
+        await transaction(adapter, async (trx) => {
           await fn(
+            ctx,
             trx,
             conf,
-            files,
+            set,
             count != null ? count : defaultCount,
             localAsts
           );
         });
       } catch (err) {
         if (err instanceof NoMigrationsTableError) {
-          await adapter.transaction(begin, async (trx) => {
+          await transaction(adapter, async (trx) => {
             const config2 = conf;
-            await createSchemaMigrations(trx, config2);
-            await fn(trx, config2, files, count != null ? count : defaultCount, localAsts);
+            await createMigrationsTable(trx, config2);
+            await fn(ctx, trx, config2, set, count != null ? count : defaultCount, localAsts);
           });
         } else {
           throw err;
@@ -2286,21 +2391,21 @@ function makeMigrateFn(defaultCount, up, fn) {
 const migrate = makeMigrateFn(
   Infinity,
   true,
-  (trx, config, files, count, asts) => migrateOrRollback(trx, config, files, count, asts, true)
+  (ctx, trx, config, migrations, count, asts) => migrateOrRollback(ctx, trx, config, migrations, count, asts, true)
 );
 const rollback = makeMigrateFn(
   1,
   false,
-  (trx, config, files, count, asts) => migrateOrRollback(trx, config, files, count, asts, false)
+  (ctx, trx, config, migrations, count, asts) => migrateOrRollback(ctx, trx, config, migrations, count, asts, false)
 );
 const redo = makeMigrateFn(
   1,
-  false,
-  async (trx, config, files, count, asts) => {
-    await migrateOrRollback(trx, config, files, count, asts, false);
-    files.reverse();
-    await migrateOrRollback(trx, config, files, count, asts, true, true);
-    files.reverse();
+  true,
+  async (ctx, trx, config, set, count, asts) => {
+    set.migrations.reverse();
+    await migrateOrRollback(ctx, trx, config, set, count, asts, false);
+    set.migrations.reverse();
+    await migrateOrRollback(ctx, trx, config, set, count, asts, true, true);
   }
 );
 const getDb = (adapter) => createDb$1({ adapter });
@@ -2309,7 +2414,7 @@ const getCount = (args) => {
   return isNaN(num) ? void 0 : num;
 };
 function prepareConfig(config, args, count) {
-  config = __spreadValues$2({}, config);
+  config = __spreadValues$5({}, config);
   const i = count === void 0 ? 0 : 1;
   const arg = args[i];
   if (arg === "--code") {
@@ -2319,83 +2424,303 @@ function prepareConfig(config, args, count) {
     delete config.appCodeUpdater;
   return config;
 }
-const migrateOrRollback = async (trx, config, files, count, asts, up, skipLock) => {
+const migrateOrRollback = async (ctx, trx, config, set, count, asts, up, skipLock) => {
   var _a, _b, _c;
-  if (!skipLock) {
-    await trx.query(`SELECT pg_advisory_xact_lock('${RAKE_DB_LOCK_KEY}')`);
-  }
+  if (!skipLock)
+    await queryLock(trx);
   let db;
   await ((_a = config[up ? "beforeMigrate" : "beforeRollback"]) == null ? void 0 : _a.call(config, db != null ? db : db = getDb(trx)));
-  const migratedVersions = await getMigratedVersionsMap(trx, config);
-  for (const file of files) {
+  let migratedVersions = await getMigratedVersionsMap(ctx, trx, config);
+  if (set.renameTo) {
+    migratedVersions = await renameMigrations(
+      config,
+      trx,
+      migratedVersions,
+      set.renameTo
+    );
+  }
+  for (const file of set.migrations) {
     if (up && migratedVersions[file.version] || !up && !migratedVersions[file.version]) {
       continue;
     }
-    if (count-- <= 0)
-      break;
-    await runMigration(trx, up, file, config, asts);
-    (_b = config.logger) == null ? void 0 : _b.log(
-      `${up ? "Migrated" : "Rolled back"} ${pathToLog(file.path)}`
-    );
-  }
-  await ((_c = config[up ? "afterMigrate" : "afterRollback"]) == null ? void 0 : _c.call(config, db != null ? db : db = getDb(trx)));
-};
-async function runCodeUpdaterAfterAll(options, config, appCodeUpdater, asts, cache) {
-  for (const ast of asts) {
-    await (appCodeUpdater == null ? void 0 : appCodeUpdater.process({
-      ast,
-      options,
-      basePath: config.basePath,
-      cache,
-      logger: config.logger,
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      baseTable: config.baseTable,
-      import: config.import
-    }));
+    if (count-- <= 0)
+      break;
+    await runMigration(trx, up, file, config, asts);
+    (_b = config.logger) == null ? void 0 : _b.log(
+      `${up ? "Migrated" : "Rolled back"} ${pathToLog(file.path)}`
+    );
+  }
+  await ((_c = config[up ? "afterMigrate" : "afterRollback"]) == null ? void 0 : _c.call(config, db != null ? db : db = getDb(trx)));
+};
+async function renameMigrations(config, trx, migratedVersions, renameTo) {
+  let first;
+  for (const version in migratedVersions) {
+    first = version;
+    break;
+  }
+  if (!first || getMigrationVersion(config, first))
+    return migratedVersions;
+  const fileName = fileNamesToChangeMigrationId[renameTo];
+  const filePath = path.join(config.migrationsPath, fileName);
+  const json = await fs.readFile(filePath, "utf-8");
+  let data;
+  try {
+    data = JSON.parse(json);
+    if (typeof data !== "object")
+      throw new Error("Config for renaming is not an object");
+  } catch (err) {
+    throw new Error(`Failed to read ${pathToFileURL(filePath)}`, {
+      cause: err
+    });
+  }
+  const values = [];
+  const updatedVersions = {};
+  for (const version in migratedVersions) {
+    const name = migratedVersions[version];
+    const key = `${version}_${name}`;
+    let newVersion = data[key];
+    if (!newVersion) {
+      throw new Error(
+        `Failed to find an entry for the migrated ${key} in the ${fileName} config`
+      );
+    }
+    if (renameTo === "serial") {
+      newVersion = String(newVersion).padStart(4, "0");
+    }
+    updatedVersions[newVersion] = name;
+    values.push([version, name, newVersion]);
+  }
+  await renameMigrationVersionsInDb(config, trx, values);
+  return updatedVersions;
+}
+async function runCodeUpdaterAfterAll(options, config, appCodeUpdater, asts, cache) {
+  for (const ast of asts) {
+    await (appCodeUpdater == null ? void 0 : appCodeUpdater.process({
+      ast,
+      options,
+      basePath: config.basePath,
+      cache,
+      logger: config.logger,
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      baseTable: config.baseTable,
+      import: config.import
+    }));
+  }
+  await (appCodeUpdater == null ? void 0 : appCodeUpdater.afterAll({
+    options,
+    basePath: config.basePath,
+    cache,
+    logger: config.logger,
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    baseTable: config.baseTable,
+    import: config.import
+  }));
+}
+const changeCache = {};
+const runMigration = async (trx, up, file, config, asts) => {
+  clearChanges();
+  let changes = changeCache[file.path];
+  if (!changes) {
+    const module = await file.load();
+    const exported = (module == null ? void 0 : module.default) && toArray(module.default);
+    if (config.forceDefaultExports && !exported) {
+      throw new RakeDbError(
+        `Missing a default export in ${file.path} migration`
+      );
+    }
+    changes = exported || getCurrentChanges();
+    changeCache[file.path] = changes;
+  }
+  const db = createMigrationInterface(trx, up, config, asts);
+  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](db, up);
+    }
+  }
+  await (up ? saveMigratedVersion : removeMigratedVersion)(
+    db.adapter,
+    file.version,
+    path.basename(file.path).slice(file.version.length + 1),
+    config
+  );
+};
+
+var __defProp$4 = Object.defineProperty;
+var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
+var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
+var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$4 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$4.call(b, prop))
+      __defNormalProp$4(a, prop, b[prop]);
+  if (__getOwnPropSymbols$4)
+    for (var prop of __getOwnPropSymbols$4(b)) {
+      if (__propIsEnum$4.call(b, prop))
+        __defNormalProp$4(a, prop, b[prop]);
+    }
+  return a;
+};
+const migrationConfigDefaults = {
+  schemaConfig: defaultSchemaConfig,
+  migrationsPath: path.join("src", "db", "migrations"),
+  migrationId: "serial",
+  migrationsTable: "schemaMigrations",
+  snakeCase: false,
+  commands: {},
+  import: (path2) => {
+    return import(path2).catch((err) => {
+      if (err.code === "ERR_UNKNOWN_FILE_EXTENSION") {
+        require(path2);
+      } else {
+        throw err;
+      }
+    });
+  },
+  log: true,
+  logger: console,
+  useCodeUpdater: true
+};
+const processRakeDbConfig = (config) => {
+  var _a, _b;
+  const result = __spreadValues$4(__spreadValues$4({}, migrationConfigDefaults), config);
+  if (!result.recurrentPath) {
+    result.recurrentPath = path.join(result.migrationsPath, "recurrent");
+  }
+  if (config.appCodeUpdater && (!("baseTable" in config) || !config.baseTable)) {
+    throw new Error(
+      "`baseTable` option is required in `rakeDb` for `appCodeUpdater`"
+    );
+  }
+  if (!result.log) {
+    delete result.logger;
+  }
+  if (!result.basePath || !result.dbScript) {
+    let filePath = (_a = getStackTrace()) == null ? void 0 : _a[3].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`
+      );
+    }
+    result.basePath = path.dirname(filePath);
+    result.dbScript = path.basename(filePath);
+  }
+  if ("migrationsPath" in result && !path.isAbsolute(result.migrationsPath)) {
+    result.migrationsPath = path.resolve(
+      result.basePath,
+      result.migrationsPath
+    );
+  }
+  if ("recurrentPath" in result && !path.isAbsolute(result.recurrentPath)) {
+    result.recurrentPath = path.resolve(result.basePath, result.recurrentPath);
+  }
+  if ("baseTable" in config) {
+    const proto = (_b = config.baseTable) == null ? void 0 : _b.prototype;
+    result.columnTypes = proto.types || makeColumnTypes(defaultSchemaConfig);
+    if (proto.snakeCase)
+      result.snakeCase = true;
+    if (proto.language)
+      result.language = proto.language;
+  } else {
+    const ct = "columnTypes" in config && config.columnTypes;
+    result.columnTypes = (typeof ct === "function" ? ct(
+      makeColumnTypes(defaultSchemaConfig)
+    ) : ct) || makeColumnTypes;
+  }
+  return result;
+};
+const getDatabaseAndUserFromOptions = (options) => {
+  if (options.databaseURL) {
+    const url = new URL(options.databaseURL);
+    return {
+      database: url.pathname.slice(1),
+      user: url.username
+    };
+  } else {
+    return {
+      database: options.database,
+      user: options.user
+    };
+  }
+};
+
+var __defProp$3 = Object.defineProperty;
+var __defProps$2 = Object.defineProperties;
+var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
+var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
+var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$3 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$3.call(b, prop))
+      __defNormalProp$3(a, prop, b[prop]);
+  if (__getOwnPropSymbols$3)
+    for (var prop of __getOwnPropSymbols$3(b)) {
+      if (__propIsEnum$3.call(b, prop))
+        __defNormalProp$3(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
+const setAdapterOptions = (options, set) => {
+  if (options.databaseURL) {
+    const url = new URL(options.databaseURL);
+    if ("database" in set) {
+      url.pathname = `/${set.database}`;
+    }
+    if (set.user !== void 0) {
+      url.username = set.user;
+    }
+    if (set.password !== void 0) {
+      url.password = set.password;
+    }
+    return __spreadProps$2(__spreadValues$3({}, options), { databaseURL: url.toString() });
+  } else {
+    return __spreadValues$3(__spreadValues$3({}, options), set);
   }
-  await (appCodeUpdater == null ? void 0 : appCodeUpdater.afterAll({
-    options,
-    basePath: config.basePath,
-    cache,
-    logger: config.logger,
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    baseTable: config.baseTable,
-    import: config.import
-  }));
-}
-const changeCache = {};
-const begin = {
-  text: "BEGIN",
-  values: emptyArray
 };
-const runMigration = async (trx, up, file, config, asts) => {
-  clearChanges();
-  let changes = changeCache[file.path];
-  if (!changes) {
-    const module = await file.load();
-    const exported = (module == null ? void 0 : module.default) && toArray(module.default);
-    if (config.forceDefaultExports && !exported) {
-      throw new RakeDbError(
-        `Missing a default export in ${file.path} migration`
-      );
+const setAdminCredentialsToOptions = async (options, create) => {
+  const confirm = await prompts([
+    {
+      message: `Would you like to share admin credentials to ${create ? "create" : "drop"} a database`,
+      type: "confirm",
+      name: "confirm",
+      initial: true
     }
-    changes = exported || getCurrentChanges();
-    changeCache[file.path] = changes;
+  ]);
+  if (!confirm.confirm) {
+    return;
   }
-  const db = createMigrationInterface(trx, up, config, asts);
-  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](db, up);
+  const values = await prompts([
+    {
+      message: "Enter admin user:",
+      type: "text",
+      name: "user",
+      initial: "postgres",
+      min: 1
+    },
+    {
+      message: "Enter admin password:",
+      type: "password",
+      name: "password"
     }
-  }
-  await (up ? saveMigratedVersion : removeMigratedVersion)(
-    db.adapter,
-    file.version,
-    config
-  );
+  ]);
+  return setAdapterOptions(options, __spreadProps$2(__spreadValues$3({}, values), {
+    password: values.password || void 0
+  }));
 };
 
 const execute = async (options, sql) => {
@@ -2458,7 +2783,7 @@ Don't use this command for database service providers, only for a local db.`;
   if (!args.create)
     return;
   const db = new Adapter(options);
-  await createSchemaMigrations(db, config);
+  await createMigrationsTable(db, config);
   await db.close();
 };
 const createDb = async (arg, config) => {
@@ -2495,62 +2820,7 @@ const dropDb = async (arg, config) => {
 const resetDb = async (arg, config) => {
   await dropDb(arg, config);
   await createDb(arg, config);
-  await migrate(arg, config);
-};
-
-const writeMigrationFile = async (config, version, name, content) => {
-  var _a;
-  await mkdir(config.migrationsPath, { recursive: true });
-  const filePath = path.resolve(config.migrationsPath, `${version}_${name}.ts`);
-  const importPath = getImportPath(
-    filePath,
-    path.join(config.basePath, config.dbScript)
-  );
-  await writeFile(filePath, content(importPath, name));
-  (_a = config.logger) == null ? void 0 : _a.log(`Created ${pathToLog(filePath)}`);
-};
-const generate = async (config, [name]) => {
-  if (!name)
-    throw new Error("Migration name is missing");
-  const version = makeFileTimeStamp();
-  await writeMigrationFile(config, version, name, makeContent);
-};
-const makeFileTimeStamp = () => {
-  const now = /* @__PURE__ */ new Date();
-  return [
-    now.getUTCFullYear(),
-    now.getUTCMonth() + 1,
-    now.getUTCDate(),
-    now.getUTCHours(),
-    now.getUTCMinutes(),
-    now.getUTCSeconds()
-  ].map((value) => value < 10 ? `0${value}` : value).join("");
-};
-const makeContent = (importPath, name) => {
-  let content = `import { change } from '${importPath}';
-
-change(async (db) => {`;
-  const [first, rest] = getFirstWordAndRest(name);
-  if (rest) {
-    if (first === "create" || first === "drop") {
-      content += `
-  await db.${first === "create" ? "createTable" : "dropTable"}('${rest}', (t) => ({
-    
-  }));`;
-    } else if (first === "change") {
-      content += `
-  await db.changeTable('${rest}', (t) => ({
-    
-  }));`;
-    } else if (first === "add" || first === "remove") {
-      const table = first === "add" ? getTextAfterTo(rest) : getTextAfterFrom(rest);
-      content += `
-  await db.changeTable(${table ? `'${table}'` : "tableName"}, (t) => ({
-    
-  }));`;
-    }
-  }
-  return content + "\n});\n";
+  await migrate({}, arg, config);
 };
 
 const filterSchema = (table) => `${table} !~ '^pg_' AND ${table} != 'information_schema'`;
@@ -2922,33 +3192,33 @@ async function introspectDbSchema(db) {
   return data.rows[0];
 }
 
-var __defProp$1 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
-var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
-var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$1 = (a, b) => {
+var __defProp$2 = Object.defineProperty;
+var __defProps$1 = Object.defineProperties;
+var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
+var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
+var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$2 = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$1.call(b, prop))
-      __defNormalProp$1(a, prop, b[prop]);
-  if (__getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(b)) {
-      if (__propIsEnum$1.call(b, prop))
-        __defNormalProp$1(a, prop, b[prop]);
+    if (__hasOwnProp$2.call(b, prop))
+      __defNormalProp$2(a, prop, b[prop]);
+  if (__getOwnPropSymbols$2)
+    for (var prop of __getOwnPropSymbols$2(b)) {
+      if (__propIsEnum$2.call(b, prop))
+        __defNormalProp$2(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$1.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$2.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$1)
-    for (var prop of __getOwnPropSymbols$1(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$1.call(source, prop))
+  if (source != null && __getOwnPropSymbols$2)
+    for (var prop of __getOwnPropSymbols$2(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$2.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -2979,7 +3249,7 @@ const structureToAst = async (ctx, adapter) => {
     });
   }
   for (const it of data.collations) {
-    ast.push(__spreadProps(__spreadValues$1({
+    ast.push(__spreadProps$1(__spreadValues$2({
       type: "collation",
       action: "create"
     }, it), {
@@ -3074,7 +3344,7 @@ const structureToAst = async (ctx, adapter) => {
     );
   }
   for (const [fkey, table] of outerConstraints) {
-    ast.push(__spreadProps(__spreadValues$1({}, constraintToAst(ctx, fkey)), {
+    ast.push(__spreadProps$1(__spreadValues$2({}, constraintToAst(ctx, fkey)), {
       type: "constraint",
       action: "create",
       tableSchema: table.schemaName === ctx.currentSchema ? void 0 : table.schemaName,
@@ -3231,7 +3501,7 @@ const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerConstr
     indexes: tableIndexes.filter(
       (index) => index.columns.length > 1 || index.columns.some((it) => "expression" in it)
     ).map((index) => ({
-      columns: index.columns.map((it) => __spreadProps(__spreadValues$1({}, "column" in it ? { column: it.column } : { expression: it.expression }), {
+      columns: index.columns.map((it) => __spreadProps$1(__spreadValues$2({}, "column" in it ? { column: it.column } : { expression: it.expression }), {
         collate: it.collate,
         opclass: it.opclass,
         order: it.order
@@ -3331,9 +3601,9 @@ const makeColumnsShape = (ctx, data, domains, tableName, columns, primaryKey, in
   for (let item of columns) {
     const isSerial = getIsSerial(item);
     if (isSerial) {
-      item = __spreadProps(__spreadValues$1({}, item), { default: void 0 });
+      item = __spreadProps$1(__spreadValues$2({}, item), { default: void 0 });
     }
-    let column = getColumn(ctx, data, domains, __spreadProps(__spreadValues$1({}, item), {
+    let column = getColumn(ctx, data, domains, __spreadProps$1(__spreadValues$2({}, item), {
       type: item.type,
       isArray: item.isArray,
       isSerial
@@ -3657,13 +3927,13 @@ const pullDbStructure = async (options, config) => {
   const result = astToMigration(config, ast);
   if (!result)
     return;
-  const version = makeFileTimeStamp();
+  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, config);
+  await saveMigratedVersion(silentQueries, version, "pull", config);
   const cache = {};
   for (const item of ast) {
     await ((_a = config == null ? void 0 : config.appCodeUpdater) == null ? void 0 : _a.process({
@@ -3749,6 +4019,290 @@ const readdirRecursive = async (dirPath, cb) => {
   );
 };
 
+const listMigrationsStatuses = async (options, config, args) => {
+  var _a, _b;
+  const adapters = options.map((opts) => new Adapter(opts));
+  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 < options.length; i++) {
+    const list = migrated[i];
+    const key = Object.entries(list).map(([version, up]) => `${version}${up ? "t" : "f"}`).join("");
+    const database = options[i].database || new URL(options[i].databaseURL).pathname.slice(1);
+    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[item.version],
+          version: item.version,
+          name,
+          url: pathToFileURL(item.path)
+        };
+      })
+    };
+  }
+  const showUrl = args.includes("p") || args.includes("path");
+  const colors = typeof config.log === "object" ? (_a = config.log.colors) != null ? _a : true : true;
+  const yellow = colors ? (s) => `\x1B[33m${s}\x1B[0m` : (s) => s;
+  const green = colors ? (s) => `\x1B[32m${s}\x1B[0m` : (s) => s;
+  const red = colors ? (s) => `\x1B[31m${s}\x1B[0m` : (s) => s;
+  const blue = colors ? (s) => `\x1B[34m${s}\x1B[0m` : (s) => s;
+  const log = Object.values(map).map(({ databases, migrations: migrations2 }) => {
+    let log2 = ` ${yellow("Database:")} ${databases.join(", ")}`;
+    if (migrations2.length === 0) {
+      return log2 + `
+
+No migrations available`;
+    }
+    const lineSeparator = yellow(
+      makeChars(14 + maxVersionLength + maxNameLength, "-")
+    );
+    const columnSeparator = yellow("|");
+    log2 += "\n\n " + yellow(
+      `Status | Migration ID${makeChars(
+        maxVersionLength - 12,
+        " "
+      )} | Name
+${lineSeparator}`
+    );
+    for (const migration of migrations2) {
+      log2 += `
+  ${migration.up ? ` ${green("Up")} ` : red("Down")}  ${columnSeparator} ${blue(migration.version)}${makeChars(
+        maxVersionLength - migration.version.length,
+        " "
+      )} ${columnSeparator} ${migration.name}`;
+      if (showUrl) {
+        log2 += `
+${migration.url}
+`;
+      }
+    }
+    return log2 += showUrl ? lineSeparator : `
+${lineSeparator}`;
+  }).join("\n\n");
+  ((_b = config.logger) != null ? _b : 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;
+};
+
+var __defProp$1 = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
+var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
+var __propIsEnum$1 = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$1 = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$1.call(b, prop))
+      __defNormalProp$1(a, prop, b[prop]);
+  if (__getOwnPropSymbols$1)
+    for (var prop of __getOwnPropSymbols$1(b)) {
+      if (__propIsEnum$1.call(b, prop))
+        __defNormalProp$1(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+const rebase = async (options, config) => {
+  var _a, _b;
+  if (config.migrations) {
+    throw new Error("Cannot rebase migrations defined in the config");
+  }
+  if (config.migrationId !== "serial") {
+    throw new Error(
+      `Cannot rebase when the 'migrationId' is set to '${config.migrationId}' in the config`
+    );
+  }
+  const adapters = options.map((opts) => new Adapter(opts));
+  const ctx = {};
+  const [set, ...versionMaps] = await Promise.all([
+    await getMigrations(ctx, config, true, true),
+    ...adapters.map((adapter) => getMigratedVersionsMap(ctx, adapter, config))
+  ]);
+  await Promise.all(adapters.map((adapter) => adapter.close()));
+  const files = set.migrations.map((file) => __spreadProps(__spreadValues$1({}, file), {
+    name: path.basename(file.path),
+    serial: +file.version
+  }));
+  if (!files.length)
+    return;
+  const start = files.findIndex(
+    (file, i) => i !== 0 && file.serial === files[i - 1].serial
+  );
+  if (start === -1)
+    return;
+  const combinedVersionsMap = {};
+  for (const map of versionMaps) {
+    Object.assign(combinedVersionsMap, map);
+  }
+  const renames = [];
+  const renamesMap = {};
+  let minVersionToMigrate = (_b = (_a = files.find((file) => !combinedVersionsMap[file.version])) == null ? void 0 : _a.serial) != null ? _b : Infinity;
+  const migratedFiles = [];
+  let maxNewVersion = 0;
+  let move = 0;
+  for (let i = start; i < files.length; i++) {
+    const prev = files[i - 1];
+    const file = files[i];
+    let moveFile;
+    const migratedName = combinedVersionsMap[file.version];
+    if (prev.serial === file.serial) {
+      if (migratedName) {
+        if (prev.name === migratedName) {
+          moveFile = prev;
+        } else if (file.name === migratedName) {
+          moveFile = file;
+        }
+      }
+      if (moveFile) {
+        if (moveFile.serial < minVersionToMigrate) {
+          minVersionToMigrate = moveFile.serial;
+        }
+        migratedFiles.push(moveFile);
+      } else if (!moveFile) {
+        move++;
+        const result = await prompts([
+          {
+            type: "select",
+            name: "file",
+            message: "Which should go first?",
+            choices: [
+              {
+                title: prev.name,
+                value: "prev"
+              },
+              {
+                title: file.name,
+                value: "current"
+              }
+            ]
+          }
+        ]);
+        moveFile = result.file === "prev" ? prev : file;
+      }
+    }
+    let newVersion = file.serial;
+    if (move) {
+      newVersion += move;
+      if (moveFile === prev && !renamesMap[prev.path])
+        newVersion--;
+      if (file.serial !== newVersion) {
+        if (newVersion < minVersionToMigrate)
+          minVersionToMigrate = newVersion;
+        const values = [file.path, newVersion];
+        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 (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(__spreadProps(__spreadValues$1({}, 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;
+  await redo$1(
+    ctx,
+    options,
+    __spreadProps(__spreadValues$1({}, config), {
+      async afterRollback() {
+        set.migrations = migrationsUp;
+      },
+      async afterMigrate() {
+        set.migrations = migrationsDown;
+      }
+    }),
+    ["all"]
+  );
+  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)
+      )
+    );
+  }
+};
+
 var __defProp = Object.defineProperty;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
@@ -3806,15 +4360,21 @@ const runCommand = async (options, config, args = process.argv.slice(2)) => {
   } else if (arg === "reset") {
     await resetDb(options, config);
   } else if (arg === "up" || arg === "migrate") {
-    await migrate(options, config, args.slice(1));
+    await migrate({}, options, config, args.slice(1));
   } else if (arg === "down" || arg === "rollback") {
-    await rollback(options, config, args.slice(1));
+    await rollback({}, options, config, args.slice(1));
   } else if (arg === "redo") {
-    await redo(options, config, args.slice(1));
+    await redo({}, options, config, args.slice(1));
   } else if (arg === "new") {
     await generate(config, args.slice(1));
   } else if (arg === "pull") {
     await pullDbStructure(toArray(options)[0], config);
+  } else if (arg === "status" || arg === "s") {
+    await listMigrationsStatuses(toArray(options), config, args.slice(1));
+  } else if (arg === "rebase") {
+    await rebase(toArray(options), config);
+  } else if (arg === "change-ids") {
+    await changeIds(toArray(options), config, args.slice(1));
   } else if (config.commands[arg]) {
     await config.commands[arg](toArray(options), config, args.slice(1));
   } else if (arg !== "rec" && arg !== "recurrent") {
@@ -3839,7 +4399,12 @@ Commands:
   up                      migrate pending migrations, don't run recurrent
   rollback or down        rollback the last migrated
   redo                    rollback and migrate, run recurrent
+  status or s             list migrations statuses
+  status path or s p      list migrations statuses and paths to files
   rec or recurrent        run recurrent migrations
+  change-ids serial       change migrations ids to 4 digit serial
+  change-ids serial 42    change migrations ids to custom digits serial
+  change-ids timestamp    change migrations ids to timestamps
   no or unknown command   prints this message
   
 Migrate arguments:
@@ -3856,5 +4421,5 @@ Migrate and rollback common arguments:
   --code false            do not run code updater
 `;
 
-export { Migration, NoMigrationsTableError, RAKE_DB_LOCK_KEY, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, redo, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };
+export { Migration, NoMigrationsTableError, RAKE_DB_LOCK_KEY, changeCache, createDb, createMigrationInterface, dropDb, generate, generateTimeStamp, getDatabaseAndUserFromOptions, getMigratedVersionsMap, makeFileVersion, migrate, migrateOrRollback, migrationConfigDefaults, processRakeDbConfig, rakeDb, redo, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };
 //# sourceMappingURL=index.mjs.map