@mastra/mssql 1.10.4 → 1.10.5

package/dist/index.js

@@ -1110,21 +1110,22 @@ function prepareWhereClause(filters, _schema) {
 				}
 				conditions.push(`[${parseSqlIdentifier(key, "field name")}] IN (${inParamNames.join(", ")})`);
 			}
-		} else if (Array.isArray(value)) if (value.length === 0) conditions.push("1 = 0");
-		else if (value.length === 1) {
-			const paramName = `p${paramIndex++}`;
-			conditions.push(`[${parseSqlIdentifier(key, "field name")}] = @${paramName}`);
-			params[paramName] = value[0] instanceof Date ? value[0].toISOString() : value[0];
-		} else {
-			const inParamNames = [];
-			for (const item of value) {
+		} else if (Array.isArray(value)) {
+			if (value.length === 0) conditions.push("1 = 0");
+			else if (value.length === 1) {
 				const paramName = `p${paramIndex++}`;
-				inParamNames.push(`@${paramName}`);
-				params[paramName] = item instanceof Date ? item.toISOString() : item;
+				conditions.push(`[${parseSqlIdentifier(key, "field name")}] = @${paramName}`);
+				params[paramName] = value[0] instanceof Date ? value[0].toISOString() : value[0];
+			} else {
+				const inParamNames = [];
+				for (const item of value) {
+					const paramName = `p${paramIndex++}`;
+					inParamNames.push(`@${paramName}`);
+					params[paramName] = item instanceof Date ? item.toISOString() : item;
+				}
+				conditions.push(`[${parseSqlIdentifier(key, "field name")}] IN (${inParamNames.join(", ")})`);
 			}
-			conditions.push(`[${parseSqlIdentifier(key, "field name")}] IN (${inParamNames.join(", ")})`);
-		}
-		else {
+		} else {
 			const paramName = `p${paramIndex++}`;
 			conditions.push(`[${parseSqlIdentifier(key, "field name")}] = @${paramName}`);
 			params[paramName] = value instanceof Date ? value.toISOString() : value;
@@ -1959,15 +1960,19 @@ var BackgroundTasksMSSQL = class BackgroundTasksMSSQL extends BackgroundTasksSto
 			params[`p${idx}`] = options.expectedStatus;
 			predicates.push(`[status] = @p${idx++}`);
 		}
-		if (options?.expectedOwnerId !== void 0) if (options.expectedOwnerId === null) predicates.push(`[ownerId] IS NULL`);
-		else {
-			params[`p${idx}`] = options.expectedOwnerId;
-			predicates.push(`[ownerId] = @p${idx++}`);
+		if (options?.expectedOwnerId !== void 0) {
+			if (options.expectedOwnerId === null) predicates.push(`[ownerId] IS NULL`);
+			else {
+				params[`p${idx}`] = options.expectedOwnerId;
+				predicates.push(`[ownerId] = @p${idx++}`);
+			}
 		}
-		if (options?.expectedLeaseExpiresAt !== void 0) if (options.expectedLeaseExpiresAt === null) predicates.push(`[leaseExpiresAt] IS NULL`);
-		else {
-			params[`p${idx}`] = options.expectedLeaseExpiresAt.toISOString();
-			predicates.push(`[leaseExpiresAt] = @p${idx++}`);
+		if (options?.expectedLeaseExpiresAt !== void 0) {
+			if (options.expectedLeaseExpiresAt === null) predicates.push(`[leaseExpiresAt] IS NULL`);
+			else {
+				params[`p${idx}`] = options.expectedLeaseExpiresAt.toISOString();
+				predicates.push(`[leaseExpiresAt] = @p${idx++}`);
+			}
 		}
 		const predicateSql = predicates.length > 0 ? ` AND ${predicates.join(" AND ")}` : "";
 		const request = this.pool.request();
@@ -2124,10 +2129,11 @@ const MAX_CLAIM_ATTEMPTS = 5;
 */
 async function assertRunFence(q, claimsTable, fence, operation) {
 	const row = (await q.request().input("runId", fence.runId).query(`SELECT [generation], [ownerId] FROM ${claimsTable} WITH (HOLDLOCK) WHERE [runId] = @runId`)).recordset[0];
-	if (!matchesRunFence(row ? {
+	const current = row ? {
 		generation: Number(row.generation),
 		ownerId: String(row.ownerId)
-	} : null, fence)) throw new RunFenceConflictError(fence, operation);
+	} : null;
+	if (!matchesRunFence(current, fence)) throw new RunFenceConflictError(fence, operation);
 }
 /** Runs `fn` in a transaction. */
 async function inTransaction(pool, fn) {
@@ -2372,13 +2378,14 @@ var MemoryMSSQL = class MemoryMSSQL extends MemoryStorage {
 		}
 	}
 	async prune(policies, options) {
+		const targets = resolveRetentionTargets({
+			policies,
+			descriptor: MemoryMSSQL.retentionTables,
+			order: ["runFences"]
+		});
 		return executeRetentionPrune({
 			domain: "memory",
-			targets: resolveRetentionTargets({
-				policies,
-				descriptor: MemoryMSSQL.retentionTables,
-				order: ["runFences"]
-			}),
+			targets,
 			options,
 			cutoffFor: (target, now) => retentionCutoffMs(target.policy, now),
 			deleteBatch: (target, cutoff, limit) => this.db.pruneBatch({
@@ -3360,13 +3367,14 @@ var ObservabilityMSSQL = class ObservabilityMSSQL extends ObservabilityStorage {
 		this.indexes = indexes?.filter((idx) => ObservabilityMSSQL.MANAGED_TABLES.includes(idx.table));
 	}
 	async prune(policies, options) {
+		const targets = resolveRetentionTargets({
+			policies,
+			descriptor: ObservabilityMSSQL.retentionTables,
+			order: ["spans"]
+		});
 		return executeRetentionPrune({
 			domain: "observability",
-			targets: resolveRetentionTargets({
-				policies,
-				descriptor: ObservabilityMSSQL.retentionTables,
-				order: ["spans"]
-			}),
+			targets,
 			options,
 			cutoffFor: (target, now) => new Date(retentionCutoffMs(target.policy, now)),
 			deleteBatch: (target, cutoff, limit) => this.db.pruneBatch({
@@ -3829,18 +3837,18 @@ var ObservabilityMSSQL = class ObservabilityMSSQL extends ObservabilityStorage {
 					case TraceStatus.RUNNING:
 						conditions.push(`r.[endedAt] IS NULL AND r.[error] IS NULL`);
 						break;
-					case TraceStatus.SUCCESS:
-						conditions.push(`r.[endedAt] IS NOT NULL AND r.[error] IS NULL`);
-						break;
+					case TraceStatus.SUCCESS: conditions.push(`r.[endedAt] IS NOT NULL AND r.[error] IS NULL`);
 				}
-				if (filters.hasChildError !== void 0) if (filters.hasChildError) conditions.push(`EXISTS (
+				if (filters.hasChildError !== void 0) {
+					if (filters.hasChildError) conditions.push(`EXISTS (
               SELECT 1 FROM ${tableName} c
               WHERE c.[traceId] = r.[traceId] AND c.[error] IS NOT NULL
             )`);
-				else conditions.push(`NOT EXISTS (
+					else conditions.push(`NOT EXISTS (
               SELECT 1 FROM ${tableName} c
               WHERE c.[traceId] = r.[traceId] AND c.[error] IS NOT NULL
             )`);
+				}
 			}
 			const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
 			const sortField = orderBy?.field ?? "startedAt";
@@ -4683,13 +4691,14 @@ var WorkflowsMSSQL = class WorkflowsMSSQL extends WorkflowsStorage {
 		}
 	}
 	async prune(policies, options) {
+		const targets = resolveRetentionTargets({
+			policies,
+			descriptor: WorkflowsMSSQL.retentionTables,
+			order: ["runOwnership"]
+		});
 		return executeRetentionPrune({
 			domain: "workflows",
-			targets: resolveRetentionTargets({
-				policies,
-				descriptor: WorkflowsMSSQL.retentionTables,
-				order: ["runOwnership"]
-			}),
+			targets,
 			options,
 			cutoffFor: (target, now) => retentionCutoffMs(target.policy, now),
 			deleteBatch: (target, cutoff, limit) => this.db.pruneBatch({
@@ -5074,10 +5083,12 @@ var WorkflowsMSSQL = class WorkflowsMSSQL extends WorkflowsStorage {
 				conditions.push(`JSON_VALUE([snapshot], '$.status') = @status`);
 				paramMap["status"] = status;
 			}
-			if (resourceId) if (await this.db.hasColumn(TABLE_WORKFLOW_SNAPSHOT, "resourceId")) {
-				conditions.push(`[resourceId] = @resourceId`);
-				paramMap["resourceId"] = resourceId;
-			} else this.logger?.warn?.(`[${TABLE_WORKFLOW_SNAPSHOT}] resourceId column not found. Skipping resourceId filter.`);
+			if (resourceId) {
+				if (await this.db.hasColumn(TABLE_WORKFLOW_SNAPSHOT, "resourceId")) {
+					conditions.push(`[resourceId] = @resourceId`);
+					paramMap["resourceId"] = resourceId;
+				} else this.logger?.warn?.(`[${TABLE_WORKFLOW_SNAPSHOT}] resourceId column not found. Skipping resourceId filter.`);
+			}
 			if (fromDate instanceof Date && !isNaN(fromDate.getTime())) {
 				conditions.push(`[createdAt] >= @fromDate`);
 				paramMap[`fromDate`] = fromDate.toISOString();