@mastra/libsql 1.24.0-alpha.1 → 1.24.0-alpha.3

package/dist/index.js

@@ -423,9 +423,14 @@ function handleLogicalOperator(key, value, parentPath) {
 	}
 	const values = [];
 	const joinOperator = key === "$or" || key === "$nor" ? "OR" : "AND";
-	const joined = (Array.isArray(value) ? value.map((f) => {
-		return (!!f ? Object.entries(f) : []).map(([k, v]) => buildCondition$1(k, v, key));
-	}) : [buildCondition$1(key, value, parentPath)]).flat().map((c) => {
+	const joined = (Array.isArray(value) ? value.flatMap((f) => {
+		const branch = (!!f ? Object.entries(f) : []).map(([k, v]) => buildCondition$1(k, v, key));
+		if (branch.length <= 1) return branch;
+		return [{
+			sql: `(${branch.map((c) => c.sql).join(" AND ")})`,
+			values: branch.flatMap((c) => c.values)
+		}];
+	}) : [buildCondition$1(key, value, parentPath)]).map((c) => {
 		values.push(...c.values);
 		return c.sql;
 	}).join(` ${joinOperator} `);
@@ -11226,6 +11231,7 @@ var SchedulesLibSQL = class SchedulesLibSQL extends SchedulesStorage {
 		});
 	}
 	async init() {
+		await this.#migrateLegacyTriggersTable();
 		await this.#db.createTable({
 			tableName: TABLE_SCHEDULES,
 			schema: TABLE_SCHEMAS[TABLE_SCHEDULES]
@@ -11234,6 +11240,15 @@ var SchedulesLibSQL = class SchedulesLibSQL extends SchedulesStorage {
 			tableName: TABLE_SCHEDULE_TRIGGERS,
 			schema: TABLE_SCHEMAS[TABLE_SCHEDULE_TRIGGERS]
 		});
+		try {
+			await this.#db.alterTable({
+				tableName: TABLE_SCHEDULES,
+				schema: TABLE_SCHEMAS[TABLE_SCHEDULES],
+				ifNotExists: ["owner_type", "owner_id"]
+			});
+		} catch (error) {
+			if (!(await this.#db.hasColumn(TABLE_SCHEDULES, "owner_type") && await this.#db.hasColumn(TABLE_SCHEDULES, "owner_id"))) throw error;
+		}
 		await this.#client.batch([{
 			sql: `CREATE INDEX IF NOT EXISTS idx_schedules_status_next_fire ON "${TABLE_SCHEDULES}" ("status", "next_fire_at")`,
 			args: []
@@ -11242,6 +11257,42 @@ var SchedulesLibSQL = class SchedulesLibSQL extends SchedulesStorage {
 			args: []
 		}], "write");
 	}
+	/**
+	* Trigger tables created before the ownership/audit schema change are keyed
+	* by `run_id` (NOT NULL) and store `status` instead of `outcome`. SQLite
+	* cannot change a primary key or rename-and-retype in place, so the table is
+	* rebuilt in the current shape inside one write transaction. Legacy run ids
+	* are unique, so they become the new row ids.
+	*/
+	async #migrateLegacyTriggersTable() {
+		const isLegacy = async () => await this.#db.hasColumn(TABLE_SCHEDULE_TRIGGERS, "status") && !await this.#db.hasColumn(TABLE_SCHEDULE_TRIGGERS, "outcome");
+		if (!await isLegacy()) return;
+		const shadow = `${TABLE_SCHEDULE_TRIGGERS}__legacy_rebuild`;
+		try {
+			await this.#client.batch([
+				`DROP TABLE IF EXISTS "${shadow}"`,
+				`CREATE TABLE "${shadow}" (
+            "id" TEXT NOT NULL PRIMARY KEY,
+            "schedule_id" TEXT NOT NULL,
+            "run_id" TEXT,
+            "scheduled_fire_at" INTEGER NOT NULL,
+            "actual_fire_at" INTEGER NOT NULL,
+            "outcome" TEXT NOT NULL,
+            "error" TEXT,
+            "trigger_kind" TEXT NOT NULL,
+            "parent_trigger_id" TEXT,
+            "metadata" TEXT
+          )`,
+				`INSERT INTO "${shadow}" ("id", "schedule_id", "run_id", "scheduled_fire_at", "actual_fire_at", "outcome", "error", "trigger_kind")
+           SELECT "run_id", "schedule_id", "run_id", "scheduled_fire_at", "actual_fire_at", "status", "error", 'schedule-fire'
+           FROM "${TABLE_SCHEDULE_TRIGGERS}"`,
+				`DROP TABLE "${TABLE_SCHEDULE_TRIGGERS}"`,
+				`ALTER TABLE "${shadow}" RENAME TO "${TABLE_SCHEDULE_TRIGGERS}"`
+			], "write");
+		} catch (error) {
+			if (await isLegacy()) throw error;
+		}
+	}
 	async dangerouslyClearAll() {
 		await this.#db.deleteData({ tableName: TABLE_SCHEDULE_TRIGGERS });
 		await this.#db.deleteData({ tableName: TABLE_SCHEDULES });