rake-db 2.37.12 → 2.37.14

package/dist/index.d.ts

@@ -1777,6 +1777,11 @@ interface MigrateConfigBase extends QueryLogOptions {
   migrationsTable?: string;
   transaction?: 'single' | 'per-migration';
   transactionSearchPath?: SearchPath;
+  /**
+   * Advisory lock key used while migrating or rolling back.
+   * Defaults to rake-db's fixed lock key.
+   */
+  migrationLockKey?: bigint;
   forceDefaultExports?: boolean;
   beforeChange?: ChangeCallback$1;
   afterChange?: ChangeCallback$1;
@@ -1899,6 +1904,11 @@ interface RakeDbCliConfigInputBase<SchemaConfig extends ColumnSchemaConfig, CT =
   };
   noPrimaryKey?: NoPrimaryKeyOption;
   transactionSearchPath?: SearchPath;
+  /**
+   * Advisory lock key used while migrating or rolling back.
+   * Defaults to rake-db's fixed lock key.
+   */
+  migrationLockKey?: bigint;
   /**
    * Throw if a migration doesn't have a default export.
    * This is needed when in your setup you're importing migration files first and execute them later,
@@ -1998,6 +2008,7 @@ interface RakeDbConfig<ColumnTypes = unknown> extends QueryLogOptions {
   afterRollback?: MigrationCallback;
   migrationId: RakeDbMigrationId;
   transactionSearchPath?: SearchPath;
+  migrationLockKey?: bigint;
   forceDefaultExports?: boolean;
   afterChangeCommit?: ChangeCommitCallback;
   basePath: string;

package/dist/index.js

@@ -26,7 +26,7 @@ let node_url = require("node:url");
 let pqb = require("pqb");
 let node_fs_promises = require("node:fs/promises");
 node_fs_promises = __toESM(node_fs_promises);
-const RAKE_DB_LOCK_KEY = "8582141715823621641";
+const RAKE_DB_LOCK_KEY = 8582141715823621641n;
 const getFirstWordAndRest = (input) => {
 	const i = input.search(/(?=[A-Z])|[-_ ]/);
 	if (i !== -1) {
@@ -88,7 +88,7 @@ const transaction = (adapter, config, fn) => {
 	const searchPath = config.transactionSearchPath;
 	return adapter.transaction(void 0, searchPath ? { setConfig: { search_path: typeof searchPath === "function" ? searchPath() : searchPath } } : void 0, fn);
 };
-const queryLock = (trx) => trx.query(`SELECT pg_advisory_xact_lock('${RAKE_DB_LOCK_KEY}')`);
+const queryLock = (trx, key = RAKE_DB_LOCK_KEY) => trx.query(`SELECT pg_advisory_xact_lock('${key}')`);
 const getCliParam = (args, name) => {
 	if (args) {
 		const key = "--" + name;
@@ -3482,7 +3482,7 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo, fo
 			set.migrations.reverse();
 		}
 	}
-	if (!skipLock) await queryLock(trx);
+	if (!skipLock) await queryLock(trx, config.migrationLockKey);
 	let db;
 	const beforeMigrate = config[up ? "beforeMigrate" : "beforeRollback"];
 	if (beforeMigrate || config.beforeChange) {
@@ -3559,16 +3559,32 @@ const checkMigrationOrder = (config, set, { sequence, map }, force) => {
 		return version;
 	}
 };
-const changeCache = {};
+/**
+* Cache of migration changes, keyed by the loaded migration module.
+* Different migration sets with the same keys load different modules, so they don't share changes.
+*
+* A migration file registers its changes by calling `change` at the top level, which runs only on the first import:
+* subsequent imports return the already evaluated module and register nothing.
+* The cache allows running the same migration again, for example, when migrating several databases.
+*/
+const changesByModule = /* @__PURE__ */ new WeakMap();
+/**
+* Cache of migration changes, keyed by the migration path, for loaders that don't return a module, such as file loaders.
+*/
+const changesByPath = /* @__PURE__ */ new Map();
 const getChanges = async (file, config) => {
 	clearChanges();
-	let changes = file.path ? changeCache[file.path] : void 0;
+	const module = await file.load();
+	const isModule = typeof module === "object" && module !== null;
+	let changes;
+	if (isModule) changes = changesByModule.get(module);
+	else if (file.path) changes = changesByPath.get(file.path);
 	if (!changes) {
-		const module = await file.load();
 		const exported = module?.default && (0, pqb_internal.toArray)(module.default);
 		if (config?.forceDefaultExports && !exported) throw new RakeDbError(`Missing a default export in ${file.path} migration`);
 		changes = exported || getCurrentChanges();
-		if (file.path) changeCache[file.path] = changes;
+		if (isModule) changesByModule.set(module, changes);
+		else if (file.path) changesByPath.set(file.path, changes);
 	}
 	return changes;
 };