@mastra/pg 1.27.2-alpha.1 → 1.28.0-alpha.3

package/dist/index.js

@@ -458,14 +458,8 @@ function buildDeleteFilterQuery(filter) {
 		const joined = value.map((f) => {
 			const entries = Object.entries(f || {});
 			if (entries.length === 0) return "";
-			const [firstKey, firstValue] = entries[0] || [];
-			if ([
-				"$and",
-				"$or",
-				"$not",
-				"$nor"
-			].includes(firstKey)) return buildCondition(firstKey, firstValue, parentPath);
-			return entries.map(([k, v]) => buildCondition(k, v, parentPath)).join(` ${joinOperator} `);
+			const branchConditions = entries.map(([k, v]) => buildCondition(k, v, parentPath));
+			return branchConditions.length === 1 ? branchConditions[0] : `(${branchConditions.join(" AND ")})`;
 		}).join(` ${joinOperator} `);
 		const operatorFn = FILTER_OPERATORS[key];
 		return operatorFn(joined, 0, value).sql;
@@ -549,14 +543,8 @@ function buildFilterQuery(filter, minScore, topK) {
 		const joined = value.map((f) => {
 			const entries = Object.entries(f || {});
 			if (entries.length === 0) return "";
-			const [firstKey, firstValue] = entries[0] || [];
-			if ([
-				"$and",
-				"$or",
-				"$not",
-				"$nor"
-			].includes(firstKey)) return buildCondition(firstKey, firstValue, parentPath);
-			return entries.map(([k, v]) => buildCondition(k, v, parentPath)).join(` ${joinOperator} `);
+			const branchConditions = entries.map(([k, v]) => buildCondition(k, v, parentPath));
+			return branchConditions.length === 1 ? branchConditions[0] : `(${branchConditions.join(" AND ")})`;
 		}).join(` ${joinOperator} `);
 		const operatorFn = FILTER_OPERATORS[key];
 		return operatorFn(joined, 0, value).sql;
@@ -5024,6 +5012,7 @@ function rowToTask(row) {
 	const startedAt = row.startedAtZ || row.startedAt;
 	const suspendedAt = row.suspendedAtZ || row.suspendedAt;
 	const completedAt = row.completedAtZ || row.completedAt;
+	const leaseExpiresAt = row.leaseExpiresAtZ || row.leaseExpiresAt;
 	return {
 		id: row.id,
 		status: row.status,
@@ -5043,7 +5032,9 @@ function rowToTask(row) {
 		createdAt: createdAt instanceof Date ? createdAt : new Date(createdAt),
 		startedAt: startedAt ? startedAt instanceof Date ? startedAt : new Date(startedAt) : void 0,
 		suspendedAt: suspendedAt ? suspendedAt instanceof Date ? suspendedAt : new Date(suspendedAt) : void 0,
-		completedAt: completedAt ? completedAt instanceof Date ? completedAt : new Date(completedAt) : void 0
+		completedAt: completedAt ? completedAt instanceof Date ? completedAt : new Date(completedAt) : void 0,
+		ownerId: row.ownerId ?? void 0,
+		leaseExpiresAt: leaseExpiresAt ? leaseExpiresAt instanceof Date ? leaseExpiresAt : new Date(leaseExpiresAt) : void 0
 	};
 }
 var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
@@ -5083,7 +5074,12 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 		await this.#db.alterTable({
 			tableName: TABLE_BACKGROUND_TASKS,
 			schema: TABLE_SCHEMAS[TABLE_BACKGROUND_TASKS],
-			ifNotExists: ["suspend_payload", "suspendedAt"]
+			ifNotExists: [
+				"suspend_payload",
+				"suspendedAt",
+				"ownerId",
+				"leaseExpiresAt"
+			]
 		});
 		await this.createDefaultIndexes();
 		await this.createCustomIndexes();
@@ -5213,7 +5209,10 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 				suspendedAt: task.suspendedAt?.toISOString() ?? null,
 				suspendedAtZ: task.suspendedAt?.toISOString() ?? null,
 				completedAt: task.completedAt?.toISOString() ?? null,
-				completedAtZ: task.completedAt?.toISOString() ?? null
+				completedAtZ: task.completedAt?.toISOString() ?? null,
+				ownerId: task.ownerId ?? null,
+				leaseExpiresAt: task.leaseExpiresAt?.toISOString() ?? null,
+				leaseExpiresAtZ: task.leaseExpiresAt?.toISOString() ?? null
 			}
 		});
 	}
@@ -5259,14 +5258,34 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 			const val = update.completedAt?.toISOString() ?? null;
 			params.push(val, val);
 		}
+		if ("ownerId" in update) {
+			setClauses.push(`"ownerId" = $${paramIdx++}`);
+			params.push(update.ownerId ?? null);
+		}
+		if ("leaseExpiresAt" in update) {
+			setClauses.push(`"leaseExpiresAt" = $${paramIdx++}`);
+			setClauses.push(`"leaseExpiresAtZ" = $${paramIdx++}`);
+			const val = update.leaseExpiresAt?.toISOString() ?? null;
+			params.push(val, val);
+		}
 		if (setClauses.length === 0) return false;
 		const table = getTableName$4(getSchemaName$4(this.#schema));
 		params.push(taskId);
 		let where = `"id" = $${paramIdx++}`;
 		if (options?.expectedStatus) {
-			where += ` AND "status" = $${paramIdx}`;
+			where += ` AND "status" = $${paramIdx++}`;
 			params.push(options.expectedStatus);
 		}
+		if (options?.expectedOwnerId !== void 0) if (options.expectedOwnerId === null) where += ` AND "ownerId" IS NULL`;
+		else {
+			where += ` AND "ownerId" = $${paramIdx++}`;
+			params.push(options.expectedOwnerId);
+		}
+		if (options?.expectedLeaseExpiresAt !== void 0) if (options.expectedLeaseExpiresAt === null) where += ` AND "leaseExpiresAtZ" IS NULL`;
+		else {
+			where += ` AND "leaseExpiresAtZ" = $${paramIdx++}`;
+			params.push(options.expectedLeaseExpiresAt.toISOString());
+		}
 		return ((await this.#db.client.query(`UPDATE ${table} SET ${setClauses.join(", ")} WHERE ${where}`, params)).rowCount ?? 0) > 0;
 	}
 	async getTask(taskId) {