@happyvertical/smrt-core 0.50.0 → 0.51.0

package/dist/schema/live-parity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"live-parity.d.ts","sourceRoot":"","sources":["../../src/schema/live-parity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"live-parity.d.ts","sourceRoot":"","sources":["../../src/schema/live-parity.ts"],"names":[],"mappings":"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"}

package/dist/schema/live-parity.js

@@ -366,21 +366,110 @@ function renameCompatibility(declaredType, candidateType) {
 	if (declaredType === "UUID" && candidateType === "TEXT") return "text-to-uuid";
 	return null;
 }
-async function columnHasNonEmptyValue(db, table, column) {
+/**
+* Live-data probe, batched across every column named: does each hold any
+* non-null, non-empty value? One round trip regardless of column count
+* (#2874) — mirrors `SchemaComparer`'s `columnsHaveNonEmptyValueBatch` in
+* `migrations/differ.ts`, which this module's rename-pending detector
+* duplicates (both trace to #2752/#2767): one row of uncorrelated scalar
+* subqueries, `(SELECT 1 FROM t WHERE ... LIMIT 1) AS "col"`. Deliberately
+* not an aggregate (`MAX(CASE WHEN ...)`) over the whole table — an
+* aggregate forces a full scan per probed column even when the first row
+* already answers it, turning a healthy, mostly-populated large table into
+* a guaranteed full scan on every `db:status`/`db:diff` run (#2874 review
+* finding F1). Each subquery keeps the original `LIMIT 1` early exit; only
+* the round trip is batched.
+*
+* Falls back to {@link columnHasNonEmptyValueSingle} per column when the
+* batched statement itself fails, so one unresolvable column withholds
+* only its own result rather than discarding the whole table's detection
+* (#2874 review finding F2). A column absent from the returned map means
+* "could not be probed"; callers apply their own fail-closed default.
+*/
+async function columnsHaveNonEmptyValueBatch(db, table, columns) {
+	if (columns.length === 0) return /* @__PURE__ */ new Map();
+	try {
+		return await columnsHaveNonEmptyValueBatchQuery(db, table, columns);
+	} catch {
+		const hasData = /* @__PURE__ */ new Map();
+		for (const column of columns) try {
+			hasData.set(column, await columnHasNonEmptyValueSingle(db, table, column));
+		} catch {}
+		return hasData;
+	}
+}
+async function columnsHaveNonEmptyValueBatchQuery(db, table, columns) {
+	const quotedTable = quoteIdentifier(table);
+	const selects = columns.map((column, index) => {
+		const quotedColumn = quoteIdentifier(column);
+		return `(SELECT 1 FROM ${quotedTable} WHERE ${quotedColumn} IS NOT NULL AND CAST(${quotedColumn} AS TEXT) <> '' LIMIT 1) AS c${index}`;
+	});
+	const row = (await db.query(`SELECT ${selects.join(", ")}`))?.rows?.[0] ?? {};
+	const hasData = /* @__PURE__ */ new Map();
+	columns.forEach((column, index) => {
+		hasData.set(column, row[`c${index}`] != null);
+	});
+	return hasData;
+}
+/** Single-column fallback for {@link columnsHaveNonEmptyValueBatch}. */
+async function columnHasNonEmptyValueSingle(db, table, column) {
 	const quotedTable = quoteIdentifier(table);
 	const quotedColumn = quoteIdentifier(column);
 	return ((await db.query(`SELECT 1 AS present FROM ${quotedTable} WHERE ${quotedColumn} IS NOT NULL AND CAST(${quotedColumn} AS TEXT) <> '' LIMIT 1`))?.rows?.length ?? 0) > 0;
 }
-async function allNonEmptyValuesUuidShaped(db, engine, table, column) {
+/**
+* Live-data probe, batched across every column named: are every one of
+* each column's non-empty values UUID-shaped ({@link CANONICAL_UUID_PATTERN})?
+* One round trip regardless of column count (#2874), mirroring
+* {@link columnsHaveNonEmptyValueBatch}: one row of uncorrelated scalar
+* subqueries, each `(SELECT 1 FROM t WHERE <non-empty> AND <invalid> LIMIT
+* 1)` — a value is absent exactly when no invalid row exists, so this also
+* short-circuits on the first invalid row rather than counting every one
+* (an early-exit improvement over the pre-#2874 per-column `count(*)`
+* probe, not just a batching change). PostgreSQL pushes the shape check
+* into its regex operator; SQLite (the only other engine this detector runs
+* against) has no regex operator, but its case-sensitive `GLOB` can still
+* express the fixed 36-character canonical shape (against `LOWER(...)`,
+* guarded by an exact `LENGTH(...) = 36`).
+*
+* Falls back to {@link allNonEmptyValuesUuidShapedSingle} per column on a
+* batch failure, same posture as {@link columnsHaveNonEmptyValueBatch}
+* (#2874 review finding F2).
+*/
+async function columnsAllValuesUuidShapedBatch(db, engine, table, columns) {
+	if (columns.length === 0) return /* @__PURE__ */ new Map();
+	try {
+		return await columnsAllValuesUuidShapedBatchQuery(db, engine, table, columns);
+	} catch {
+		const shaped = /* @__PURE__ */ new Map();
+		for (const column of columns) try {
+			shaped.set(column, await allNonEmptyValuesUuidShapedSingle(db, engine, table, column));
+		} catch {}
+		return shaped;
+	}
+}
+async function columnsAllValuesUuidShapedBatchQuery(db, engine, table, columns) {
+	const quotedTable = quoteIdentifier(table);
+	const selects = columns.map((column, index) => {
+		const quotedColumn = quoteIdentifier(column);
+		const nonEmptyPredicate = `${quotedColumn} IS NOT NULL AND CAST(${quotedColumn} AS TEXT) <> ''`;
+		const invalidPredicate = engine === "postgres" ? `CAST(${quotedColumn} AS TEXT) !~* '${CANONICAL_UUID_PATTERN}'` : `NOT (LENGTH(CAST(${quotedColumn} AS TEXT)) = 36 AND LOWER(CAST(${quotedColumn} AS TEXT)) GLOB '${CANONICAL_UUID_SQLITE_GLOB_PATTERN}')`;
+		return `(SELECT 1 FROM ${quotedTable} WHERE ${nonEmptyPredicate} AND ${invalidPredicate} LIMIT 1) AS c${index}`;
+	});
+	const row = (await db.query(`SELECT ${selects.join(", ")}`))?.rows?.[0] ?? {};
+	const shaped = /* @__PURE__ */ new Map();
+	columns.forEach((column, index) => {
+		shaped.set(column, row[`c${index}`] == null);
+	});
+	return shaped;
+}
+/** Single-column fallback for {@link columnsAllValuesUuidShapedBatch}. */
+async function allNonEmptyValuesUuidShapedSingle(db, engine, table, column) {
 	const quotedTable = quoteIdentifier(table);
 	const quotedColumn = quoteIdentifier(column);
 	const nonEmptyPredicate = `${quotedColumn} IS NOT NULL AND CAST(${quotedColumn} AS TEXT) <> ''`;
-	if (engine === "postgres") {
-		const row = (await db.query(`SELECT count(*) AS invalid_count FROM ${quotedTable} WHERE ${nonEmptyPredicate} AND CAST(${quotedColumn} AS TEXT) !~* '${CANONICAL_UUID_PATTERN}'`))?.rows?.[0];
-		return Number(row?.invalid_count ?? 0) === 0;
-	}
-	const row = (await db.query(`SELECT count(*) AS invalid_count FROM ${quotedTable} WHERE ${nonEmptyPredicate} AND NOT (LENGTH(CAST(${quotedColumn} AS TEXT)) = 36 AND LOWER(CAST(${quotedColumn} AS TEXT)) GLOB '${CANONICAL_UUID_SQLITE_GLOB_PATTERN}')`))?.rows?.[0];
-	return Number(row?.invalid_count ?? 0) === 0;
+	const invalidPredicate = engine === "postgres" ? `CAST(${quotedColumn} AS TEXT) !~* '${CANONICAL_UUID_PATTERN}'` : `NOT (LENGTH(CAST(${quotedColumn} AS TEXT)) = 36 AND LOWER(CAST(${quotedColumn} AS TEXT)) GLOB '${CANONICAL_UUID_SQLITE_GLOB_PATTERN}')`;
+	return ((await db.query(`SELECT 1 AS invalid FROM ${quotedTable} WHERE ${nonEmptyPredicate} AND ${invalidPredicate} LIMIT 1`))?.rows?.length ?? 0) === 0;
 }
 function buildRenameDataPendingFinding(table, declaredColumn, candidates) {
 	const single = candidates.length === 1;
@@ -411,42 +500,50 @@ async function detectRenameDataPending(db, engine, table, liveColumns) {
 	const expectedNames = new Set(table.columns.map((column) => column.name));
 	const extraColumns = [...liveColumns.values()].filter((live) => !expectedNames.has(live.name));
 	if (extraColumns.length === 0) return [];
-	const findings = [];
+	const declaredCandidates = table.columns.filter((column) => liveColumns.has(column.name));
+	if (declaredCandidates.length === 0) return [];
+	const declaredHasData = await columnsHaveNonEmptyValueBatch(db, table.name, declaredCandidates.map((column) => column.name));
+	const emptyDeclaredCandidates = declaredCandidates.filter((column) => !(declaredHasData.get(column.name) ?? true));
+	if (emptyDeclaredCandidates.length === 0) return [];
+	const compatibleExtraColumns = extraColumns.filter((extra) => {
+		const extraNormalized = normalizeSqlType(extra.type);
+		return emptyDeclaredCandidates.some((column) => renameCompatibility(normalizeSqlType(column.type), extraNormalized));
+	});
+	if (compatibleExtraColumns.length === 0) return [];
+	const extraHasData = await columnsHaveNonEmptyValueBatch(db, table.name, compatibleExtraColumns.map((extra) => extra.name));
+	const hasData = new Map([...declaredHasData, ...extraHasData]);
+	const pending = [];
+	const shapeCheckExtras = /* @__PURE__ */ new Set();
 	for (const column of table.columns) {
 		if (!liveColumns.get(column.name)) continue;
-		let declaredHasData;
-		try {
-			declaredHasData = await columnHasNonEmptyValue(db, table.name, column.name);
-		} catch {
-			continue;
-		}
-		if (declaredHasData) continue;
+		if (hasData.get(column.name) ?? true) continue;
 		const declaredType = normalizeSqlType(column.type);
-		const candidates = [];
-		for (const extra of extraColumns) {
+		for (const extra of compatibleExtraColumns) {
 			const compatibility = renameCompatibility(declaredType, normalizeSqlType(extra.type));
 			if (!compatibility) continue;
-			let candidateHasData;
-			try {
-				candidateHasData = await columnHasNonEmptyValue(db, table.name, extra.name);
-			} catch {
-				continue;
-			}
-			if (!candidateHasData) continue;
-			if (compatibility === "text-to-uuid") {
-				let shaped;
-				try {
-					shaped = await allNonEmptyValuesUuidShaped(db, engine, table.name, extra.name);
-				} catch {
-					continue;
-				}
-				if (!shaped) continue;
-			}
-			candidates.push(extra.name);
+			if (!(hasData.get(extra.name) ?? false)) continue;
+			const requiresShapeCheck = compatibility === "text-to-uuid";
+			if (requiresShapeCheck) shapeCheckExtras.add(extra.name);
+			pending.push({
+				declaredName: column.name,
+				extraName: extra.name,
+				requiresShapeCheck
+			});
 		}
+	}
+	const shaped = shapeCheckExtras.size > 0 ? await columnsAllValuesUuidShapedBatch(db, engine, table.name, [...shapeCheckExtras]) : /* @__PURE__ */ new Map();
+	const candidatesByColumn = /* @__PURE__ */ new Map();
+	for (const candidate of pending) {
+		if (candidate.requiresShapeCheck && !(shaped.get(candidate.extraName) ?? false)) continue;
+		const list = candidatesByColumn.get(candidate.declaredName) ?? [];
+		list.push(candidate.extraName);
+		candidatesByColumn.set(candidate.declaredName, list);
+	}
+	const findings = [];
+	for (const [declaredName, candidates] of candidatesByColumn) {
 		if (candidates.length === 0) continue;
 		candidates.sort();
-		findings.push(buildRenameDataPendingFinding(table, column.name, candidates));
+		findings.push(buildRenameDataPendingFinding(table, declaredName, candidates));
 	}
 	return findings;
 }