@voltro/database 0.5.0 → 0.7.0

package/dist/sql.d.ts

@@ -2003,6 +2003,24 @@ declare interface TableUnique {
     };
 }
 
+/**
+ * Clear the `blocked` flag on every LOSSY operation in a plan.
+ *
+ * Called only after the destructive opt-in has been established, and it is not
+ * cosmetic. `applyPlan` carries its OWN unconditional refusal on any blocked
+ * operation, with no override parameter. So a plan that the boot gate has
+ * decided may proceed, but which still arrives marked blocked, is refused a
+ * second time by the applier — which meant `VOLTRO_DESTRUCTIVE_OK=1` could
+ * never actually drop a table. The planner's fix hint names that exact
+ * variable, so the documented escape hatch pointed at a wall.
+ *
+ * Only `lossy` ops are unblocked, and callers must have already established
+ * that no other class is blocked. A rename-without-marker or a NOT NULL
+ * without backfill stays blocked even in destructive-OK mode: those lose data
+ * regardless of intent, so intent is not the question being asked.
+ */
+export declare const unblockLossy: (plan: MigrationPlan) => MigrationPlan;
+
 /**
  * Unique-constraint metadata. Set by `.unique()` (or `.unique({ dedup })`).
  *

package/dist/sql.js

@@ -1261,6 +1261,7 @@ BEGIN
       JOIN pg_attribute att ON att.attrelid = con.conrelid AND att.attnum = ANY (con.conkey)
       WHERE con.contype = 'p' AND nsp.nspname = current_schema()
         AND rel.relname IN ${t}
+      ORDER BY rel.relname, array_position(con.conkey, att.attnum)
     `), p = yield* a(l, (t) => e`
       SELECT rel.relname AS table_name, con.conname AS constraint_name,
              att.attname AS column_name, array_position(con.conkey, att.attnum) AS position
@@ -2337,7 +2338,14 @@ BEGIN
 }), rr = () => {
 	let e = (process.env.VOLTRO_DB_IGNORE_TABLES ?? "").split(",").map((e) => e.trim()).filter((e) => e.length > 0);
 	return e.length > 0 ? { ignoreTables: e } : {};
-}, ir = (e, t, n) => d.gen(function* () {
+}, ir = (e) => ({
+	...e,
+	operations: e.operations.map((e) => {
+		if (!e.blocked || e.classification !== "lossy") return e;
+		let { blocked: t, ...n } = e;
+		return n;
+	})
+}), ar = (e, t, n) => d.gen(function* () {
 	let r = Qn(e), i = t.filter((e) => !at(e.tableName));
 	if (process.env.VOLTRO_MIGRATE_FORCE !== "1") {
 		let t = M(P(i, r));
@@ -2363,6 +2371,7 @@ BEGIN
 			kind: "refused-blocked",
 			plan: s
 		};
+		s = ir(s);
 	}
 	return s.operations.length === 0 ? {
 		kind: "up-to-date",
@@ -2377,10 +2386,10 @@ BEGIN
 		}),
 		plan: s
 	};
-}), ar = (e, t, n) => process.env.VOLTRO_AUTO_MIGRATE === "0" ? d.succeed({
+}), or = (e, t, n) => process.env.VOLTRO_AUTO_MIGRATE === "0" ? d.succeed({
 	kind: "skipped",
 	reason: "VOLTRO_AUTO_MIGRATE=0"
-}) : n.environment === "prod" ? $n(e, t) : ir(e, t, n), or = (e, t) => {
+}) : n.environment === "prod" ? $n(e, t) : ar(e, t, n), sr = (e, t) => {
 	switch (e.kind) {
 		case "skipped": return `auto-migrate: skipped (${e.reason})`;
 		case "up-to-date": return `auto-migrate: schema up to date (${t}, fingerprint=${N(e.fingerprint)})`;
@@ -2394,7 +2403,7 @@ BEGIN
 			return n > 0 && s.push(`${n} table(s) exist in the live DB but aren't in your declared schema.`, "This is usually one of three things:", "  (a) You're iterating on the schema — the table file got renamed, moved, or temporarily commented out.", "      → Restore the declaration. Your data stays intact.", "  (b) You want to KEEP the table but NOT manage it with Voltro (a leftover from another tool —", "      a Strapi/Rails/legacy migration artifact, or an externally-owned table).", `      → Set \`VOLTRO_DB_IGNORE_TABLES=${t.filter((e) => e.op.kind === "drop-table").map((e) => "table" in e.op ? e.op.table : "").filter(Boolean).join(",")}\` (comma-separated).`, "        The planner excludes those tables from the diff entirely — it never drops them, and they", "        stop blocking your OTHER (additive) changes. This is the fix when a leftover freezes your schema.", "  (c) You actually want to drop the table.", "      → Add it to your declared set + chain `.dropped()` on it, OR", "        write a file-based migration in `migrations/` that DROPs it, OR", "        set `VOLTRO_DESTRUCTIVE_OK=1` for ONE `voltro dev` run (acknowledges data loss).", "  Soft-drop: set `VOLTRO_SOFT_DROP=1` alongside DESTRUCTIVE_OK to RENAME instead of DROP", "  (data survives as `<name>__dropped_<ts>` for ~7d; restorable via `voltro db restore-snapshot`)."), r > 0 && s.push(`${r} required column(s) need a backfill strategy before adding to a populated table.`, "  → Annotate the column: `.backfill(sql`<expr>`)` or `.backfill(row => <fn>)` or `.default(<value>)`.", "  Existing rows get the backfill value; the column then lands as NOT NULL."), i > 0 && s.push(`${i} column(s) are missing from your declared schema.`, "  → If intentional: chain `.dropped()` on the column slot in the table declaration.", "  → If a typo: restore the field. Data survives until you drop it."), a > 0 && s.push(`${a} column(s) look like renames (one column gone + a new one of same shape appeared).`, "  → On the NEW column add `.renamedFrom('<oldName>')` so the planner emits RENAME instead of DROP+ADD."), s.push("", "See `voltro db plan` for the full machine-readable diff."), o + "\n" + s.join("\n");
 		}
 	}
-}, sr = /* @__PURE__ */ new Set([
+}, cr = /* @__PURE__ */ new Set([
 	"node_modules",
 	"dist",
 	"build",
@@ -2403,11 +2412,11 @@ BEGIN
 	".next",
 	".git",
 	".framework"
-]), cr = async (e) => {
+]), lr = async (e) => {
 	let t = [], n = async (e) => {
 		let r = await h.readdir(e, { withFileTypes: !0 }).catch(() => []);
 		for (let i of r) {
-			if (sr.has(i.name)) continue;
+			if (cr.has(i.name)) continue;
 			let r = g(e, i.name);
 			i.isDirectory() ? await n(r) : i.isFile() && c.test(i.name) && t.push(r);
 		}
@@ -2416,7 +2425,7 @@ BEGIN
 		let n = e.split("/").pop() ?? e, r = t.split("/").pop() ?? t;
 		return n.localeCompare(r);
 	});
-}, lr = async (e) => {
+}, ur = async (e) => {
 	let t = [];
 	for (let n of e) {
 		let e = (await import(ee(n).href)).default;
@@ -2430,11 +2439,11 @@ BEGIN
 		});
 	}
 	return t;
-}, ur = (e) => e`
+}, dr = (e) => e`
     SELECT ${e("id")}
     FROM ${e("_voltro_migration_plans")}
     WHERE ${e("source")} = 'file'
-  `.pipe(d.map((e) => e.map((e) => e.id)), d.catchAll(() => d.succeed([]))), dr = (e, t, n, r) => d.gen(function* () {
+  `.pipe(d.map((e) => e.map((e) => e.id)), d.catchAll(() => d.succeed([]))), fr = (e, t, n, r) => d.gen(function* () {
 	let i = Date.now(), a = (/* @__PURE__ */ new Date()).toISOString(), o = {
 		sql: e,
 		log: {
@@ -2467,9 +2476,9 @@ BEGIN
          ${r}, ${n}, ${"file"},
          ${c}, ${a}, ${t.migration.description})
     `, { durationMs: c };
-}), fr = (e, t) => d.gen(function* () {
+}), pr = (e, t) => d.gen(function* () {
 	let n = yield* d.tryPromise({
-		try: () => cr(g(t.projectRoot, "migrations")),
+		try: () => lr(g(t.projectRoot, "migrations")),
 		catch: (e) => e
 	});
 	if (n.length === 0) return {
@@ -2477,14 +2486,14 @@ BEGIN
 		skipped: []
 	};
 	let r = yield* d.tryPromise({
-		try: () => lr(n),
+		try: () => ur(n),
 		catch: (e) => e
 	});
 	if (r.length === 0) return {
 		applied: [],
 		skipped: []
 	};
-	let i = new Set(yield* ur(e)), a = r.filter((e) => !i.has(e.migration.id)), o = r.filter((e) => i.has(e.migration.id)).map((e) => e.migration.id);
+	let i = new Set(yield* dr(e)), a = r.filter((e) => !i.has(e.migration.id)), o = r.filter((e) => i.has(e.migration.id)).map((e) => e.migration.id);
 	if (a.length === 0) return {
 		applied: [],
 		skipped: o
@@ -2498,7 +2507,7 @@ BEGIN
 				id: n.migration.id,
 				file: n.file
 			}));
-			let { durationMs: r } = yield* dr(e, n, t.env, t.appliedBy);
+			let { durationMs: r } = yield* fr(e, n, t.env, t.appliedBy);
 			s.push({
 				id: n.migration.id,
 				durationMs: r
@@ -2515,18 +2524,18 @@ BEGIN
 		applied: s,
 		skipped: o
 	};
-}), pr = (e, t) => e`
+}), mr = (e, t) => e`
     SELECT ${e("id")}
     FROM ${e("_voltro_migration_plans")}
     WHERE ${e("id")} = ${t} AND ${e("source")} = 'file'
     LIMIT 1
-  `, mr = (e, t) => d.gen(function* () {
-	if (!(yield* pr(e, t.id))[0]) return yield* d.fail(/* @__PURE__ */ Error(`rollback: ${t.id} not found in _voltro_migration_plans (file source)`));
+  `, hr = (e, t) => d.gen(function* () {
+	if (!(yield* mr(e, t.id))[0]) return yield* d.fail(/* @__PURE__ */ Error(`rollback: ${t.id} not found in _voltro_migration_plans (file source)`));
 	let n = yield* d.tryPromise({
-		try: () => cr(g(t.projectRoot, "migrations")),
+		try: () => lr(g(t.projectRoot, "migrations")),
 		catch: (e) => e
 	}), r = (yield* d.tryPromise({
-		try: () => lr(n),
+		try: () => ur(n),
 		catch: (e) => e
 	})).find((e) => e.migration.id === t.id);
 	if (!r) return yield* d.fail(/* @__PURE__ */ Error(`rollback: file for migration ${t.id} not found on disk under ${t.projectRoot}/migrations/`));
@@ -2559,7 +2568,7 @@ BEGIN
 	} finally {
 		yield* T(e).pipe(d.orDie);
 	}
-}), hr = (e) => d.gen(function* () {
+}), gr = (e) => d.gen(function* () {
 	let t = yield* p.SqlClient, n = yield* t`
       SELECT id, fingerprint, appliedAt FROM _voltro_migration_plans
       WHERE source = 'auto-diff'
@@ -2604,10 +2613,10 @@ BEGIN
 		snapshotFingerprint: e.fingerprint,
 		snapshotId: i
 	};
-}), gr = (e, ...t) => ({
+}), _r = (e, ...t) => ({
 	_tag: "RawSqlFragment",
 	strings: [...e],
 	values: [...t]
-}), _r = (e) => typeof e == "object" && !!e && e._tag === "RawSqlFragment";
+}), vr = (e) => typeof e == "object" && !!e && e._tag === "RawSqlFragment";
 //#endregion
-export { c as FILE_MIGRATION_PATTERN, C as VOLTRO_MIGRATION_LOCK_KEY, ut as _internalCmp, w as acquireMigrationLock, Ke as applyNamespacedSchema, Yn as applyPlan, Be as applySchema, Lt as chunkTables, P as declaredSnapshot, ve as defaultClause, O as defaultJsonClause, or as describeOutcome, Yt as emitDropColumnDdl, Xt as emitDropColumnDdlMysql, ze as emitFrameworkBootstrapSql, Le as emitNamespaceProvisionDdl, Re as emitNamespacedSchemaSql, j as emitSchemaSql, M as fingerprintSchema, rr as ignoreTablesFromEnv, qt as introspectSchema, a as isFileMigration, _r as isRawSqlFragment, Mt as mapPgType, o as migration, k as numericIdSql, jt as parseEnumCheck, At as planMigrations, qe as provisionTenantNamespace, T as releaseMigrationLock, sn as renderColumnMysql, rn as renderColumnPg, mr as rollbackFileBasedMigration, fr as runFileBasedMigrations, Je as runFrameworkBootstrap, Ge as runMigrate, ar as runPlannedMigrations, N as shortFingerprint, gr as sql, D as sqlType, hr as squashMigrationPlans, ge as withMigrationLock };
+export { c as FILE_MIGRATION_PATTERN, C as VOLTRO_MIGRATION_LOCK_KEY, ut as _internalCmp, w as acquireMigrationLock, Ke as applyNamespacedSchema, Yn as applyPlan, Be as applySchema, Lt as chunkTables, P as declaredSnapshot, ve as defaultClause, O as defaultJsonClause, sr as describeOutcome, Yt as emitDropColumnDdl, Xt as emitDropColumnDdlMysql, ze as emitFrameworkBootstrapSql, Le as emitNamespaceProvisionDdl, Re as emitNamespacedSchemaSql, j as emitSchemaSql, M as fingerprintSchema, rr as ignoreTablesFromEnv, qt as introspectSchema, a as isFileMigration, vr as isRawSqlFragment, Mt as mapPgType, o as migration, k as numericIdSql, jt as parseEnumCheck, At as planMigrations, qe as provisionTenantNamespace, T as releaseMigrationLock, sn as renderColumnMysql, rn as renderColumnPg, hr as rollbackFileBasedMigration, pr as runFileBasedMigrations, Je as runFrameworkBootstrap, Ge as runMigrate, or as runPlannedMigrations, N as shortFingerprint, _r as sql, D as sqlType, gr as squashMigrationPlans, ir as unblockLossy, ge as withMigrationLock };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/database",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Browser-safe schema DSL, query builder, and cross-dialect migration planner for Voltro — one schema, every SQL backend.",
   "keywords": [
     "voltro",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@effect/sql": "^0.51.1",
-    "@voltro/logger": "0.5.0",
+    "@voltro/logger": "0.7.0",
     "typeid-js": "^1.2.0",
     "ulidx": "^2.4.1"
   },