@mastra/duckdb 1.15.0-alpha.3 → 1.15.0-alpha.4

package/dist/{observability-D70dyGYt.cjs → observability-TeHp5JpN.cjs}

@@ -1,4 +1,4 @@
-const require_features = require("./features-DxaUwIC2.cjs");
+const require_features = require("./features-D7U4aB_V.cjs");
 let _mastra_core_error = require("@mastra/core/error");
 let _mastra_core_storage = require("@mastra/core/storage");
 _mastra_core_storage = require_features.__toESM(_mastra_core_storage, 1);
@@ -3617,15 +3617,15 @@ ORDER BY delta_rows.deltaWatermark ASC NULLS LAST, delta_rows.traceId ASC`,
 		};
 	}
 	const orderField = plan.orderBy.field;
-	const direction = plan.orderBy.direction === "asc" ? "ASC" : "DESC";
+	const order = `${orderField} ${plan.orderBy.direction === "asc" ? "ASC" : "DESC"} NULLS LAST, traceId ASC`;
 	if (plan.paginationMode === "page") {
 		values.push(plan.perPage, plan.page * plan.perPage);
 		return {
 			sql: `${candidates},
   page_rows AS (
-    SELECT *, row_number() OVER (ORDER BY ${orderField} ${direction}, traceId ASC) AS __row_position
+    SELECT *, row_number() OVER (ORDER BY ${order}) AS __row_position
     FROM candidates
-    ORDER BY ${orderField} ${direction}, traceId ASC
+    ORDER BY ${order}
     LIMIT ? OFFSET ?
   ),
   page_total AS (
@@ -3640,8 +3640,13 @@ ORDER BY page_rows.__row_position ASC NULLS LAST`,
 		};
 	}
 	let pageCondition = "";
-	if (plan.cursor) {
-		pageCondition = `WHERE (${orderField} ${plan.orderBy.direction === "asc" ? ">" : "<"} CAST(? AS TIMESTAMP) OR (${orderField} = CAST(? AS TIMESTAMP) AND traceId > ?))`;
+	if (plan.cursor?.sortValue === null) {
+		pageCondition = `WHERE ${orderField} IS NULL AND traceId > ?`;
+		values.push(plan.cursor.traceId);
+	} else if (plan.cursor) {
+		const comparison = plan.orderBy.direction === "asc" ? ">" : "<";
+		const value = `CAST(? AS ${typeof plan.cursor.sortValue === "number" ? "DOUBLE" : "TIMESTAMP"})`;
+		pageCondition = `WHERE (${orderField} ${comparison} ${value} OR ${orderField} IS NULL OR (${orderField} = ${value} AND traceId > ?))`;
 		values.push(plan.cursor.sortValue, plan.cursor.sortValue, plan.cursor.traceId);
 	}
 	values.push(plan.limit + 1);
@@ -3650,7 +3655,7 @@ ORDER BY page_rows.__row_position ASC NULLS LAST`,
 SELECT *
 FROM candidates
 ${pageCondition}
-ORDER BY ${orderField} ${direction}, traceId ASC
+ORDER BY ${order}
 LIMIT ?`,
 		values
 	};
@@ -3910,7 +3915,7 @@ async function queryTraces(db, plan) {
 		traces,
 		page: { next: rows.length > plan.limit && last ? _mastra_core_storage.encodeTraceQueryCursor(plan, {
 			result: "traces",
-			sortValue: last[plan.orderBy.field],
+			sortValue: last[plan.orderBy.field] ?? null,
 			traceId: last.traceId
 		}) : null }
 	});
@@ -3996,13 +4001,16 @@ function afterCursor(plan) {
 		values: []
 	};
 	const cursor = plan.cursor;
-	const comparisons = [`s.${plan.orderBy.field} ${plan.orderBy.direction === "asc" ? ">" : "<"} CAST(? AS TIMESTAMP)`];
-	const values = [cursor.sortValue];
+	const sort = `s.${plan.orderBy.field}`;
+	const empty = cursor.sortValue === null;
+	const value = `CAST(? AS ${typeof cursor.sortValue === "number" ? "DOUBLE" : "TIMESTAMP"})`;
+	const comparisons = empty ? [] : [`${sort} ${plan.orderBy.direction === "asc" ? ">" : "<"} ${value}`, `${sort} IS NULL`];
+	const values = empty ? [] : [cursor.sortValue];
 	for (let i = 0; i < identityFields.length; i++) {
 		const field = identityFields[i];
 		if (cursor[field] === null) continue;
-		const equal = [`s.${plan.orderBy.field} = CAST(? AS TIMESTAMP)`];
-		values.push(cursor.sortValue);
+		const equal = [empty ? `${sort} IS NULL` : `${sort} = ${value}`];
+		if (!empty) values.push(cursor.sortValue);
 		for (const prior of identityFields.slice(0, i)) {
 			equal.push(`s.${prior} IS NOT DISTINCT FROM ?`);
 			values.push(cursor[prior]);
@@ -4061,7 +4069,7 @@ function compileDuckDBSpanQuery(plan) {
 			"cursorId"
 		].map((field) => `s.${field}`).join(", ")}
   FROM ranked s WHERE rank = 1 AND endedAt IS NOT NULL AND startedAt >= CAST(? AS TIMESTAMP) AND startedAt < CAST(? AS TIMESTAMP) AND (${predicate.sql}) AND ${after.sql}
-  ORDER BY s.${plan.orderBy.field} ${plan.orderBy.direction === "asc" ? "ASC" : "DESC"}, ${identityFields.map((field) => `s.${field} ASC NULLS LAST`).join(", ")}
+  ORDER BY s.${plan.orderBy.field} ${plan.orderBy.direction === "asc" ? "ASC" : "DESC"} NULLS LAST, ${identityFields.map((field) => `s.${field} ASC NULLS LAST`).join(", ")}
   LIMIT ?`,
 		values
 	};
@@ -6360,4 +6368,4 @@ var ObservabilityStorageDuckDB = class ObservabilityStorageDuckDB extends _mastr
 //#endregion
 exports.ObservabilityStorageDuckDB = ObservabilityStorageDuckDB;
 
-//# sourceMappingURL=observability-D70dyGYt.cjs.map
+//# sourceMappingURL=observability-TeHp5JpN.cjs.map