rake-db 2.37.0 → 2.37.2

package/dist/bun.js.map

@@ -1 +1 @@
-{"version":3,"file":"bun.js","names":["AdapterClass","BunAdapter"],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import { BunAdapter, BunAdapterOptions } from 'pqb/bun';\nimport { AdapterClass, MaybeArray, toArray } from 'pqb/internal';\nimport {\n  rakeDbCliWithAdapter,\n  RakeDbFn,\n  setRakeDbCliRunFn,\n  incrementIntermediateCaller,\n} from 'rake-db';\n\nexport const rakeDb = ((inputConfig, args = process.argv.slice(2)) => {\n  if (!('__rakeDbConfig' in inputConfig)) {\n    incrementIntermediateCaller();\n  }\n\n  const rakeDb = rakeDbCliWithAdapter(inputConfig, args);\n  return {\n    ...rakeDb,\n    run(options) {\n      const adapters = toArray(options).map((config) => {\n        return new AdapterClass({\n          driverAdapter: BunAdapter,\n          config,\n        });\n      });\n      return rakeDb.run(adapters);\n    },\n  };\n}) as RakeDbFn<MaybeArray<BunAdapterOptions>>;\n\nsetRakeDbCliRunFn(rakeDb);\n"],"mappings":";;;;AASA,MAAa,WAAW,aAAa,OAAO,QAAQ,KAAK,MAAM,EAAE,KAAK;AACpE,KAAI,EAAE,oBAAoB,aACxB,EAAA,GAAA,QAAA,8BAA6B;CAG/B,MAAM,UAAA,GAAA,QAAA,sBAA8B,aAAa,KAAK;AACtD,QAAO;EACL,GAAG;EACH,IAAI,SAAS;GACX,MAAM,YAAA,GAAA,aAAA,SAAmB,QAAQ,CAAC,KAAK,WAAW;AAChD,WAAO,IAAIA,aAAAA,aAAa;KACtB,eAAeC,QAAAA;KACf;KACD,CAAC;KACF;AACF,UAAO,OAAO,IAAI,SAAS;;EAE9B;;+BAGe,OAAO"}
+{"version":3,"file":"bun.js","names":["rakeDbCliWithAdapter","toArray","AdapterClass","BunAdapter","setRakeDbCliRunFn"],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import { BunAdapter, BunAdapterOptions } from 'pqb/bun';\nimport { AdapterClass, MaybeArray, toArray } from 'pqb/internal';\nimport {\n  rakeDbCliWithAdapter,\n  RakeDbFn,\n  setRakeDbCliRunFn,\n  incrementIntermediateCaller,\n} from 'rake-db';\n\nexport const rakeDb = ((inputConfig, args = process.argv.slice(2)) => {\n  if (!('__rakeDbConfig' in inputConfig)) {\n    incrementIntermediateCaller();\n  }\n\n  const rakeDb = rakeDbCliWithAdapter(inputConfig, args);\n  return {\n    ...rakeDb,\n    run(options) {\n      const adapters = toArray(options).map((config) => {\n        return new AdapterClass({\n          driverAdapter: BunAdapter,\n          config,\n        });\n      });\n      return rakeDb.run(adapters);\n    },\n  };\n}) as RakeDbFn<MaybeArray<BunAdapterOptions>>;\n\nsetRakeDbCliRunFn(rakeDb);\n"],"mappings":";;;;AASA,MAAa,WAAW,aAAa,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAM;CACpE,IAAI,EAAE,oBAAoB,cACxB,CAAA,GAAA,QAAA,4BAAA,CAA4B;CAG9B,MAAM,UAAA,GAASA,QAAAA,qBAAAA,CAAqB,aAAa,IAAI;CACrD,OAAO;EACL,GAAG;EACH,IAAI,SAAS;GACX,MAAM,YAAA,GAAWC,aAAAA,QAAAA,CAAQ,OAAO,CAAC,CAAC,KAAK,WAAW;IAChD,OAAO,IAAIC,aAAAA,aAAa;KACtB,eAAeC,QAAAA;KACf;IACF,CAAC;GACH,CAAC;GACD,OAAO,OAAO,IAAI,QAAQ;EAC5B;CACF;AACF;CAEAC,GAAAA,QAAAA,kBAAAA,CAAkB,MAAM"}

package/dist/bun.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"bun.mjs","names":[],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import { BunAdapter, BunAdapterOptions } from 'pqb/bun';\nimport { AdapterClass, MaybeArray, toArray } from 'pqb/internal';\nimport {\n  rakeDbCliWithAdapter,\n  RakeDbFn,\n  setRakeDbCliRunFn,\n  incrementIntermediateCaller,\n} from 'rake-db';\n\nexport const rakeDb = ((inputConfig, args = process.argv.slice(2)) => {\n  if (!('__rakeDbConfig' in inputConfig)) {\n    incrementIntermediateCaller();\n  }\n\n  const rakeDb = rakeDbCliWithAdapter(inputConfig, args);\n  return {\n    ...rakeDb,\n    run(options) {\n      const adapters = toArray(options).map((config) => {\n        return new AdapterClass({\n          driverAdapter: BunAdapter,\n          config,\n        });\n      });\n      return rakeDb.run(adapters);\n    },\n  };\n}) as RakeDbFn<MaybeArray<BunAdapterOptions>>;\n\nsetRakeDbCliRunFn(rakeDb);\n"],"mappings":";;;AASA,MAAa,WAAW,aAAa,OAAO,QAAQ,KAAK,MAAM,EAAE,KAAK;AACpE,KAAI,EAAE,oBAAoB,aACxB,8BAA6B;CAG/B,MAAM,SAAS,qBAAqB,aAAa,KAAK;AACtD,QAAO;EACL,GAAG;EACH,IAAI,SAAS;GACX,MAAM,WAAW,QAAQ,QAAQ,CAAC,KAAK,WAAW;AAChD,WAAO,IAAI,aAAa;KACtB,eAAe;KACf;KACD,CAAC;KACF;AACF,UAAO,OAAO,IAAI,SAAS;;EAE9B;;AAGH,kBAAkB,OAAO"}
+{"version":3,"file":"bun.mjs","names":[],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import { BunAdapter, BunAdapterOptions } from 'pqb/bun';\nimport { AdapterClass, MaybeArray, toArray } from 'pqb/internal';\nimport {\n  rakeDbCliWithAdapter,\n  RakeDbFn,\n  setRakeDbCliRunFn,\n  incrementIntermediateCaller,\n} from 'rake-db';\n\nexport const rakeDb = ((inputConfig, args = process.argv.slice(2)) => {\n  if (!('__rakeDbConfig' in inputConfig)) {\n    incrementIntermediateCaller();\n  }\n\n  const rakeDb = rakeDbCliWithAdapter(inputConfig, args);\n  return {\n    ...rakeDb,\n    run(options) {\n      const adapters = toArray(options).map((config) => {\n        return new AdapterClass({\n          driverAdapter: BunAdapter,\n          config,\n        });\n      });\n      return rakeDb.run(adapters);\n    },\n  };\n}) as RakeDbFn<MaybeArray<BunAdapterOptions>>;\n\nsetRakeDbCliRunFn(rakeDb);\n"],"mappings":";;;AASA,MAAa,WAAW,aAAa,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAM;CACpE,IAAI,EAAE,oBAAoB,cACxB,4BAA4B;CAG9B,MAAM,SAAS,qBAAqB,aAAa,IAAI;CACrD,OAAO;EACL,GAAG;EACH,IAAI,SAAS;GACX,MAAM,WAAW,QAAQ,OAAO,CAAC,CAAC,KAAK,WAAW;IAChD,OAAO,IAAI,aAAa;KACtB,eAAe;KACf;IACF,CAAC;GACH,CAAC;GACD,OAAO,OAAO,IAAI,QAAQ;EAC5B;CACF;AACF;AAEA,kBAAkB,MAAM"}

package/dist/index.d.ts

@@ -628,7 +628,7 @@ interface TableChangeMethods extends TableMethods, TableDataMethods<string> {
   index(options?: TableData.Index.ColumnArg): ColumnIndexChangeInput;
   unique<Columns extends [string | TableData.Index.ColumnOrExpressionOptions, ...(string | TableData.Index.ColumnOrExpressionOptions)[]], Name extends string>(columns: Columns, options?: TableData.Index.UniqueOptionsArg<Name>): {
     tableDataItem: true;
-    columns: Columns extends (string | TableData.Index.ColumnOptionsForColumn<string>)[] ? { [I in keyof Columns]: 'column' extends keyof Columns[I] ? Columns[I]['column'] : Columns[I] } : never;
+    columns: Columns extends (string | TableData.Index.ColumnOptionsForColumn<string>)[] ? { [I in keyof Columns]: 'column' extends keyof Columns[I] ? Columns[I]['column'] : Columns[I]; } : never;
     name: string extends Name ? never : Name;
   };
   unique(options?: TableData.Index.UniqueColumnArg): ColumnIndexChangeInput;
@@ -761,7 +761,7 @@ interface MigrationInterfaceResult {
  * @param up - migrate or rollback
  * @param config - config of `rakeDb`
  */
-declare const createMigrationInterface: (tx: Adapter, up: boolean, config: Pick<RakeDbConfig, "log" | "logger">) => MigrationInterfaceResult;
+declare const createMigrationInterface: (tx: Adapter, up: boolean, config: Pick<RakeDbConfig, 'log' | 'logger'>) => MigrationInterfaceResult;
 type MigrationAdapter = Adapter;
 declare class Migration<CT = unknown> {
   adapter: MigrationAdapter;
@@ -1734,10 +1734,7 @@ interface RakeDbCtx {
   migrationsPromise?: Promise<MigrationsSet>;
 }
 declare const getSchemaAndTableFromName: (schema: QuerySchema | undefined, name: string) => [string | undefined, string];
-declare const concatSchemaAndName: ({
-  schema,
-  name
-}: {
+declare const concatSchemaAndName: ({ schema, name }: {
   schema?: string;
   name: string;
 }, excludeCurrentSchema?: string) => string;
@@ -1764,7 +1761,7 @@ interface OrmParam {
   $getAdapter(): Adapter;
 }
 type DbParam = OrmParam | Adapter;
-declare const saveMigratedVersion: (db: SilentQueries, version: string, name: string, config: Pick<RakeDbConfig, "migrationsTable">) => Promise<void>;
+declare const saveMigratedVersion: (db: SilentQueries, version: string, name: string, config: Pick<RakeDbConfig, 'migrationsTable'>) => Promise<void>;
 declare const createMigrationsSchemaAndTable: (db: DbParam, config: {
   migrationsTable: string;
   logger?: QueryLogger;
@@ -2019,17 +2016,17 @@ interface RakeDbConfig<ColumnTypes = unknown> extends QueryLogOptions {
   commands: RakeDbCommands;
 }
 declare const rakeDbConfigDefaults: {
+  migrationId: {
+    serial: number;
+  };
+  migrationsTable: string;
+  transaction: string;
   schemaConfig: DefaultSchemaConfig;
   snakeCase: boolean;
   commands: {};
   log: boolean;
   logger: Console;
   import(): never;
-  migrationId: {
-    serial: number;
-  };
-  migrationsTable: string;
-  transaction: string;
 };
 interface RakeDbCommandFn {
   (adapters: Adapter[], config: RakeDbConfig, args: string[]): MaybePromise<unknown>;
@@ -2178,12 +2175,7 @@ declare const getMigrationsSchemaAndTable: (adapter: Adapter, config: {
   schema?: string;
   table: string;
 };
-declare const promptSelect: ({
-  message,
-  options,
-  active,
-  inactive
-}: {
+declare const promptSelect: ({ message, options, active, inactive }: {
   message: string;
   options: string[];
   active?: (s: string) => string;
@@ -2204,15 +2196,12 @@ interface StructureToAstTableData {
   constraints: DbStructure.Constraint[];
   roles?: DbStructure.Role[];
 }
-declare const makeStructureToAstCtx: (config: Pick<RakeDbConfig, "snakeCase" | "schemaConfig">, currentSchema: string) => StructureToAstCtx;
-declare const structureToAst: (ctx: StructureToAstCtx, adapter: Adapter, config: Pick<RakeDbConfig, "migrationsTable">) => Promise<RakeDbAst[]>;
+declare const makeStructureToAstCtx: (config: Pick<RakeDbConfig, 'snakeCase' | 'schemaConfig'>, currentSchema: string) => StructureToAstCtx;
+declare const structureToAst: (ctx: StructureToAstCtx, adapter: Adapter, config: Pick<RakeDbConfig, 'migrationsTable'>) => Promise<RakeDbAst[]>;
 declare const makeDomainsMap: (ctx: StructureToAstCtx, data: IntrospectedStructure) => DbStructureDomainsMap;
 declare const instantiateDbColumn: (ctx: StructureToAstCtx, data: IntrospectedStructure, domains: DbStructureDomainsMap, dbColumn: DbStructure.Column) => Column$1;
-declare const tableToAst: (ctx: StructureToAstCtx, data: IntrospectedStructure, table: DbStructure.Table, action: "create" | "drop", domains: DbStructureDomainsMap) => RakeDbAst.Table;
-declare const getDbStructureTableData: (data: IntrospectedStructure, {
-  name,
-  schemaName
-}: DbStructure.Table) => StructureToAstTableData;
+declare const tableToAst: (ctx: StructureToAstCtx, data: IntrospectedStructure, table: DbStructure.Table, action: 'create' | 'drop', domains: DbStructureDomainsMap) => RakeDbAst.Table;
+declare const getDbStructureTableData: (data: IntrospectedStructure, { name, schemaName }: DbStructure.Table) => StructureToAstTableData;
 interface ColumnChecks {
   [K: string]: string[];
 }
@@ -2238,10 +2227,7 @@ type CreateOrDropOk = 'done' | 'already';
  * });
  * ```
  */
-declare const createDatabase: (db: DbParam, {
-  database,
-  owner
-}: {
+declare const createDatabase: (db: DbParam, { database, owner }: {
   database: string;
   owner?: string;
 }) => Promise<CreateOrDropOk>;
@@ -2264,9 +2250,7 @@ declare const createDatabase: (db: DbParam, {
  * });
  * ```
  */
-declare const dropDatabase: (db: DbParam, {
-  database
-}: {
+declare const dropDatabase: (db: DbParam, { database }: {
   database: string;
 }) => Promise<CreateOrDropOk>;
 /**
@@ -2280,7 +2264,7 @@ declare const dropDatabase: (db: DbParam, {
  * const result: 'done' | 'already' = await createSchema(db, '"schema"');
  * ```
  */
-declare const createSchema: (db: DbParam, sql: string) => Promise<"done" | "already">;
+declare const createSchema: (db: DbParam, sql: string) => Promise<'done' | 'already'>;
 /**
  * `dropSchema` uses a savepoint when it is called in a transaction to not break it if the schema does not exist.
  *
@@ -2292,7 +2276,7 @@ declare const createSchema: (db: DbParam, sql: string) => Promise<"done" | "alre
  * const result: 'done' | 'already' = await dropSchema(db, '"schema"');
  * ```
  */
-declare const dropSchema: (db: DbParam, sql: string) => Promise<"done" | "already">;
+declare const dropSchema: (db: DbParam, sql: string) => Promise<'done' | 'already'>;
 /**
  * `createTable` uses a savepoint when it is called in a transaction to not break it if the table already exists.
  *
@@ -2304,7 +2288,7 @@ declare const dropSchema: (db: DbParam, sql: string) => Promise<"done" | "alread
  * const result: 'done' | 'already' = await createTable(db, '"table"');
  * ```
  */
-declare const createTable: (db: DbParam, sql: string) => Promise<"done" | "already">;
+declare const createTable: (db: DbParam, sql: string) => Promise<'done' | 'already'>;
 /**
  * `dropTable` uses a savepoint when it is called in a transaction to not break it if the table does not exist.
  *
@@ -2316,7 +2300,7 @@ declare const createTable: (db: DbParam, sql: string) => Promise<"done" | "alrea
  * const result: 'done' | 'already' = await dropTable(db, '"table"');
  * ```
  */
-declare const dropTable: (db: DbParam, sql: string) => Promise<"done" | "already">;
+declare const dropTable: (db: DbParam, sql: string) => Promise<'done' | 'already'>;
 interface RakeDbTableFactoryConfigInput<CT> {
   /**
    * Function-style table factory metadata.
@@ -2327,9 +2311,6 @@ interface RakeDbTableFactoryConfigInput<CT> {
    */
   baseTable?: RakeDbBaseTable<CT>;
 }
-declare const getTableFactoryConfig: <CT>({
-  baseTable,
-  defineTable
-}: RakeDbTableFactoryConfigInput<CT>) => RakeDbTableFactoryConfig<CT> | undefined;
+declare const getTableFactoryConfig: <CT>({ baseTable, defineTable }: RakeDbTableFactoryConfigInput<CT>) => RakeDbTableFactoryConfig<CT> | undefined;
 declare class RakeDbError extends Error {}
 export { type ChangeCallback, type DbMigration, type DbStructure, type IntrospectedStructure, type MigrateConfig, type MigrateFn, type MigrationChangeFn, type RakeDbAst, type RakeDbBaseTable, type RakeDbChangeFnConfig, type RakeDbCliConfigInput, type RakeDbCliResult, type RakeDbConfig, type RakeDbDefineTable, RakeDbError, type RakeDbFn, type SilentQueries, type StructureToAstCtx, type StructureToAstTableData, astToMigration, concatSchemaAndName, createDatabase, createMigrationChangeFn, createMigrationInterface, createMigrationsSchemaAndTable, createSchema, createTable, dbColumnToAst, dropDatabase, dropSchema, dropTable, encodeColumnDefault, getConstraintName, getDbStructureTableData, getDbTableColumnsChecks, getDbVersion, getExcludeName, getIndexName, getMigrationsSchemaAndTable, getSchemaAndTableFromName, getTableFactoryConfig, incrementIntermediateCaller, instantiateDbColumn, introspectDbSchema, makeDomainsMap, makeFileVersion, makeStructureToAstCtx, migrate, migrateAndClose, promptSelect, rakeDbCliWithAdapter, rakeDbCommands, rakeDbConfigDefaults, redo, rollback, runMigration, saveMigratedVersion, setRakeDbCliRunFn, structureToAst, tableToAst, writeMigrationFile };

package/dist/index.js

@@ -15,7 +15,7 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
@@ -394,7 +394,8 @@ const primaryKeyToSql = (primaryKey) => {
 };
 const interpolateSqlValues = ({ text, values }) => {
 	return values?.length ? text.replace(/\$(\d+)/g, (_, n) => {
-		return (0, pqb_internal.escapeForMigration)(values[+n - 1]);
+		const i = +n - 1;
+		return (0, pqb_internal.escapeForMigration)(values[i]);
 	}) : text;
 };
 const nameColumnChecks = (table, column, checks) => checks.map((check, i) => ({
@@ -516,7 +517,7 @@ const makeAst$5 = (schema, up, tableName, shape, tableData, options, noPrimaryKe
 		...tableData,
 		primaryKey: shapePKeys.length <= 1 ? primaryKey : primaryKey ? {
 			...primaryKey,
-			columns: [...new Set([...shapePKeys, ...primaryKey.columns])]
+			columns: [.../* @__PURE__ */ new Set([...shapePKeys, ...primaryKey.columns])]
 		} : { columns: shapePKeys },
 		...options,
 		noPrimaryKey: options.noPrimaryKey ? "ignore" : noPrimaryKey || "error"
@@ -902,6 +903,25 @@ const makeTableChangeMethods = (tableMethods) => ({
 			to: { comment }
 		};
 	},
+	/**
+	* Rename a column:
+	*
+	* ```ts
+	* import { change } from '../dbScript';
+	*
+	* change(async (db) => {
+	*   await db.changeTable('table', (t) => ({
+	*     oldColumnName: t.rename('newColumnName'),
+	*   }));
+	* });
+	* ```
+	*
+	* Note that the renaming `ALTER TABLE` is executed before the rest of alterations,
+	* so if you're also adding a new constraint on this column inside the same `changeTable`,
+	* refer to it with a new name.
+	*
+	* @param name
+	*/
 	rename(name) {
 		return {
 			type: "rename",
@@ -920,7 +940,8 @@ const changeTable = async (migration, tableChangeMethods, up, tableName, options
 	standaloneCheckChanges.length = 0;
 	const changeData = fn?.(tableChanger) || {};
 	const schema = migration.adapter.getSchema();
-	const queries = astToQueries(schema, makeAst$4(schema, up, tableName, changeData, changeTableData, options), snakeCase, language);
+	const ast = makeAst$4(schema, up, tableName, changeData, changeTableData, options);
+	const queries = astToQueries(schema, ast, snakeCase, language);
 	for (const query of queries) {
 		const result = await migration.adapter.arrays(interpolateSqlValues(query));
 		query.then?.(result);
@@ -1199,7 +1220,9 @@ const renameColumnSql = (from, to) => {
 	return `RENAME COLUMN "${from}" TO "${to}"`;
 };
 const createView = async (migration, up, name, options, sql) => {
-	const query = astToQuery$2(makeAst$3(migration.adapter.getSchema(), up, name, options, sql));
+	const schema = migration.adapter.getSchema();
+	const ast = makeAst$3(schema, up, name, options, sql);
+	const query = astToQuery$2(ast);
 	await migration.adapter.arrays(interpolateSqlValues(query));
 };
 const makeAst$3 = (schema, up, fullName, options, sql) => {
@@ -1246,12 +1269,15 @@ const astToQuery$2 = (ast) => {
 	};
 };
 const createMaterializedView = async (migration, up, name, options, sql) => {
-	const query = astToQuery$1(makeAst$2(migration.adapter.getSchema(), up, name, options, sql));
+	const schema = migration.adapter.getSchema();
+	const ast = makeAst$2(schema, up, name, options, sql);
+	const query = astToQuery$1(ast);
 	await migration.adapter.arrays(interpolateSqlValues(query));
 };
 const refreshMaterializedView = async (migration, name, options = {}) => {
 	if (options.concurrently && options.withData === false) throw new Error("Cannot refresh a materialized view concurrently with WITH NO DATA");
-	const [s, viewName] = getSchemaAndTableFromName(migration.adapter.getSchema(), name);
+	const schema = migration.adapter.getSchema();
+	const [s, viewName] = getSchemaAndTableFromName(schema, name);
 	const sql = ["REFRESH MATERIALIZED VIEW"];
 	if (options.concurrently) sql.push("CONCURRENTLY");
 	sql.push(`${s ? `"${s}".` : ""}"${viewName}"`);
@@ -1309,7 +1335,8 @@ const serializers = {
 	validUntil: (value) => `VALID UNTIL '${value === void 0 ? "infinity" : value}'`
 };
 const createOrDropRole = async (migration, up, name, params) => {
-	const sql = astToQuery(makeAst$1(up, name, params));
+	const ast = makeAst$1(up, name, params);
+	const sql = astToQuery(ast);
 	await migration.adapter.arrays(sql);
 };
 const makeAst$1 = (up, name, params) => {
@@ -1361,7 +1388,8 @@ const changeRole = async (migration, up, name, from, to) => {
 			for (const key in from.config) if (!(key in config)) config[key] = void 0;
 		}
 	}
-	const sql = changeAstToQuery(makeChangeAst(name, from, to));
+	const ast = makeChangeAst(name, from, to);
+	const sql = changeAstToQuery(ast);
 	if (sql) await migration.adapter.arrays(sql);
 };
 const makeChangeAst = (name, from, to) => {
@@ -1400,7 +1428,8 @@ const renameRole = async (migration, up, from, to) => {
 		from = to;
 		to = f;
 	}
-	const sql = renameAstToQuery(makeRenameAst(from, to));
+	const ast = makeRenameAst(from, to);
+	const sql = renameAstToQuery(ast);
 	if (sql) await migration.adapter.arrays(sql);
 };
 const makeRenameAst = (from, to) => ({
@@ -1452,7 +1481,8 @@ const filterAndTransformConfig = (config, schema) => {
 	return Object.keys(result).length ? result : void 0;
 };
 const changeDefaultPrivileges = async (migration, up, arg) => {
-	const sql = astToSql(makeAst(up, arg));
+	const ast = makeAst(up, arg);
+	const sql = astToSql(ast);
 	if (sql.length) await migration.adapter.arrays(sql.join(";\n"));
 };
 const makeAst = (up, arg) => {
@@ -1605,7 +1635,9 @@ const recreatePolicy = async (migration, tableName, policyName, from, to) => {
 	const fromTable = from.table ?? tableName;
 	const fromName = from.name ?? policyName;
 	await migration.adapter.arrays(dropPolicySql(migration, fromTable, fromName));
-	const { text, values } = createPolicySql(migration, to.table ?? tableName, to.name ?? policyName, to);
+	const toTable = to.table ?? tableName;
+	const toName = to.name ?? policyName;
+	const { text, values } = createPolicySql(migration, toTable, toName, to);
 	await migration.adapter.arrays(text, values);
 };
 const changePolicy = async (migration, up, tableName, policyName, params) => {
@@ -1633,18 +1665,19 @@ const schemaOrDatabaseTargetKeyToSql = {
 	schemas: "SCHEMA",
 	databases: "DATABASE"
 };
-const specialRoleSpecs = new Set([
+const specialRoleSpecs = /* @__PURE__ */ new Set([
 	"PUBLIC",
 	"CURRENT_ROLE",
 	"CURRENT_USER",
 	"SESSION_USER"
 ]);
 const changeGrant = async (migration, up, params) => {
-	const sql = privilegeToSql(migration, {
+	const ast = {
 		...params,
 		to: typeof params.to === "string" ? [params.to] : params.to,
 		action: up ? "grant" : "revoke"
-	});
+	};
+	const sql = privilegeToSql(migration, ast);
 	if (sql.length) await migration.adapter.arrays(sql.join(";\n"));
 };
 const privilegeToSql = (migration, ast) => {
@@ -1769,7 +1802,10 @@ const createMigrationInterface = (tx, up, config) => {
 var Migration = class {
 	getTableMethods() {
 		let { tableMethods } = this;
-		if (!tableMethods) tableMethods = makeTableMethods((0, pqb_internal.defaultSchemaConfig)());
+		if (!tableMethods) {
+			const schemaConfig = (0, pqb_internal.defaultSchemaConfig)();
+			tableMethods = makeTableMethods(schemaConfig);
+		}
 		return tableMethods;
 	}
 	getTableChangeMethods() {
@@ -2850,7 +2886,8 @@ const addOrDropEnumValues = async (migration, up, enumName, values, options) =>
 		return;
 	}
 	const { rows: valuesRows } = await migration.adapter.query(`SELECT unnest(enum_range(NULL::${quotedName}))::text value`);
-	await recreateEnum(migration, ast, valuesRows.map((r) => r.value).filter((v) => !ast.values.includes(v)), (quotedName, table, column) => `Cannot drop ${quotedName} enum values [${ast.values.map(pqb_internal.singleQuote).join(", ")}]: table ${table} has a row with such value in the column "${column}"`);
+	const existingValues = valuesRows.map((r) => r.value);
+	await recreateEnum(migration, ast, existingValues.filter((v) => !ast.values.includes(v)), (quotedName, table, column) => `Cannot drop ${quotedName} enum values [${ast.values.map(pqb_internal.singleQuote).join(", ")}]: table ${table} has a row with such value in the column "${column}"`);
 };
 const changeEnumValues = async (migration, enumName, fromValues, toValues) => {
 	const [schema, name] = getSchemaAndTableFromName(migration.adapter.getSchema(), enumName);
@@ -2907,11 +2944,13 @@ GROUP BY n.nspname, c.relname`);
 const writeMigrationFile = async (config, version, name, migrationCode) => {
 	await (0, node_fs_promises.mkdir)(config.migrationsPath, { recursive: true });
 	const filePath = node_path.default.resolve(config.migrationsPath, `${version}_${name.replaceAll(" ", "-")}.ts`);
-	await (0, node_fs_promises.writeFile)(filePath, `import { change } from '${(0, pqb_internal.getImportPath)(filePath, node_path.default.join(config.basePath, config.dbScript))}';\n${migrationCode}`);
+	const importPath = (0, pqb_internal.getImportPath)(filePath, node_path.default.join(config.basePath, config.dbScript));
+	await (0, node_fs_promises.writeFile)(filePath, `import { change } from '${importPath}';\n${migrationCode}`);
 	config.logger?.log(`Created ${(0, pqb_internal.pathToLog)(filePath)}`);
 };
 const newMigration = async (config, name) => {
-	await writeMigrationFile(config, await makeFileVersion({}, config), name, makeContent(name));
+	const version = await makeFileVersion({}, config);
+	await writeMigrationFile(config, version, name, makeContent(name));
 };
 const makeFileVersion = async (ctx, config) => {
 	if (config.migrationId === "timestamp") return generateTimeStamp();
@@ -3226,7 +3265,8 @@ const saveMigratedVersion = async (db, version, name, config) => {
 	await db.silentArrays(`INSERT INTO ${migrationsSchemaTableSql(db, config)}(version, name) VALUES ($1, $2)`, [version, name]);
 };
 const createMigrationsSchemaAndTable = async (db, config) => {
-	const { schema, table } = getMigrationsSchemaAndTable(getMaybeTransactionAdapter(db), config);
+	const adapter = getMaybeTransactionAdapter(db);
+	const { schema, table } = getMigrationsSchemaAndTable(adapter, config);
 	if (schema) {
 		if (await createSchema(db, schema) === "done") config.logger?.log(`Created schema "${schema}"`);
 	}
@@ -3339,12 +3379,14 @@ function makeMigrateFn(up, defaultCount, fn) {
 		let migrations;
 		try {
 			await transactionIfSingle(adapter, config, async (trx) => {
-				migrations = await fn(trx, config, set, await getMigratedVersionsMap(ctx, trx, config, set.renameTo), count, force);
+				const versions = await getMigratedVersionsMap(ctx, trx, config, set.renameTo);
+				migrations = await fn(trx, config, set, versions, count, force);
 			});
 		} catch (err) {
 			if (err instanceof NoMigrationsTableError) await transactionIfSingle(adapter, config, async (trx) => {
 				await createMigrationsSchemaAndTable(trx, config);
-				migrations = await fn(trx, config, set, await getMigratedVersionsMap(ctx, trx, config, set.renameTo), count, force);
+				const versions = await getMigratedVersionsMap(ctx, trx, config, set.renameTo);
+				migrations = await fn(trx, config, set, versions, count, force);
 			});
 			else throw err;
 		}
@@ -3380,9 +3422,11 @@ async function runMigration(db, ...args) {
 		...rawConfig,
 		...handleConfigLogger(rawConfig)
 	};
-	await transaction(getMaybeTransactionAdapter(db), config, async (trx) => {
+	const adapter = getMaybeTransactionAdapter(db);
+	await transaction(adapter, config, async (trx) => {
 		clearChanges();
-		await applyMigration(trx, true, await getChanges({ load: migration }), config);
+		const changes = await getChanges({ load: migration });
+		await applyMigration(trx, true, changes, config);
 	});
 }
 /**
@@ -3465,7 +3509,8 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo, fo
 			loggedAboutStarting = true;
 			config.logger?.log(`${redo ? "Reapplying migrations for" : up ? "Migrating" : "Rolling back"} database ${getAdapterDatabase$1(trx)}\n`);
 		}
-		await changeMigratedVersion(await migrationRunner(trx, up, await getChanges(file, config), config), up, file, config);
+		const adapter = await migrationRunner(trx, up, await getChanges(file, config), config);
+		await changeMigratedVersion(adapter, up, file, config);
 		(migrations ??= []).push(file);
 		if (up) {
 			const name = node_path.default.basename(file.path);
@@ -3846,11 +3891,12 @@ const astToGenerateItem = (config, ast, currentSchema) => {
 				const keys = ast.action === "create" ? add : drop;
 				keys.push(table);
 				deps.push(schema);
-				analyzeTableColumns(config, currentSchema, schema, table, deps, resolveType, Object.entries(ast.shape).map(([name, column]) => [
+				const columns = Object.entries(ast.shape).map(([name, column]) => [
 					keys,
 					name,
 					{ column }
-				]));
+				]);
+				analyzeTableColumns(config, currentSchema, schema, table, deps, resolveType, columns);
 				if (ast.type === "table") analyzeTableData(config, currentSchema, schema, table, keys, deps, ast);
 				else deps.push(...ast.deps.map(({ schemaName, name }) => `${schemaName}.${name}`));
 			} else {
@@ -5710,9 +5756,7 @@ const viewToAst = (ctx, data, domains, view) => {
 			case "securityBarrier":
 				options.securityBarrier = value === "true";
 				break;
-			case "securityInvoker":
-				options.securityInvoker = value === "true";
-				break;
+			case "securityInvoker": options.securityInvoker = value === "true";
 		}
 	}
 	return {
@@ -5860,14 +5904,16 @@ const checkIfIsOuterRecursiveFkey = (data, table, references) => {
 const pullDbStructure = async (adapter, config) => {
 	const currentSchema = adapter.getSearchPath?.() ?? adapter.searchPath ?? "public";
 	const ctx = makeStructureToAstCtx(config, currentSchema);
-	const result = astToMigration(currentSchema, config, await structureToAst(ctx, adapter, config));
+	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);
-	await saveMigratedVersion(Object.assign(adapter, {
+	const silentQueries = Object.assign(adapter, {
 		silentQuery: adapter.query,
 		silentArrays: adapter.arrays
-	}), version, "pull", config);
+	});
+	await saveMigratedVersion(silentQueries, version, "pull", config);
 	const unsupportedEntries = Object.entries(ctx.unsupportedTypes);
 	if (unsupportedEntries.length) {
 		let count = 0;
@@ -6117,7 +6163,8 @@ const rakeDbCommands = {
 	},
 	status: {
 		run(adapters, config, args) {
-			return listMigrationsStatuses(adapters, config, { showUrl: args.includes("p") || args.includes("path") });
+			const showUrl = args.includes("p") || args.includes("path");
+			return listMigrationsStatuses(adapters, config, { showUrl });
 		},
 		help: "list migrations statuses",
 		helpArguments: {