@mastra/clickhouse 1.22.1-alpha.0 → 1.22.1

package/dist/index.js

@@ -4703,6 +4703,7 @@ function getAggregationSql$2(aggregation, measure = "valueNumber") {
 		case "max": return `max(${measure})`;
 		case "count": return `toFloat64(count(${measure}))`;
 		case "last": return `argMax(${measure}, timestamp)`;
+		case "count_distinct": return `toFloat64(uniq(${measure}))`;
 		default: return `sum(${measure})`;
 	}
 }
@@ -6156,6 +6157,7 @@ function getAggregationSql(aggregation, measure = "score") {
 		case "max": return `max(${measure})`;
 		case "count": return `toFloat64(count(${measure}))`;
 		case "last": return `argMax(${measure}, timestamp)`;
+		case "count_distinct": return `toFloat64(uniq(${measure}))`;
 		default: return `sum(${measure})`;
 	}
 }
@@ -6413,7 +6415,7 @@ async function getScoreById(client, scoreId) {
 	return rows[0] ? rowToScoreRecord(rows[0]) : null;
 }
 async function getScoreAggregate(client, args) {
-	const aggSql = getAggregationSql(args.aggregation);
+	const aggSql = `if(count() = 0, NULL, ${getAggregationSql(args.aggregation)})`;
 	const identity = buildScoreIdentityFilter(args);
 	const combined = mergeFilters(identity, buildScoresFilterConditions(args.filters));
 	const whereClause = toWhereClause(combined);
@@ -8466,11 +8468,11 @@ async function detectDeltaCursorStrategy(client, override, existingStrategy) {
 	if (override) return override;
 	if (existingStrategy && existingStrategy !== "mixed") return existingStrategy;
 	try {
-		await client.query({
+		await (await client.query({
 			query: `SELECT generateSerialID({counterName:String}) AS cursorId`,
 			query_params: { counterName: "mastra_observability_delta_cursor_probe" },
 			format: "JSONEachRow"
-		});
+		})).json();
 		return "serial";
 	} catch {
 		return "fallback";
@@ -8574,11 +8576,11 @@ var ObservabilityStorageClickhouseVNext = class extends ObservabilityStorage {
 			if (this.#deltaCursorStrategy !== null) await reconcileScoreDeltaMv(this.#client, this.#replication, this.#deltaCursorStrategy, this.logger);
 			await backfillCurrentScores(this.#client);
 			if (this.#retention) await this.applyRetention();
-			if (this.#deltaCursorStrategy === "serial") for (const counterName of DELTA_CURSOR_COUNTER_NAMES) await this.#client.query({
+			if (this.#deltaCursorStrategy === "serial") for (const counterName of DELTA_CURSOR_COUNTER_NAMES) await (await this.#client.query({
 				query: `SELECT generateSerialID({counterName:String}) AS cursorId`,
 				query_params: { counterName },
 				format: "JSONEachRow"
-			});
+			})).json();
 		} catch (error) {
 			if (error instanceof MastraError) throw error;
 			const causeMessage = error instanceof Error ? error.message : String(error);