@supacloud/cli 0.21.1 → 0.21.2

package/dist/index.js

@@ -7068,16 +7068,23 @@ function migrationIdentityKey(version, name) {
   return `${version}\x00${name}`;
 }
 function migrationIdentities(data) {
-  return migrationRows(data).flatMap((row) => row.version == null || row.name == null ? [] : [{ version: String(row.version), name: String(row.name) }]);
+  return migrationRows(data).flatMap((row) => row.version == null || row.name == null ? [] : [{ version: String(row.version), name: String(row.name), statements: row.statements }]);
 }
-function identityConflicts(local, remote) {
+function isLegacyNameBoundMigration(local, remote, remoteMigrations) {
+  return remoteMigrations.filter((candidate) => candidate.name === local.name).length === 1 && local.name === remote.name && local.version !== remote.version && Array.isArray(remote.statements) && remote.statements.length === 1 && typeof remote.statements[0] === "string" && remote.statements[0].trim() === local.sql.trim();
+}
+function identityConflicts(local, remote, remoteMigrations) {
   const reusesVersionOrName = local.version === remote.version || local.name === remote.name;
   const exactlyMatches = local.version === remote.version && local.name === remote.name;
-  return reusesVersionOrName && !exactlyMatches;
+  return reusesVersionOrName && !exactlyMatches && !isLegacyNameBoundMigration(local, remote, remoteMigrations);
 }
 function migrationIdentityConflicts(data, migrationFiles) {
   const remoteMigrations = migrationIdentities(data);
-  return migrationFiles.flatMap((localMigration) => remoteMigrations.filter((remoteMigration) => identityConflicts(localMigration, remoteMigration)).map((remoteMigration) => ({ file: localMigration.file, local: localMigration, remote: remoteMigration })));
+  return migrationFiles.flatMap((localMigration) => remoteMigrations.filter((remoteMigration) => identityConflicts(localMigration, remoteMigration, remoteMigrations)).map((remoteMigration) => ({ file: localMigration.file, local: localMigration, remote: remoteMigration })));
+}
+function legacyNameBoundMigrationKeys(data, migrationFiles) {
+  const remoteMigrations = migrationIdentities(data);
+  return new Set(migrationFiles.flatMap((localMigration) => remoteMigrations.some((remoteMigration) => isLegacyNameBoundMigration(localMigration, remoteMigration, remoteMigrations)) ? [migrationIdentityKey(localMigration.version, localMigration.name)] : []));
 }
 function assertNoMigrationIdentityConflicts(data, migrationFiles) {
   const conflicts = migrationIdentityConflicts(data, migrationFiles);
@@ -7382,9 +7389,10 @@ Actions: ${allActions.join(", ")}${readOnly ? " (read-only mode)" : ""}`, {
         const skipped = [];
         const nameBoundMarkerKeys = nameBoundMigrationMarkerKeys(migrationsResult.data);
         const historicalChecksumKeys = historicalChecksumMarkerKeys(migrationsResult.data, migrationFiles);
+        const legacyNameBoundKeys = legacyNameBoundMigrationKeys(migrationsResult.data, migrationFiles);
         for (const { file, name, version, sql } of migrationFiles) {
           const migrationKey = migrationIdentityKey(version, name);
-          if (nameBoundMarkerKeys.has(migrationKey) || historicalChecksumKeys.has(migrationKey)) {
+          if (nameBoundMarkerKeys.has(migrationKey) || historicalChecksumKeys.has(migrationKey) || legacyNameBoundKeys.has(migrationKey)) {
             skipped.push(file);
             continue;
           }
@@ -12039,7 +12047,7 @@ var MUTATION_TOOL_SCHEMA = {
 // package.json
 var package_default = {
   name: "@supacloud/cli",
-  version: "0.21.1",
+  version: "0.21.2",
   description: "Project-scoped CLI for SupaCloud users",
   type: "module",
   main: "./dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supacloud/cli",
-  "version": "0.21.1",
+  "version": "0.21.2",
   "description": "Project-scoped CLI for SupaCloud users",
   "type": "module",
   "main": "./dist/index.js",