rake-db 2.37.11 → 2.37.13

package/dist/index.js

@@ -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;
 };
@@ -5165,6 +5181,7 @@ const defaultPrivilegesSql = `SELECT COALESCE(json_agg(t.*), '[]') FROM (
     array_agg(ae.is_grantable) "isGrantables"
   FROM pg_default_acl d
   JOIN LATERAL aclexplode(d.defaclacl) ae ON true
+  WHERE d.defaclnamespace <> 0 OR ae.grantee <> d.defaclrole
   GROUP BY "grantor", "grantee", "schema", "object"
 ) t`;
 const grantsSql = `SELECT COALESCE(json_agg(t.* ORDER BY t."target", t."schema", t."name", t."grantee", t."grantor"), '[]') FROM (