@mastra/pg 1.36.0-alpha.5 → 1.36.0-alpha.6

package/dist/index.js

@@ -19399,13 +19399,13 @@ const timingFeatures = [
 * condition for rows level with it. Empty values sort last in both directions, so they are past
 * every value and level only with each other.
 */
-function keysetSortBounds(field, direction, sortValue, values) {
+function keysetSortBounds(field, direction, sortValue, values, stringSort = false) {
 	if (sortValue === null) return {
 		past: [],
 		level: `${field} IS NULL`
 	};
 	values.push(sortValue);
-	const parameter = `$${values.length}::${typeof sortValue === "number" ? "float8" : "timestamptz"}`;
+	const parameter = `$${values.length}::${stringSort ? "text COLLATE \"C\"" : typeof sortValue === "number" ? "float8" : "timestamptz"}`;
 	return {
 		past: [`${field} ${direction === "asc" ? ">" : "<"} ${parameter}`, `${field} IS NULL`],
 		level: `${field} = ${parameter}`
@@ -20453,10 +20453,14 @@ function selectedKeys(rows, values) {
 		return `"${field}" ${field === "traceId" || field === "spanId" ? "=" : "IS NOT DISTINCT FROM"} $${values.length}::text`;
 	}).join(" AND ")})`).join(" OR ");
 }
+function sortColumn(plan) {
+	const column = `s."${plan.orderBy.field}"`;
+	return plan.orderBy.field === "model" || plan.orderBy.field === "provider" ? `${column} COLLATE "C"` : column;
+}
 function afterCursor(plan, values) {
 	if (!plan.cursor) return "TRUE";
 	const cursor = plan.cursor;
-	const { past: terms, level } = keysetSortBounds(`s."${plan.orderBy.field}"`, plan.orderBy.direction, cursor.sortValue, values);
+	const { past: terms, level } = keysetSortBounds(sortColumn(plan), plan.orderBy.direction, cursor.sortValue, values, plan.orderBy.field === "model" || plan.orderBy.field === "provider");
 	const equal = [level];
 	for (const key of identityFields) {
 		const ref = `s."${key}" COLLATE "C"`;
@@ -20537,10 +20541,12 @@ function compilePostgresSpanQuery(schema, plan) {
 			"endedAt",
 			"durationMs",
 			"status",
-			"version"
+			"version",
+			"model",
+			"provider"
 		].map((field) => `s."${field}"`).join(", ")}
   FROM selected s WHERE ${after}
-  ORDER BY s."${plan.orderBy.field}" ${plan.orderBy.direction === "asc" ? "ASC" : "DESC"} NULLS LAST, ${identityOrder}
+  ORDER BY ${sortColumn(plan)} ${plan.orderBy.direction === "asc" ? "ASC" : "DESC"} NULLS LAST, ${identityOrder}
   LIMIT $${values.length}`,
 		values
 	};
@@ -20575,6 +20581,7 @@ async function querySpans(client, schema, plan, timeoutMs) {
 		const rows = await tx.any(query.text, query.values);
 		const selected = rows.map(({ version: _version, startedAt, endedAt, timeToFirstChunkMs, timeToFirstTokenMs, outcome, stopReason, ...row }) => ({
 			...row,
+			...(plan.orderBy.field === "model" || plan.orderBy.field === "provider") && { cursorSortValue: row[plan.orderBy.field] },
 			...timeToFirstChunkSupported && { timeToFirstChunkMs },
 			...timeToFirstTokenSupported && { timeToFirstTokenMs },
 			...spanQueryOutcomeFieldsSupported && {
@@ -21970,6 +21977,7 @@ const spanQueryFeatures = typeof coreStorage.planSpanQuery === "function" ? [
 	"span-query",
 	"span-query-context-fields",
 	...coreStorage.SPAN_QUERY_ORDER_FIELDS?.includes("durationMs") ? ["span-query-duration-sort"] : [],
+	...coreStorage.SPAN_QUERY_ORDER_FIELDS?.includes("model") && coreStorage.SPAN_QUERY_ORDER_FIELDS?.includes("provider") ? ["span-query-model-provider-sort"] : [],
 	..."model" in (coreStorage.SPAN_QUERY_FIELD_REGISTRY ?? {}) ? ["span-query-model-fields"] : []
 ] : [];
 const spanAggregateFeatures = typeof coreStorage.planSpanAggregate === "function" ? ["span-aggregate", ..."model" in (coreStorage.SPAN_AGGREGATE_DIMENSION_REGISTRY ?? {}) ? ["span-aggregate-model-dimensions"] : []] : [];