@mastra/dsql 1.5.3 → 1.5.4

package/dist/index.js

@@ -934,7 +934,8 @@ var DsqlDB = class extends MastraBase {
 			const uniqueStr = unique ? "UNIQUE " : "";
 			const methodStr = method !== "btree" ? `USING ${method} ` : "";
 			const columnsStr = columns.map((col) => {
-				const quotedCol = `"${parseSqlIdentifier(col.replace(/\s+(DESC|ASC)$/i, "").trim(), "column name")}"`;
+				const colName = col.replace(/\s+(DESC|ASC)$/i, "").trim();
+				const quotedCol = `"${parseSqlIdentifier(colName, "column name")}"`;
 				return opclass ? `${quotedCol} ${opclass}` : quotedCol;
 			}).join(", ");
 			const whereStr = where ? ` WHERE ${where}` : "";
@@ -1850,10 +1851,11 @@ function isRetriableRunFenceWrite(error) {
 */
 async function assertRunFence(t, claimsTable, fence, operation) {
 	const row = await t.oneOrNone(`SELECT generation, "ownerId" FROM ${claimsTable} WHERE "runId" = $1 FOR UPDATE`, [fence.runId]);
-	if (!matchesRunFence(row && {
+	const current = row && {
 		generation: Number(row.generation),
 		ownerId: row.ownerId
-	}, fence)) throw new RunFenceConflictError(fence, operation);
+	};
+	if (!matchesRunFence(current, fence)) throw new RunFenceConflictError(fence, operation);
 }
 /**
 * Runs `write` directly when it carries no fence, or in a transaction behind
@@ -1984,13 +1986,14 @@ var MemoryDSQL = class MemoryDSQL extends MemoryStorage {
 		}
 	}
 	async prune(policies, options) {
+		const targets = resolveRetentionTargets({
+			policies,
+			descriptor: MemoryDSQL.retentionTables,
+			order: ["runFences"]
+		});
 		return executeRetentionPrune({
 			domain: "memory",
-			targets: resolveRetentionTargets({
-				policies,
-				descriptor: MemoryDSQL.retentionTables,
-				order: ["runFences"]
-			}),
+			targets,
 			options,
 			cutoffFor: (target, now) => retentionCutoffMs(target.policy, now),
 			deleteBatch: (target, cutoff, limit) => this.#db.pruneBatch({
@@ -2970,13 +2973,14 @@ var ObservabilityDSQL = class ObservabilityDSQL extends ObservabilityStorage {
 		this.#indexes = indexes?.filter((idx) => ObservabilityDSQL.MANAGED_TABLES.includes(idx.table));
 	}
 	async prune(policies, options) {
+		const targets = resolveRetentionTargets({
+			policies,
+			descriptor: ObservabilityDSQL.retentionTables,
+			order: ["spans"]
+		});
 		return executeRetentionPrune({
 			domain: "observability",
-			targets: resolveRetentionTargets({
-				policies,
-				descriptor: ObservabilityDSQL.retentionTables,
-				order: ["spans"]
-			}),
+			targets,
 			options,
 			cutoffFor: (target, now) => new Date(retentionCutoffMs(target.policy, now)),
 			deleteBatch: (target, cutoff, limit) => this.#db.pruneBatch({
@@ -3351,18 +3355,18 @@ var ObservabilityDSQL = class ObservabilityDSQL extends ObservabilityStorage {
 					case TraceStatus.RUNNING:
 						conditions.push(`r."endedAtZ" IS NULL AND r."error" IS NULL`);
 						break;
-					case TraceStatus.SUCCESS:
-						conditions.push(`r."endedAtZ" IS NOT NULL AND r."error" IS NULL`);
-						break;
+					case TraceStatus.SUCCESS: conditions.push(`r."endedAtZ" 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 orderClause = `ORDER BY r."${`${orderBy?.field ?? "startedAt"}Z`}" ${orderBy?.direction ?? "DESC"}`;
@@ -3981,13 +3985,14 @@ var WorkflowsDSQL = class WorkflowsDSQL extends WorkflowsStorage {
 		}
 	}
 	async prune(policies, options) {
+		const targets = resolveRetentionTargets({
+			policies,
+			descriptor: WorkflowsDSQL.retentionTables,
+			order: ["runOwnership"]
+		});
 		return executeRetentionPrune({
 			domain: "workflows",
-			targets: resolveRetentionTargets({
-				policies,
-				descriptor: WorkflowsDSQL.retentionTables,
-				order: ["runOwnership"]
-			}),
+			targets,
 			options,
 			cutoffFor: (target, now) => retentionCutoffMs(target.policy, now),
 			deleteBatch: (target, cutoff, limit) => this.#db.pruneBatch({
@@ -4353,11 +4358,13 @@ var WorkflowsDSQL = class WorkflowsDSQL extends WorkflowsStorage {
 				values.push(status);
 				paramIndex++;
 			}
-			if (resourceId) if (await this.#db.hasColumn(TABLE_WORKFLOW_SNAPSHOT, "resourceId")) {
-				conditions.push(`"resourceId" = $${paramIndex}`);
-				values.push(resourceId);
-				paramIndex++;
-			} else console.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" = $${paramIndex}`);
+					values.push(resourceId);
+					paramIndex++;
+				} else console.warn(`[${TABLE_WORKFLOW_SNAPSHOT}] resourceId column not found. Skipping resourceId filter.`);
+			}
 			if (fromDate) {
 				conditions.push(`"createdAt" >= $${paramIndex}`);
 				values.push(fromDate instanceof Date ? fromDate.toISOString() : fromDate);
@@ -4465,7 +4472,7 @@ var DSQLStore = class extends MastraStorage {
 	createPool(config) {
 		if (!isHostConfig(config)) throw new Error("DSQLStore: Invalid configuration for creating pool.");
 		const region = getEffectiveRegion(config);
-		return new Pool({
+		const poolConfig = {
 			host: config.host,
 			user: config.user ?? "admin",
 			database: config.database ?? "postgres",
@@ -4478,7 +4485,8 @@ var DSQLStore = class extends MastraStorage {
 			maxLifetimeSeconds: config.maxLifetimeSeconds ?? DSQL_POOL_DEFAULTS.maxLifetimeSeconds,
 			connectionTimeoutMillis: config.connectionTimeoutMillis ?? DSQL_POOL_DEFAULTS.connectionTimeoutMillis,
 			allowExitOnIdle: config.allowExitOnIdle ?? DSQL_POOL_DEFAULTS.allowExitOnIdle
-		});
+		};
+		return new Pool(poolConfig);
 	}
 	async init() {
 		if (this.isInitialized) return;