@prisma-next/cli 0.1.0-dev.20 → 0.1.0-dev.22

package/dist/cli.js

@@ -1230,7 +1230,7 @@ function createDbInitCommand() {
   setCommandDescriptions(
     command,
     "Bootstrap a database to match the current contract and write the contract marker",
-    "Initializes a database to match your emitted contract using additive-only operations.\nCreates tables, columns, indexes, and constraints defined in your contract.\nWrites a contract marker to track the database state. This operation is idempotent.\n\nCurrently supports empty databases only. Use --plan to preview changes without applying."
+    "Initializes a database to match your emitted contract using additive-only operations.\nCreates any missing tables, columns, indexes, and constraints defined in your contract.\nLeaves existing compatible structures in place, surfaces conflicts when destructive changes\nwould be required, and writes a contract marker to track the database state. Use --plan to\npreview changes without applying."
   );
   command.configureHelp({
     formatHelp: (cmd) => {
@@ -1341,6 +1341,58 @@ function createDbInitCommand() {
           throw errorMigrationPlanningFailed({ conflicts: plannerResult.conflicts });
         }
         const migrationPlan = plannerResult.plan;
+        const existingMarker = await familyInstance.readMarker({ driver });
+        if (existingMarker) {
+          const markerMatchesDestination = existingMarker.coreHash === migrationPlan.destination.coreHash && (!migrationPlan.destination.profileHash || existingMarker.profileHash === migrationPlan.destination.profileHash);
+          if (markerMatchesDestination) {
+            const dbInitResult2 = {
+              ok: true,
+              mode: options.plan ? "plan" : "apply",
+              plan: {
+                targetId: migrationPlan.targetId,
+                destination: migrationPlan.destination,
+                operations: []
+              },
+              ...options.plan ? {} : {
+                execution: { operationsPlanned: 0, operationsExecuted: 0 },
+                marker: {
+                  coreHash: existingMarker.coreHash,
+                  profileHash: existingMarker.profileHash
+                }
+              },
+              summary: "Database already at target contract state",
+              timings: { total: Date.now() - startTime }
+            };
+            return dbInitResult2;
+          }
+          const coreHashMismatch = existingMarker.coreHash !== migrationPlan.destination.coreHash;
+          const profileHashMismatch = migrationPlan.destination.profileHash && existingMarker.profileHash !== migrationPlan.destination.profileHash;
+          const mismatchParts = [];
+          if (coreHashMismatch) {
+            mismatchParts.push(
+              `coreHash (marker: ${existingMarker.coreHash}, destination: ${migrationPlan.destination.coreHash})`
+            );
+          }
+          if (profileHashMismatch) {
+            mismatchParts.push(
+              `profileHash (marker: ${existingMarker.profileHash}, destination: ${migrationPlan.destination.profileHash})`
+            );
+          }
+          throw errorRuntime(
+            `Existing contract marker does not match plan destination. Mismatch in ${mismatchParts.join(" and ")}.`,
+            {
+              why: "Database has an existing contract marker that does not match the target contract",
+              fix: "Use `prisma-next db migrate` to migrate from the existing contract, or drop the database and re-run `db init`",
+              meta: {
+                code: "MARKER_ORIGIN_MISMATCH",
+                markerCoreHash: existingMarker.coreHash,
+                destinationCoreHash: migrationPlan.destination.coreHash,
+                ...existingMarker.profileHash ? { markerProfileHash: existingMarker.profileHash } : {},
+                ...migrationPlan.destination.profileHash ? { destinationProfileHash: migrationPlan.destination.profileHash } : {}
+              }
+            }
+          );
+        }
         if (options.plan) {
           const dbInitResult2 = {
             ok: true,