drizzle-cube 0.8.2 → 0.9.0

package/dist/adapters/{compiler-BFLAXV7W.js → compiler-SBDjxyQ3.js}

@@ -1,35 +1,35 @@
-import { $ as e, A as t, B as n, C as r, D as i, E as a, F as o, G as s, H as c, I as l, J as u, K as d, L as f, M as p, N as m, O as h, P as g, Q as _, R as v, S as y, T as b, U as ee, V as te, W as x, X as ne, Y as re, Z as S, at as ie, et as C, it as ae, j as oe, nt as se, q as w, rt as T, tt as ce, w as le, z as ue } from "./utils-BhlkVCzZ.js";
+import { $ as e, A as t, B as n, C as r, D as i, E as a, F as o, G as s, H as c, I as l, J as u, K as d, L as f, M as p, N as m, P as h, Q as g, R as _, S as v, T as y, U as b, V as ee, W as te, X as x, Y as ne, Z as re, et as ie, it as ae, j as oe, k as S, nt as C, q as se, rt as ce, tt as le, w as ue, x as de, z as w } from "./utils-C_RKaP0n.js";
 //#region node_modules/drizzle-orm/sql/expressions/select.js
-function de(e) {
-	return T`${e} asc`;
-}
 function fe(e) {
-	return T`${e} desc`;
+	return C`${e} asc`;
+}
+function pe(e) {
+	return C`${e} desc`;
 }
 //#endregion
 //#region node_modules/drizzle-orm/sql/functions/aggregate.js
-function pe(e) {
-	return T`count(${e || T.raw("*")})`.mapWith(Number);
+function T(e) {
+	return C`count(${e || C.raw("*")})`.mapWith(Number);
 }
 function me(e) {
-	return T`count(distinct ${e})`.mapWith(Number);
+	return C`count(distinct ${e})`.mapWith(Number);
 }
 function E(e) {
-	return T`sum(${e})`.mapWith(String);
+	return C`sum(${e})`.mapWith(String);
 }
 function D(e) {
-	return T`max(${e})`.mapWith(ie(e, ae) ? e : String);
+	return C`max(${e})`.mapWith(ae(e, ce) ? e : String);
 }
 function he(e) {
-	return T`min(${e})`.mapWith(ie(e, ae) ? e : String);
+	return C`min(${e})`.mapWith(ae(e, ce) ? e : String);
 }
 //#endregion
 //#region src/server/adapters/window-function-builder.ts
 function ge(e) {
-	return e && e.length > 0 ? T`PARTITION BY ${T.join(e, T`, `)}` : T``;
+	return e && e.length > 0 ? C`PARTITION BY ${C.join(e, C`, `)}` : C``;
 }
 function _e(e) {
-	return e && e.length > 0 ? T`ORDER BY ${T.join(e.map((e) => e.direction === "desc" ? T`${e.field} DESC` : T`${e.field} ASC`), T`, `)}` : T``;
+	return e && e.length > 0 ? C`ORDER BY ${C.join(e.map((e) => e.direction === "desc" ? C`${e.field} DESC` : C`${e.field} ASC`), C`, `)}` : C``;
 }
 function ve(e) {
 	return e === "unbounded" ? "UNBOUNDED PRECEDING" : typeof e == "number" ? `${e} PRECEDING` : "CURRENT ROW";
@@ -38,19 +38,19 @@ function ye(e) {
 	return e === "unbounded" ? "UNBOUNDED FOLLOWING" : e === "current" ? "CURRENT ROW" : typeof e == "number" ? `${e} FOLLOWING` : "CURRENT ROW";
 }
 function be(e) {
-	if (!e) return T``;
+	if (!e) return C``;
 	let t = e.type.toUpperCase(), n = ve(e.start), r = ye(e.end);
-	return T`${T.raw(t)} BETWEEN ${T.raw(n)} AND ${T.raw(r)}`;
+	return C`${C.raw(t)} BETWEEN ${C.raw(n)} AND ${C.raw(r)}`;
 }
 function xe(e, t, n) {
 	let r = [];
 	e && e.length > 0 && r.push(ge(e)), t && t.length > 0 && r.push(_e(t)), n?.frame && r.push(be(n.frame));
-	let i = r.length > 0 ? T.join(r, T` `) : T``;
-	return T`OVER (${i})`;
+	let i = r.length > 0 ? C.join(r, C` `) : C``;
+	return C`OVER (${i})`;
 }
 function Se(e, t, n, r) {
-	let i = r?.defaultValue === void 0 ? T`` : T`, ${r.defaultValue}`;
-	return T`${T.raw(e)}(${t}, ${r?.offset ?? 1}${i}) ${n}`;
+	let i = r?.defaultValue === void 0 ? C`` : C`, ${r.defaultValue}`;
+	return C`${C.raw(e)}(${t}, ${r?.offset ?? 1}${i}) ${n}`;
 }
 var Ce = {
 	rank: "RANK",
@@ -64,11 +64,11 @@ var Ce = {
 };
 function Te(e, t, n, r) {
 	if (e === "lag" || e === "lead") return Se(e === "lag" ? "LAG" : "LEAD", t, n, r);
-	if (e === "ntile") return T`NTILE(${r?.nTile ?? 4}) ${n}`;
+	if (e === "ntile") return C`NTILE(${r?.nTile ?? 4}) ${n}`;
 	let i = Ce[e];
-	if (i) return T`${T.raw(i)}() ${n}`;
+	if (i) return C`${C.raw(i)}() ${n}`;
 	let a = we[e];
-	if (a) return T`${T.raw(a)}(${t}) ${n}`;
+	if (a) return C`${C.raw(a)}(${t}) ${n}`;
 	throw Error(`Unsupported window function: ${e}`);
 }
 //#endregion
@@ -78,13 +78,13 @@ var O = class {
 		return e;
 	}
 	nullToZero(e) {
-		return T`COALESCE(${e}, 0)`;
+		return C`COALESCE(${e}, 0)`;
 	}
 	caseInsensitiveLike(e, t, n) {
-		return n ? T`${e} NOT ILIKE ${t}` : T`${e} ILIKE ${t}`;
+		return n ? C`${e} NOT ILIKE ${t}` : C`${e} ILIKE ${t}`;
 	}
 	regexCondition(e, t, n) {
-		return n ? T`${e} !~* ${t}` : T`${e} ~* ${t}`;
+		return n ? C`${e} !~* ${t}` : C`${e} ~* ${t}`;
 	}
 	buildStringCondition(e, t, n) {
 		switch (t) {
@@ -92,8 +92,8 @@ var O = class {
 			case "notContains": return this.caseInsensitiveLike(e, `%${n}%`, !0);
 			case "startsWith": return this.caseInsensitiveLike(e, `${n}%`, !1);
 			case "endsWith": return this.caseInsensitiveLike(e, `%${n}`, !1);
-			case "like": return T`${e} LIKE ${n}`;
-			case "notLike": return T`${e} NOT LIKE ${n}`;
+			case "like": return C`${e} LIKE ${n}`;
+			case "notLike": return C`${e} NOT LIKE ${n}`;
 			case "ilike": return this.caseInsensitiveLike(e, n, !1);
 			case "regex": return this.regexCondition(e, n, !1);
 			case "notRegex": return this.regexCondition(e, n, !0);
@@ -102,17 +102,17 @@ var O = class {
 	}
 	buildConditionalAggregation(e, t, n) {
 		let r = e.toUpperCase();
-		return e === "count" && !t ? T`${T.raw(r)}(CASE WHEN ${n} THEN 1 END)` : T`${T.raw(r)}(CASE WHEN ${n} THEN ${t} END)`;
+		return e === "count" && !t ? C`${C.raw(r)}(CASE WHEN ${n} THEN 1 END)` : C`${C.raw(r)}(CASE WHEN ${n} THEN ${t} END)`;
 	}
 	buildAvg(e) {
-		return this.nullToZero(T`AVG(${e})`);
+		return this.nullToZero(C`AVG(${e})`);
 	}
 	buildCaseWhen(e, t) {
-		let n = e.map((e) => T`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => T`${e} ${t}`);
-		return t === void 0 ? T`CASE ${n} END` : T`CASE ${n} ELSE ${t} END`;
+		let n = e.map((e) => C`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => C`${e} ${t}`);
+		return t === void 0 ? C`CASE ${n} END` : C`CASE ${n} ELSE ${t} END`;
 	}
 	buildBooleanLiteral(e) {
-		return e ? T`TRUE` : T`FALSE`;
+		return e ? C`TRUE` : C`FALSE`;
 	}
 	convertFilterValue(e) {
 		return e;
@@ -128,11 +128,11 @@ var O = class {
 	}
 	buildStddev(e, t = !1) {
 		let n = t ? "STDDEV_SAMP" : "STDDEV_POP";
-		return this.nullToZero(T`${T.raw(n)}(${e})`);
+		return this.nullToZero(C`${C.raw(n)}(${e})`);
 	}
 	buildVariance(e, t = !1) {
 		let n = t ? "VAR_SAMP" : "VAR_POP";
-		return this.nullToZero(T`${T.raw(n)}(${e})`);
+		return this.nullToZero(C`${C.raw(n)}(${e})`);
 	}
 	buildWindowFunction(e, t, n, r, i) {
 		return Te(e, t, xe(n, r, i), i);
@@ -179,56 +179,56 @@ var O = class {
 		let t = this.parseISODuration(e), n = [];
 		t.years && n.push(`${t.years} years`), t.months && n.push(`${t.months} months`), t.days && n.push(`${t.days} days`), t.hours && n.push(`${t.hours} hours`), t.minutes && n.push(`${t.minutes} minutes`), t.seconds && n.push(`${t.seconds} seconds`);
 		let r = n.join(" ") || "0 seconds";
-		return T`INTERVAL '${T.raw(r)}'`;
+		return C`INTERVAL '${C.raw(r)}'`;
 	}
 	buildTimeDifferenceSeconds(e, t) {
-		return T`EXTRACT(EPOCH FROM (${e} - ${t}))`;
+		return C`EXTRACT(EPOCH FROM (${e} - ${t}))`;
 	}
 	buildDateAddInterval(e, t) {
 		let n = this.buildIntervalFromISO(t);
-		return T`(${e} + ${n})`;
+		return C`(${e} + ${n})`;
 	}
 	buildConditionalAggregation(e, t, n) {
 		let r = e.toUpperCase();
-		return e === "count" && !t ? T`COUNT(*) FILTER (WHERE ${n})` : T`${T.raw(r)}(${t}) FILTER (WHERE ${n})`;
+		return e === "count" && !t ? C`COUNT(*) FILTER (WHERE ${n})` : C`${C.raw(r)}(${t}) FILTER (WHERE ${n})`;
 	}
 	buildDateDiffPeriods(e, t, n) {
 		switch (n) {
-			case "day": return T`(${t}::date - ${e}::date)`;
-			case "week": return T`FLOOR((${t}::date - ${e}::date) / 7)`;
-			case "month": return T`(EXTRACT(YEAR FROM AGE(${t}::timestamp, ${e}::timestamp)) * 12 + EXTRACT(MONTH FROM AGE(${t}::timestamp, ${e}::timestamp)))::integer`;
+			case "day": return C`(${t}::date - ${e}::date)`;
+			case "week": return C`FLOOR((${t}::date - ${e}::date) / 7)`;
+			case "month": return C`(EXTRACT(YEAR FROM AGE(${t}::timestamp, ${e}::timestamp)) * 12 + EXTRACT(MONTH FROM AGE(${t}::timestamp, ${e}::timestamp)))::integer`;
 			default: throw Error(`Unsupported date diff unit: ${n}`);
 		}
 	}
 	buildPeriodSeriesSubquery(e) {
-		return T`(SELECT generate_series(0, ${e}) as period_number) p`;
+		return C`(SELECT generate_series(0, ${e}) as period_number) p`;
 	}
 	buildTimeDimension(e, t) {
 		switch (e) {
-			case "year": return T`DATE_TRUNC('year', ${t}::timestamp)`;
-			case "quarter": return T`DATE_TRUNC('quarter', ${t}::timestamp)`;
-			case "month": return T`DATE_TRUNC('month', ${t}::timestamp)`;
-			case "week": return T`DATE_TRUNC('week', ${t}::timestamp)`;
-			case "day": return T`DATE_TRUNC('day', ${t}::timestamp)::timestamp`;
-			case "hour": return T`DATE_TRUNC('hour', ${t}::timestamp)`;
-			case "minute": return T`DATE_TRUNC('minute', ${t}::timestamp)`;
-			case "second": return T`DATE_TRUNC('second', ${t}::timestamp)`;
+			case "year": return C`DATE_TRUNC('year', ${t}::timestamp)`;
+			case "quarter": return C`DATE_TRUNC('quarter', ${t}::timestamp)`;
+			case "month": return C`DATE_TRUNC('month', ${t}::timestamp)`;
+			case "week": return C`DATE_TRUNC('week', ${t}::timestamp)`;
+			case "day": return C`DATE_TRUNC('day', ${t}::timestamp)::timestamp`;
+			case "hour": return C`DATE_TRUNC('hour', ${t}::timestamp)`;
+			case "minute": return C`DATE_TRUNC('minute', ${t}::timestamp)`;
+			case "second": return C`DATE_TRUNC('second', ${t}::timestamp)`;
 			default: return t;
 		}
 	}
 	castToType(e, t) {
 		switch (t) {
-			case "timestamp": return T`${e}::timestamp`;
-			case "decimal": return T`${e}::decimal`;
-			case "integer": return T`${e}::integer`;
+			case "timestamp": return C`${e}::timestamp`;
+			case "decimal": return C`${e}::decimal`;
+			case "integer": return C`${e}::integer`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	tryCastToType(e, t) {
 		switch (t) {
-			case "timestamp": return T`CASE WHEN ${e} ~ ${this.timestampTryCastPattern()} THEN ${e}::timestamp ELSE NULL END`;
-			case "decimal": return T`CASE WHEN ${e} ~ ${this.decimalTryCastPattern()} THEN ${e}::decimal ELSE NULL END`;
-			case "integer": return T`CASE WHEN ${e} ~ ${this.integerTryCastPattern()} THEN ${e}::integer ELSE NULL END`;
+			case "timestamp": return C`CASE WHEN ${e} ~ ${this.timestampTryCastPattern()} THEN ${e}::timestamp ELSE NULL END`;
+			case "decimal": return C`CASE WHEN ${e} ~ ${this.decimalTryCastPattern()} THEN ${e}::decimal ELSE NULL END`;
+			case "integer": return C`CASE WHEN ${e} ~ ${this.integerTryCastPattern()} THEN ${e}::integer ELSE NULL END`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
@@ -242,7 +242,7 @@ var O = class {
 	}
 	buildPercentile(e, t) {
 		let n = t / 100;
-		return T`PERCENTILE_CONT(${n}) WITHIN GROUP (ORDER BY ${e})`;
+		return C`PERCENTILE_CONT(${n}) WITHIN GROUP (ORDER BY ${e})`;
 	}
 }, De = class extends O {
 	getEngineType() {
@@ -250,21 +250,21 @@ var O = class {
 	}
 	buildIntervalFromISO(e) {
 		let t = this.durationToSeconds(e);
-		return T`${t}`;
+		return C`${t}`;
 	}
 	buildTimeDifferenceSeconds(e, t) {
-		return T`TIMESTAMPDIFF(SECOND, ${t}, ${e})`;
+		return C`TIMESTAMPDIFF(SECOND, ${t}, ${e})`;
 	}
 	buildDateAddInterval(e, t) {
 		let n = this.parseISODuration(t), r = e;
-		return n.years && (r = T`DATE_ADD(${r}, INTERVAL ${n.years} YEAR)`), n.months && (r = T`DATE_ADD(${r}, INTERVAL ${n.months} MONTH)`), n.days && (r = T`DATE_ADD(${r}, INTERVAL ${n.days} DAY)`), n.hours && (r = T`DATE_ADD(${r}, INTERVAL ${n.hours} HOUR)`), n.minutes && (r = T`DATE_ADD(${r}, INTERVAL ${n.minutes} MINUTE)`), n.seconds && (r = T`DATE_ADD(${r}, INTERVAL ${n.seconds} SECOND)`), r;
+		return n.years && (r = C`DATE_ADD(${r}, INTERVAL ${n.years} YEAR)`), n.months && (r = C`DATE_ADD(${r}, INTERVAL ${n.months} MONTH)`), n.days && (r = C`DATE_ADD(${r}, INTERVAL ${n.days} DAY)`), n.hours && (r = C`DATE_ADD(${r}, INTERVAL ${n.hours} HOUR)`), n.minutes && (r = C`DATE_ADD(${r}, INTERVAL ${n.minutes} MINUTE)`), n.seconds && (r = C`DATE_ADD(${r}, INTERVAL ${n.seconds} SECOND)`), r;
 	}
 	buildDateDiffPeriods(e, t, n) {
 		let r = n.toUpperCase();
-		return T`TIMESTAMPDIFF(${T.raw(r)}, ${e}, ${t})`;
+		return C`TIMESTAMPDIFF(${C.raw(r)}, ${e}, ${t})`;
 	}
 	buildPeriodSeriesSubquery(e) {
-		return T`(
+		return C`(
       WITH RECURSIVE periods(period_number) AS (
         SELECT 0
         UNION ALL
@@ -285,39 +285,39 @@ var O = class {
 			second: "%Y-%m-%d %H:%i:%s"
 		};
 		switch (e) {
-			case "quarter": return T`DATE_ADD(MAKEDATE(YEAR(${t}), 1), INTERVAL (QUARTER(${t}) - 1) * 3 MONTH)`;
-			case "week": return T`STR_TO_DATE(DATE_FORMAT(DATE_SUB(${t}, INTERVAL WEEKDAY(${t}) DAY), '%Y-%m-%d 00:00:00'), '%Y-%m-%d %H:%i:%s')`;
+			case "quarter": return C`DATE_ADD(MAKEDATE(YEAR(${t}), 1), INTERVAL (QUARTER(${t}) - 1) * 3 MONTH)`;
+			case "week": return C`STR_TO_DATE(DATE_FORMAT(DATE_SUB(${t}, INTERVAL WEEKDAY(${t}) DAY), '%Y-%m-%d 00:00:00'), '%Y-%m-%d %H:%i:%s')`;
 			default: {
 				let r = n[e];
-				return r ? T`STR_TO_DATE(DATE_FORMAT(${t}, ${r}), '%Y-%m-%d %H:%i:%s')` : t;
+				return r ? C`STR_TO_DATE(DATE_FORMAT(${t}, ${r}), '%Y-%m-%d %H:%i:%s')` : t;
 			}
 		}
 	}
 	caseInsensitiveLike(e, t, n) {
 		let r = t.toLowerCase();
-		return n ? T`LOWER(${e}) NOT LIKE ${r}` : T`LOWER(${e}) LIKE ${r}`;
+		return n ? C`LOWER(${e}) NOT LIKE ${r}` : C`LOWER(${e}) LIKE ${r}`;
 	}
 	regexCondition(e, t, n) {
-		return n ? T`${e} NOT REGEXP ${t}` : T`${e} REGEXP ${t}`;
+		return n ? C`${e} NOT REGEXP ${t}` : C`${e} REGEXP ${t}`;
 	}
 	castToType(e, t) {
 		switch (t) {
-			case "timestamp": return T`CAST(${e} AS DATETIME)`;
-			case "decimal": return T`CAST(${e} AS DECIMAL(10,2))`;
-			case "integer": return T`CAST(${e} AS SIGNED INTEGER)`;
+			case "timestamp": return C`CAST(${e} AS DATETIME)`;
+			case "decimal": return C`CAST(${e} AS DECIMAL(10,2))`;
+			case "integer": return C`CAST(${e} AS SIGNED INTEGER)`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	tryCastToType(e, t) {
 		switch (t) {
-			case "timestamp": return T`CASE WHEN ${e} REGEXP ${this.timestampTryCastPattern()} THEN CAST(${e} AS DATETIME) ELSE NULL END`;
-			case "decimal": return T`CASE WHEN ${e} REGEXP ${this.decimalTryCastPattern()} THEN CAST(${e} AS DECIMAL(10,2)) ELSE NULL END`;
-			case "integer": return T`CASE WHEN ${e} REGEXP ${this.integerTryCastPattern()} THEN CAST(${e} AS SIGNED INTEGER) ELSE NULL END`;
+			case "timestamp": return C`CASE WHEN ${e} REGEXP ${this.timestampTryCastPattern()} THEN CAST(${e} AS DATETIME) ELSE NULL END`;
+			case "decimal": return C`CASE WHEN ${e} REGEXP ${this.decimalTryCastPattern()} THEN CAST(${e} AS DECIMAL(10,2)) ELSE NULL END`;
+			case "integer": return C`CASE WHEN ${e} REGEXP ${this.integerTryCastPattern()} THEN CAST(${e} AS SIGNED INTEGER) ELSE NULL END`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	nullToZero(e) {
-		return T`IFNULL(${e}, 0)`;
+		return C`IFNULL(${e}, 0)`;
 	}
 	getCapabilities() {
 		return {
@@ -336,25 +336,25 @@ var O = class {
 	}
 	buildIntervalFromISO(e) {
 		let t = this.durationToSeconds(e);
-		return T`${t}`;
+		return C`${t}`;
 	}
 	buildTimeDifferenceSeconds(e, t) {
-		return T`(${e} - ${t})`;
+		return C`(${e} - ${t})`;
 	}
 	buildDateAddInterval(e, t) {
 		let n = this.durationToSeconds(t);
-		return T`(${e} + ${n})`;
+		return C`(${e} + ${n})`;
 	}
 	buildDateDiffPeriods(e, t, n) {
 		switch (n) {
-			case "day": return T`CAST((julianday(datetime(${t}, 'unixepoch')) - julianday(datetime(${e}, 'unixepoch'))) AS INTEGER)`;
-			case "week": return T`CAST((julianday(datetime(${t}, 'unixepoch')) - julianday(datetime(${e}, 'unixepoch'))) / 7 AS INTEGER)`;
-			case "month": return T`((CAST(strftime('%Y', datetime(${t}, 'unixepoch')) AS INTEGER) - CAST(strftime('%Y', datetime(${e}, 'unixepoch')) AS INTEGER)) * 12 + (CAST(strftime('%m', datetime(${t}, 'unixepoch')) AS INTEGER) - CAST(strftime('%m', datetime(${e}, 'unixepoch')) AS INTEGER)))`;
+			case "day": return C`CAST((julianday(datetime(${t}, 'unixepoch')) - julianday(datetime(${e}, 'unixepoch'))) AS INTEGER)`;
+			case "week": return C`CAST((julianday(datetime(${t}, 'unixepoch')) - julianday(datetime(${e}, 'unixepoch'))) / 7 AS INTEGER)`;
+			case "month": return C`((CAST(strftime('%Y', datetime(${t}, 'unixepoch')) AS INTEGER) - CAST(strftime('%Y', datetime(${e}, 'unixepoch')) AS INTEGER)) * 12 + (CAST(strftime('%m', datetime(${t}, 'unixepoch')) AS INTEGER) - CAST(strftime('%m', datetime(${e}, 'unixepoch')) AS INTEGER)))`;
 			default: throw Error(`Unsupported date diff unit for SQLite: ${n}`);
 		}
 	}
 	buildPeriodSeriesSubquery(e) {
-		return T`(
+		return C`(
       WITH RECURSIVE periods(period_number) AS (
         SELECT 0
         UNION ALL
@@ -365,62 +365,62 @@ var O = class {
 	}
 	buildTimeDimension(e, t) {
 		switch (e) {
-			case "year": return T`datetime(${t}, 'unixepoch', 'start of year')`;
+			case "year": return C`datetime(${t}, 'unixepoch', 'start of year')`;
 			case "quarter": {
-				let e = T`datetime(${t}, 'unixepoch')`;
-				return T`datetime(${e}, 'start of year',
+				let e = C`datetime(${t}, 'unixepoch')`;
+				return C`datetime(${e}, 'start of year',
           '+' || (((CAST(strftime('%m', ${e}) AS INTEGER) - 1) / 3) * 3) || ' months')`;
 			}
-			case "month": return T`datetime(${t}, 'unixepoch', 'start of month')`;
-			case "week": return T`date(datetime(${t}, 'unixepoch'), 'weekday 1', '-6 days')`;
-			case "day": return T`datetime(${t}, 'unixepoch', 'start of day')`;
+			case "month": return C`datetime(${t}, 'unixepoch', 'start of month')`;
+			case "week": return C`date(datetime(${t}, 'unixepoch'), 'weekday 1', '-6 days')`;
+			case "day": return C`datetime(${t}, 'unixepoch', 'start of day')`;
 			case "hour": {
-				let e = T`datetime(${t}, 'unixepoch')`;
-				return T`datetime(strftime('%Y-%m-%d %H:00:00', ${e}))`;
+				let e = C`datetime(${t}, 'unixepoch')`;
+				return C`datetime(strftime('%Y-%m-%d %H:00:00', ${e}))`;
 			}
 			case "minute": {
-				let e = T`datetime(${t}, 'unixepoch')`;
-				return T`datetime(strftime('%Y-%m-%d %H:%M:00', ${e}))`;
+				let e = C`datetime(${t}, 'unixepoch')`;
+				return C`datetime(strftime('%Y-%m-%d %H:%M:00', ${e}))`;
 			}
 			case "second": {
-				let e = T`datetime(${t}, 'unixepoch')`;
-				return T`datetime(strftime('%Y-%m-%d %H:%M:%S', ${e}))`;
+				let e = C`datetime(${t}, 'unixepoch')`;
+				return C`datetime(strftime('%Y-%m-%d %H:%M:%S', ${e}))`;
 			}
-			default: return T`datetime(${t}, 'unixepoch')`;
+			default: return C`datetime(${t}, 'unixepoch')`;
 		}
 	}
 	caseInsensitiveLike(e, t, n) {
 		let r = t.toLowerCase();
-		return n ? T`LOWER(${e}) NOT LIKE ${r}` : T`LOWER(${e}) LIKE ${r}`;
+		return n ? C`LOWER(${e}) NOT LIKE ${r}` : C`LOWER(${e}) LIKE ${r}`;
 	}
 	regexCondition(e, t, n) {
-		return n ? T`${e} NOT GLOB ${t}` : T`${e} GLOB ${t}`;
+		return n ? C`${e} NOT GLOB ${t}` : C`${e} GLOB ${t}`;
 	}
 	castToType(e, t) {
 		switch (t) {
-			case "timestamp": return T`datetime(${e} / 1000, 'unixepoch')`;
-			case "decimal": return T`CAST(${e} AS REAL)`;
-			case "integer": return T`CAST(${e} AS INTEGER)`;
+			case "timestamp": return C`datetime(${e} / 1000, 'unixepoch')`;
+			case "decimal": return C`CAST(${e} AS REAL)`;
+			case "integer": return C`CAST(${e} AS INTEGER)`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	tryCastToType(e, t) {
 		switch (t) {
-			case "timestamp": return T`CASE WHEN TRIM(${e}) = '' OR TRIM(${e}) GLOB '*[^0-9-]*' THEN NULL ELSE datetime(${e} / 1000, 'unixepoch') END`;
-			case "decimal": return T`CASE WHEN TRIM(${e}) = '' OR TRIM(${e}) GLOB '*[^0-9.+-]*' THEN NULL ELSE CAST(${e} AS REAL) END`;
-			case "integer": return T`CASE WHEN TRIM(${e}) = '' OR TRIM(${e}) GLOB '*[^0-9+-]*' THEN NULL ELSE CAST(${e} AS INTEGER) END`;
+			case "timestamp": return C`CASE WHEN TRIM(${e}) = '' OR TRIM(${e}) GLOB '*[^0-9-]*' THEN NULL ELSE datetime(${e} / 1000, 'unixepoch') END`;
+			case "decimal": return C`CASE WHEN TRIM(${e}) = '' OR TRIM(${e}) GLOB '*[^0-9.+-]*' THEN NULL ELSE CAST(${e} AS REAL) END`;
+			case "integer": return C`CASE WHEN TRIM(${e}) = '' OR TRIM(${e}) GLOB '*[^0-9+-]*' THEN NULL ELSE CAST(${e} AS INTEGER) END`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	nullToZero(e) {
-		return T`IFNULL(${e}, 0)`;
+		return C`IFNULL(${e}, 0)`;
 	}
 	buildCaseWhen(e, t) {
-		let n = e.map((e) => e.then && typeof e.then == "object" && (e.then.queryChunks || e.then._ || e.then.sql) ? T`WHEN ${e.when} THEN ${T.raw("(")}${e.then}${T.raw(")")}` : T`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => T`${e} ${t}`);
-		return t === void 0 ? T`CASE ${n} END` : t && typeof t == "object" && (t.queryChunks || t._ || t.sql) ? T`CASE ${n} ELSE ${T.raw("(")}${t}${T.raw(")")} END` : T`CASE ${n} ELSE ${t} END`;
+		let n = e.map((e) => e.then && typeof e.then == "object" && (e.then.queryChunks || e.then._ || e.then.sql) ? C`WHEN ${e.when} THEN ${C.raw("(")}${e.then}${C.raw(")")}` : C`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => C`${e} ${t}`);
+		return t === void 0 ? C`CASE ${n} END` : t && typeof t == "object" && (t.queryChunks || t._ || t.sql) ? C`CASE ${n} ELSE ${C.raw("(")}${t}${C.raw(")")} END` : C`CASE ${n} ELSE ${t} END`;
 	}
 	buildBooleanLiteral(e) {
-		return e ? T`1` : T`0`;
+		return e ? C`1` : C`0`;
 	}
 	preprocessCalculatedTemplate(e) {
 		return e.length > 1e3 ? e : e.replace(/(\{[^}]+\})\s*\/\s*/g, (e, t) => `${t.replace(/\{([^}]+)\}/, "CAST({$1} AS REAL)")} / `);
@@ -468,54 +468,54 @@ var O = class {
 		let t = this.parseISODuration(e), n = [];
 		t.years && n.push(`${t.years} years`), t.months && n.push(`${t.months} months`), t.days && n.push(`${t.days} days`), t.hours && n.push(`${t.hours} hours`), t.minutes && n.push(`${t.minutes} minutes`), t.seconds && n.push(`${t.seconds} seconds`);
 		let r = n.join(" ") || "0 seconds";
-		return T`INTERVAL '${T.raw(r)}'`;
+		return C`INTERVAL '${C.raw(r)}'`;
 	}
 	buildTimeDifferenceSeconds(e, t) {
-		return T`(EPOCH(${e}) - EPOCH(${t}))`;
+		return C`(EPOCH(${e}) - EPOCH(${t}))`;
 	}
 	buildDateAddInterval(e, t) {
 		let n = this.buildIntervalFromISO(t);
-		return T`(${e} + ${n})`;
+		return C`(${e} + ${n})`;
 	}
 	buildConditionalAggregation(e, t, n) {
 		let r = e.toUpperCase();
-		return e === "count" && !t ? T`COUNT(*) FILTER (WHERE ${n})` : T`${T.raw(r)}(${t}) FILTER (WHERE ${n})`;
+		return e === "count" && !t ? C`COUNT(*) FILTER (WHERE ${n})` : C`${C.raw(r)}(${t}) FILTER (WHERE ${n})`;
 	}
 	buildDateDiffPeriods(e, t, n) {
-		return T`DATE_DIFF('${T.raw(n)}', ${e}::timestamp, ${t}::timestamp)`;
+		return C`DATE_DIFF('${C.raw(n)}', ${e}::timestamp, ${t}::timestamp)`;
 	}
 	buildPeriodSeriesSubquery(e) {
-		return T`(SELECT UNNEST(generate_series(0, ${e})) as period_number) p`;
+		return C`(SELECT UNNEST(generate_series(0, ${e})) as period_number) p`;
 	}
 	buildTimeDimension(e, t) {
 		switch (e) {
-			case "year": return T`DATE_TRUNC('year', ${t}::timestamp)`;
-			case "quarter": return T`DATE_TRUNC('quarter', ${t}::timestamp)`;
-			case "month": return T`DATE_TRUNC('month', ${t}::timestamp)`;
-			case "week": return T`DATE_TRUNC('week', ${t}::timestamp)`;
-			case "day": return T`DATE_TRUNC('day', ${t}::timestamp)::timestamp`;
-			case "hour": return T`DATE_TRUNC('hour', ${t}::timestamp)`;
-			case "minute": return T`DATE_TRUNC('minute', ${t}::timestamp)`;
-			case "second": return T`DATE_TRUNC('second', ${t}::timestamp)`;
+			case "year": return C`DATE_TRUNC('year', ${t}::timestamp)`;
+			case "quarter": return C`DATE_TRUNC('quarter', ${t}::timestamp)`;
+			case "month": return C`DATE_TRUNC('month', ${t}::timestamp)`;
+			case "week": return C`DATE_TRUNC('week', ${t}::timestamp)`;
+			case "day": return C`DATE_TRUNC('day', ${t}::timestamp)::timestamp`;
+			case "hour": return C`DATE_TRUNC('hour', ${t}::timestamp)`;
+			case "minute": return C`DATE_TRUNC('minute', ${t}::timestamp)`;
+			case "second": return C`DATE_TRUNC('second', ${t}::timestamp)`;
 			default: return t;
 		}
 	}
 	regexCondition(e, t, n) {
-		return n ? T`NOT regexp_matches(${e}, ${t})` : T`regexp_matches(${e}, ${t})`;
+		return n ? C`NOT regexp_matches(${e}, ${t})` : C`regexp_matches(${e}, ${t})`;
 	}
 	castToType(e, t) {
 		switch (t) {
-			case "timestamp": return T`${e}::timestamp`;
-			case "decimal": return T`${e}::decimal`;
-			case "integer": return T`${e}::integer`;
+			case "timestamp": return C`${e}::timestamp`;
+			case "decimal": return C`${e}::decimal`;
+			case "integer": return C`${e}::integer`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	tryCastToType(e, t) {
 		switch (t) {
-			case "timestamp": return T`TRY_CAST(${e} AS timestamp)`;
-			case "decimal": return T`TRY_CAST(${e} AS decimal)`;
-			case "integer": return T`TRY_CAST(${e} AS integer)`;
+			case "timestamp": return C`TRY_CAST(${e} AS timestamp)`;
+			case "decimal": return C`TRY_CAST(${e} AS decimal)`;
+			case "integer": return C`TRY_CAST(${e} AS integer)`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
@@ -529,7 +529,7 @@ var O = class {
 	}
 	buildPercentile(e, t) {
 		let n = t / 100;
-		return T`QUANTILE_CONT(${e}, ${n})`;
+		return C`QUANTILE_CONT(${e}, ${n})`;
 	}
 }, je = class extends O {
 	getEngineType() {
@@ -537,56 +537,56 @@ var O = class {
 	}
 	buildIntervalFromISO(e) {
 		let t = this.parseISODuration(e), n = [];
-		if (t.years && n.push(`${t.years} YEAR`), t.months && n.push(`${t.months} MONTH`), t.days && n.push(`${t.days} DAY`), t.hours && n.push(`${t.hours} HOUR`), t.minutes && n.push(`${t.minutes} MINUTE`), t.seconds && n.push(`${t.seconds} SECOND`), n.length === 0) return T`INTERVAL 0 SECOND`;
-		if (n.length === 1) return T`INTERVAL ${T.raw(n[0])}`;
+		if (t.years && n.push(`${t.years} YEAR`), t.months && n.push(`${t.months} MONTH`), t.days && n.push(`${t.days} DAY`), t.hours && n.push(`${t.hours} HOUR`), t.minutes && n.push(`${t.minutes} MINUTE`), t.seconds && n.push(`${t.seconds} SECOND`), n.length === 0) return C`INTERVAL 0 SECOND`;
+		if (n.length === 1) return C`INTERVAL ${C.raw(n[0])}`;
 		let r = n.map((e) => `INTERVAL ${e}`);
-		return T`(${T.raw(r.join(" + "))})`;
+		return C`(${C.raw(r.join(" + "))})`;
 	}
 	buildTimeDifferenceSeconds(e, t) {
-		return T`EXTRACT(EPOCH FROM TIMESTAMP_DIFF(${e}, ${t}))`;
+		return C`EXTRACT(EPOCH FROM TIMESTAMP_DIFF(${e}, ${t}))`;
 	}
 	buildDateAddInterval(e, t) {
 		let n = this.buildIntervalFromISO(t);
-		return T`(${e} + ${n})`;
+		return C`(${e} + ${n})`;
 	}
 	buildDateDiffPeriods(e, t, n) {
-		return T`DATE_DIFF('${T.raw(n)}', ${e}::TIMESTAMP, ${t}::TIMESTAMP)`;
+		return C`DATE_DIFF('${C.raw(n)}', ${e}::TIMESTAMP, ${t}::TIMESTAMP)`;
 	}
 	buildPeriodSeriesSubquery(e) {
-		return T`(SELECT number as period_number FROM numbers(${e + 1})) p`;
+		return C`(SELECT number as period_number FROM numbers(${e + 1})) p`;
 	}
 	buildTimeDimension(e, t) {
 		switch (e) {
-			case "year": return T`DATE_TRUNC(YEAR, ${t}::TIMESTAMP)`;
-			case "quarter": return T`DATE_TRUNC(QUARTER, ${t}::TIMESTAMP)`;
-			case "month": return T`DATE_TRUNC(MONTH, ${t}::TIMESTAMP)`;
-			case "week": return T`DATE_TRUNC(WEEK, ${t}::TIMESTAMP)`;
-			case "day": return T`DATE_TRUNC(DAY, ${t}::TIMESTAMP)::TIMESTAMP`;
-			case "hour": return T`DATE_TRUNC(HOUR, ${t}::TIMESTAMP)`;
-			case "minute": return T`DATE_TRUNC(MINUTE, ${t}::TIMESTAMP)`;
-			case "second": return T`DATE_TRUNC(SECOND, ${t}::TIMESTAMP)`;
+			case "year": return C`DATE_TRUNC(YEAR, ${t}::TIMESTAMP)`;
+			case "quarter": return C`DATE_TRUNC(QUARTER, ${t}::TIMESTAMP)`;
+			case "month": return C`DATE_TRUNC(MONTH, ${t}::TIMESTAMP)`;
+			case "week": return C`DATE_TRUNC(WEEK, ${t}::TIMESTAMP)`;
+			case "day": return C`DATE_TRUNC(DAY, ${t}::TIMESTAMP)::TIMESTAMP`;
+			case "hour": return C`DATE_TRUNC(HOUR, ${t}::TIMESTAMP)`;
+			case "minute": return C`DATE_TRUNC(MINUTE, ${t}::TIMESTAMP)`;
+			case "second": return C`DATE_TRUNC(SECOND, ${t}::TIMESTAMP)`;
 			default: return t;
 		}
 	}
 	caseInsensitiveLike(e, t, n) {
-		return n ? T`LOWER(${e}) NOT LIKE LOWER(${t})` : T`LOWER(${e}) LIKE LOWER(${t})`;
+		return n ? C`LOWER(${e}) NOT LIKE LOWER(${t})` : C`LOWER(${e}) LIKE LOWER(${t})`;
 	}
 	regexCondition(e, t, n) {
-		return n ? T`NOT (${e} REGEXP ${t})` : T`${e} REGEXP ${t}`;
+		return n ? C`NOT (${e} REGEXP ${t})` : C`${e} REGEXP ${t}`;
 	}
 	castToType(e, t) {
 		switch (t) {
-			case "timestamp": return T`${e}::TIMESTAMP`;
-			case "decimal": return T`${e}::DECIMAL`;
-			case "integer": return T`${e}::INTEGER`;
+			case "timestamp": return C`${e}::TIMESTAMP`;
+			case "decimal": return C`${e}::DECIMAL`;
+			case "integer": return C`${e}::INTEGER`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	tryCastToType(e, t) {
 		switch (t) {
-			case "timestamp": return T`TRY_CAST(${e} AS TIMESTAMP)`;
-			case "decimal": return T`TRY_CAST(${e} AS DECIMAL)`;
-			case "integer": return T`TRY_CAST(${e} AS INTEGER)`;
+			case "timestamp": return C`TRY_CAST(${e} AS TIMESTAMP)`;
+			case "decimal": return C`TRY_CAST(${e} AS DECIMAL)`;
+			case "integer": return C`TRY_CAST(${e} AS INTEGER)`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
@@ -600,7 +600,7 @@ var O = class {
 	}
 	buildVariance(e, t = !1) {
 		let n = t ? "COVAR_SAMP" : "COVAR_POP";
-		return T`COALESCE(${T.raw(n)}(${e}, ${e}), 0)`;
+		return C`COALESCE(${C.raw(n)}(${e}, ${e}), 0)`;
 	}
 	buildPercentile(e, t) {
 		throw Error("Percentile functions are not yet supported for Databend");
@@ -611,51 +611,51 @@ var O = class {
 	}
 	buildIntervalFromISO(e) {
 		let t = this.durationToSeconds(e);
-		return T`${t}`;
+		return C`${t}`;
 	}
 	buildTimeDifferenceSeconds(e, t) {
-		return T`DATEDIFF('SECOND', ${t}, ${e})`;
+		return C`DATEDIFF('SECOND', ${t}, ${e})`;
 	}
 	buildDateAddInterval(e, t) {
 		let n = this.parseISODuration(t), r = e;
-		return n.years && (r = T`DATEADD('YEAR', ${n.years}, ${r})`), n.months && (r = T`DATEADD('MONTH', ${n.months}, ${r})`), n.days && (r = T`DATEADD('DAY', ${n.days}, ${r})`), n.hours && (r = T`DATEADD('HOUR', ${n.hours}, ${r})`), n.minutes && (r = T`DATEADD('MINUTE', ${n.minutes}, ${r})`), n.seconds && (r = T`DATEADD('SECOND', ${n.seconds}, ${r})`), r;
+		return n.years && (r = C`DATEADD('YEAR', ${n.years}, ${r})`), n.months && (r = C`DATEADD('MONTH', ${n.months}, ${r})`), n.days && (r = C`DATEADD('DAY', ${n.days}, ${r})`), n.hours && (r = C`DATEADD('HOUR', ${n.hours}, ${r})`), n.minutes && (r = C`DATEADD('MINUTE', ${n.minutes}, ${r})`), n.seconds && (r = C`DATEADD('SECOND', ${n.seconds}, ${r})`), r;
 	}
 	buildDateDiffPeriods(e, t, n) {
 		let r = n.toUpperCase();
-		return T`DATEDIFF('${T.raw(r)}', ${e}::TIMESTAMP, ${t}::TIMESTAMP)`;
+		return C`DATEDIFF('${C.raw(r)}', ${e}::TIMESTAMP, ${t}::TIMESTAMP)`;
 	}
 	buildPeriodSeriesSubquery(e) {
-		return T`(SELECT ROW_NUMBER() OVER (ORDER BY 1) - 1 AS period_number FROM TABLE(GENERATOR(ROWCOUNT => ${e + 1}))) p`;
+		return C`(SELECT ROW_NUMBER() OVER (ORDER BY 1) - 1 AS period_number FROM TABLE(GENERATOR(ROWCOUNT => ${e + 1}))) p`;
 	}
 	buildTimeDimension(e, t) {
 		switch (e) {
-			case "year": return T`DATE_TRUNC('YEAR', ${t}::TIMESTAMP)`;
-			case "quarter": return T`DATE_TRUNC('QUARTER', ${t}::TIMESTAMP)`;
-			case "month": return T`DATE_TRUNC('MONTH', ${t}::TIMESTAMP)`;
-			case "week": return T`DATE_TRUNC('WEEK', ${t}::TIMESTAMP)`;
-			case "day": return T`DATE_TRUNC('DAY', ${t}::TIMESTAMP)::TIMESTAMP`;
-			case "hour": return T`DATE_TRUNC('HOUR', ${t}::TIMESTAMP)`;
-			case "minute": return T`DATE_TRUNC('MINUTE', ${t}::TIMESTAMP)`;
-			case "second": return T`DATE_TRUNC('SECOND', ${t}::TIMESTAMP)`;
+			case "year": return C`DATE_TRUNC('YEAR', ${t}::TIMESTAMP)`;
+			case "quarter": return C`DATE_TRUNC('QUARTER', ${t}::TIMESTAMP)`;
+			case "month": return C`DATE_TRUNC('MONTH', ${t}::TIMESTAMP)`;
+			case "week": return C`DATE_TRUNC('WEEK', ${t}::TIMESTAMP)`;
+			case "day": return C`DATE_TRUNC('DAY', ${t}::TIMESTAMP)::TIMESTAMP`;
+			case "hour": return C`DATE_TRUNC('HOUR', ${t}::TIMESTAMP)`;
+			case "minute": return C`DATE_TRUNC('MINUTE', ${t}::TIMESTAMP)`;
+			case "second": return C`DATE_TRUNC('SECOND', ${t}::TIMESTAMP)`;
 			default: return t;
 		}
 	}
 	regexCondition(e, t, n) {
-		return n ? T`NOT REGEXP_LIKE(${e}, ${t})` : T`REGEXP_LIKE(${e}, ${t})`;
+		return n ? C`NOT REGEXP_LIKE(${e}, ${t})` : C`REGEXP_LIKE(${e}, ${t})`;
 	}
 	castToType(e, t) {
 		switch (t) {
-			case "timestamp": return T`${e}::TIMESTAMP`;
-			case "decimal": return T`${e}::DECIMAL`;
-			case "integer": return T`${e}::INTEGER`;
+			case "timestamp": return C`${e}::TIMESTAMP`;
+			case "decimal": return C`${e}::DECIMAL`;
+			case "integer": return C`${e}::INTEGER`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	tryCastToType(e, t) {
 		switch (t) {
-			case "timestamp": return T`TRY_CAST(${e} AS TIMESTAMP)`;
-			case "decimal": return T`TRY_CAST(${e} AS DECIMAL)`;
-			case "integer": return T`TRY_CAST(${e} AS INTEGER)`;
+			case "timestamp": return C`TRY_CAST(${e} AS TIMESTAMP)`;
+			case "decimal": return C`TRY_CAST(${e} AS DECIMAL)`;
+			case "integer": return C`TRY_CAST(${e} AS INTEGER)`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
@@ -669,7 +669,7 @@ var O = class {
 	}
 	buildPercentile(e, t) {
 		let n = (t / 100).toString();
-		return T`PERCENTILE_CONT(${T.raw(n)}) WITHIN GROUP (ORDER BY ${e})`;
+		return C`PERCENTILE_CONT(${C.raw(n)}) WITHIN GROUP (ORDER BY ${e})`;
 	}
 };
 //#endregion
@@ -785,18 +785,18 @@ function j(e, t, n) {
 	let r = [];
 	if (n === "question") {
 		let n = e.split("?");
-		r.push(T.raw(n[0]));
-		for (let e = 1; e < n.length; e++) r.push(T`${t[e - 1]}`), r.push(T.raw(n[e]));
+		r.push(C.raw(n[0]));
+		for (let e = 1; e < n.length; e++) r.push(C`${t[e - 1]}`), r.push(C.raw(n[e]));
 	} else {
 		let n = /\$(\d+)/g, i = 0, a;
 		for (; (a = n.exec(e)) !== null;) {
-			r.push(T.raw(e.slice(i, a.index)));
+			r.push(C.raw(e.slice(i, a.index)));
 			let n = parseInt(a[1], 10) - 1;
-			r.push(T`${t[n]}`), i = a.index + a[0].length;
+			r.push(C`${t[n]}`), i = a.index + a[0].length;
 		}
-		r.push(T.raw(e.slice(i)));
+		r.push(C.raw(e.slice(i)));
 	}
-	return T.join(r);
+	return C.join(r);
 }
 function Re(e) {
 	return e && typeof e == "object" ? e : null;
@@ -896,7 +896,7 @@ var Ke = class extends k {
 	async explainQuery(e, t, n) {
 		let r = n?.analyze ? "EXPLAIN ANALYZE" : "EXPLAIN";
 		if (!this.db.execute) throw Error("PostgreSQL database instance must have an execute method");
-		return Ie(Ve(He(await this.db.execute(T`${T.raw(r)} ${j(e, t, "dollar")}`))), {
+		return Ie(Ve(He(await this.db.execute(C`${C.raw(r)} ${j(e, t, "dollar")}`))), {
 			sql: e,
 			params: t
 		});
@@ -905,7 +905,7 @@ var Ke = class extends k {
 		if (!e || e.length === 0) return [];
 		if (!this.db.execute) throw Error("PostgreSQL database instance must have an execute method");
 		try {
-			let t = e.map((e) => `'${e.toLowerCase()}'`).join(","), n = He(await this.db.execute(T`
+			let t = e.map((e) => `'${e.toLowerCase()}'`).join(","), n = He(await this.db.execute(C`
         SELECT
           t.relname as table_name,
           i.relname as index_name,
@@ -919,7 +919,7 @@ var Ke = class extends k {
         JOIN LATERAL unnest(ix.indkey) WITH ORDINALITY AS k(attnum, n) ON true
         JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = k.attnum
         WHERE n.nspname = 'public'
-          AND t.relname IN (${T.raw(t)})
+          AND t.relname IN (${C.raw(t)})
         GROUP BY t.relname, i.relname, ix.indisunique, ix.indisprimary
         ORDER BY t.relname, i.relname
       `));
@@ -1018,7 +1018,7 @@ var Xe = class extends k {
 	async explainQuery(e, t, n) {
 		let r = n?.analyze ? "EXPLAIN ANALYZE" : "EXPLAIN";
 		if (!this.db.execute) throw Error("MySQL database instance must have an execute method");
-		return Ye(ze(await this.db.execute(T`${T.raw(r)} ${j(e, t, "question")}`)), {
+		return Ye(ze(await this.db.execute(C`${C.raw(r)} ${j(e, t, "question")}`)), {
 			sql: e,
 			params: t
 		});
@@ -1027,7 +1027,7 @@ var Xe = class extends k {
 		if (!e || e.length === 0) return [];
 		if (!this.db.execute) throw Error("MySQL database instance must have an execute method");
 		try {
-			let t = e.map((e) => `'${e.toLowerCase()}'`).join(","), n = await this.db.execute(T`
+			let t = e.map((e) => `'${e.toLowerCase()}'`).join(","), n = await this.db.execute(C`
         SELECT
           TABLE_NAME as table_name,
           INDEX_NAME as index_name,
@@ -1036,7 +1036,7 @@ var Xe = class extends k {
           CASE WHEN INDEX_NAME = 'PRIMARY' THEN TRUE ELSE FALSE END as is_primary
         FROM INFORMATION_SCHEMA.STATISTICS
         WHERE TABLE_SCHEMA = DATABASE()
-          AND LOWER(TABLE_NAME) IN (${T.raw(t)})
+          AND LOWER(TABLE_NAME) IN (${C.raw(t)})
         GROUP BY TABLE_NAME, INDEX_NAME, NON_UNIQUE
         ORDER BY TABLE_NAME, INDEX_NAME
       `);
@@ -1157,7 +1157,7 @@ var et = class extends k {
 	}
 	async explainQuery(e, t, n) {
 		let r;
-		if (this.db.all) r = this.db.all(T`EXPLAIN QUERY PLAN ${j(e, t, "question")}`);
+		if (this.db.all) r = this.db.all(C`EXPLAIN QUERY PLAN ${j(e, t, "question")}`);
 		else throw Error("SQLite database instance must have an all() method for EXPLAIN");
 		return $e(Be(r), {
 			sql: e,
@@ -1170,9 +1170,9 @@ var et = class extends k {
 		try {
 			let t = [];
 			for (let n of e) {
-				let e = this.db.all(T.raw(`SELECT name, "unique", origin FROM pragma_index_list('${n.toLowerCase()}')`));
+				let e = this.db.all(C.raw(`SELECT name, "unique", origin FROM pragma_index_list('${n.toLowerCase()}')`));
 				if (Array.isArray(e)) for (let r of e) {
-					let e = r.name, i = !!r.unique, a = r.origin, o = this.db.all(T.raw(`SELECT name FROM pragma_index_info('${e}') ORDER BY seqno`)), s = [];
+					let e = r.name, i = !!r.unique, a = r.origin, o = this.db.all(C.raw(`SELECT name FROM pragma_index_info('${e}') ORDER BY seqno`)), s = [];
 					if (Array.isArray(o)) for (let e of o) {
 						let t = e.name;
 						typeof t == "string" && s.push(t);
@@ -1349,7 +1349,7 @@ var st = class extends k {
 	async explainQuery(e, t, n) {
 		let r = n?.analyze ? "EXPLAIN ANALYZE" : "EXPLAIN";
 		if (!this.db.execute) throw Error("DuckDB database instance must have an execute method");
-		let i = await this.db.execute(T`${T.raw(r)} ${j(e, t, "dollar")}`), a = [];
+		let i = await this.db.execute(C`${C.raw(r)} ${j(e, t, "dollar")}`), a = [];
 		if (Array.isArray(i)) {
 			for (let e of i) if (e && typeof e == "object") {
 				let t = e.explain_value || e["QUERY PLAN"] || e.query_plan || e.Plan || Object.values(e)[0];
@@ -1365,7 +1365,7 @@ var st = class extends k {
 		if (!e || e.length === 0) return [];
 		if (!this.db.execute) throw Error("DuckDB database instance must have an execute method");
 		try {
-			let t = e.map((e) => `'${e.toLowerCase()}'`).join(","), n = await this.db.execute(T`
+			let t = e.map((e) => `'${e.toLowerCase()}'`).join(","), n = await this.db.execute(C`
         SELECT
           table_name,
           index_name,
@@ -1373,7 +1373,7 @@ var st = class extends k {
           is_unique,
           is_primary
         FROM duckdb_indexes()
-        WHERE LOWER(table_name) IN (${T.raw(t)})
+        WHERE LOWER(table_name) IN (${C.raw(t)})
         GROUP BY table_name, index_name, is_unique, is_primary
         ORDER BY table_name, index_name
       `);
@@ -1524,7 +1524,7 @@ var ft = class extends k {
 	async explainQuery(e, t, n) {
 		let r = n?.analyze ? "EXPLAIN ANALYZE" : "EXPLAIN";
 		if (!this.db.execute) throw Error("Databend database instance must have an execute method");
-		let i = await this.db.execute(T`${T.raw(r)} ${j(e, t, "dollar")}`), a = [];
+		let i = await this.db.execute(C`${C.raw(r)} ${j(e, t, "dollar")}`), a = [];
 		if (Array.isArray(i)) {
 			for (let e of i) if (e && typeof e == "object") {
 				let t = e.explain || e["QUERY PLAN"] || e.query_plan || e.Plan || Object.values(e)[0];
@@ -1680,7 +1680,7 @@ var vt = class extends k {
 	}
 	async explainQuery(e, t, n) {
 		if (n?.analyze, !this.db.execute) throw Error("Snowflake database instance must have an execute method");
-		let r = await this.db.execute(T`${T.raw("EXPLAIN")} ${j(e, t, "question")}`), i = [];
+		let r = await this.db.execute(C`${C.raw("EXPLAIN")} ${j(e, t, "question")}`), i = [];
 		if (Array.isArray(r)) {
 			for (let e of r) if (e && typeof e == "object") {
 				let t = e.content || e["QUERY PLAN"] || e.plan || Object.values(e)[0];
@@ -1932,14 +1932,14 @@ var I = class {
 		this.databaseAdapter = e;
 	}
 	buildTimeDimensionExpression(e, t, n) {
-		let r = f(e, n);
-		return t ? this.databaseAdapter.buildTimeDimension(t, r) : r instanceof ce ? r : T`${r}`;
+		let r = l(e, n);
+		return t ? this.databaseAdapter.buildTimeDimension(t, r) : r instanceof ie ? r : C`${r}`;
 	}
 	buildDateRangeCondition(e, t) {
 		return t ? Array.isArray(t) ? this.buildArrayDateRangeCondition(e, t) : typeof t == "string" ? this.buildStringDateRangeCondition(e, t) : null : null;
 	}
-	rangeBetween(e, t, r) {
-		return n(d(e, t), S(e, r));
+	rangeBetween(e, t, n) {
+		return w(s(e, t), x(e, n));
 	}
 	endOfDayValue(e) {
 		let t = wt(this.databaseAdapter, e);
@@ -1974,36 +1974,36 @@ var I = class {
 	if (n.length > 1) {
 		if (i?.type === "time") {
 			let e = n.map((e) => o.normalizeDate(e) || e);
-			return w(t, e);
+			return d(t, e);
 		}
-		return w(t, n);
+		return d(t, n);
 	}
 	if (n.length === 1) {
 		let e = i?.type === "time" && o.normalizeDate(r) || r;
-		return x(t, e);
+		return b(t, e);
 	}
 	return a.buildBooleanLiteral(!1);
-}, Nt = (t) => {
-	let { fieldExpr: n, filteredValues: r, value: i } = t;
-	return r.length > 1 ? e(n, r) : r.length === 1 ? _(n, i) : null;
-}, L = (e) => ({ fieldExpr: t, value: n, databaseAdapter: r }) => r.buildStringCondition(t, e, n), Pt = ({ fieldExpr: e, value: t }) => s(e, t), Ft = ({ fieldExpr: e, value: t }) => d(e, t), It = ({ fieldExpr: e, value: t }) => ne(e, t), Lt = ({ fieldExpr: e, value: t }) => S(e, t), Rt = ({ fieldExpr: e }) => u(e), zt = ({ fieldExpr: e }) => re(e), Bt = (e) => {
-	let { fieldExpr: t, values: r, filteredValues: i, databaseAdapter: a, dateTimeBuilder: o } = e;
-	if (i.length < 2) return null;
-	let s = o.normalizeDate(i[0]), c = o.normalizeDate(i[1]);
-	if (!s || !c) return null;
-	let l = r[1];
+}, Nt = (e) => {
+	let { fieldExpr: t, filteredValues: n, value: r } = e;
+	return n.length > 1 ? g(t, n) : n.length === 1 ? re(t, r) : null;
+}, L = (e) => ({ fieldExpr: t, value: n, databaseAdapter: r }) => r.buildStringCondition(t, e, n), Pt = ({ fieldExpr: e, value: t }) => te(e, t), Ft = ({ fieldExpr: e, value: t }) => s(e, t), It = ({ fieldExpr: e, value: t }) => ne(e, t), Lt = ({ fieldExpr: e, value: t }) => x(e, t), Rt = ({ fieldExpr: e }) => se(e), zt = ({ fieldExpr: e }) => u(e), Bt = (e) => {
+	let { fieldExpr: t, values: n, filteredValues: r, databaseAdapter: i, dateTimeBuilder: a } = e;
+	if (r.length < 2) return null;
+	let o = a.normalizeDate(r[0]), c = a.normalizeDate(r[1]);
+	if (!o || !c) return null;
+	let l = n[1];
 	if (typeof l == "string" && /^\d{4}-\d{2}-\d{2}$/.test(l.trim())) {
-		let e = typeof c == "number" ? /* @__PURE__ */ new Date(c * (a.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(c), t = new Date(e);
-		t.setUTCHours(23, 59, 59, 999), c = a.isTimestampInteger() ? a.getEngineType() === "sqlite" ? Math.floor(t.getTime() / 1e3) : t.getTime() : t.toISOString();
+		let e = typeof c == "number" ? /* @__PURE__ */ new Date(c * (i.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(c), t = new Date(e);
+		t.setUTCHours(23, 59, 59, 999), c = i.isTimestampInteger() ? i.getEngineType() === "sqlite" ? Math.floor(t.getTime() / 1e3) : t.getTime() : t.toISOString();
 	}
-	return n(d(t, s), S(t, c));
+	return w(s(t, o), x(t, c));
 }, Vt = ({ fieldExpr: e, value: t, dateTimeBuilder: n }) => {
 	let r = n.normalizeDate(t);
 	return r ? ne(e, r) : null;
 }, Ht = ({ fieldExpr: e, value: t, dateTimeBuilder: n }) => {
 	let r = n.normalizeDate(t);
-	return r ? s(e, r) : null;
-}, Ut = ({ fieldExpr: e, filteredValues: t }) => t.length >= 2 ? n(d(e, t[0]), S(e, t[1])) : null, Wt = ({ fieldExpr: e, filteredValues: t }) => t.length >= 2 ? C(ne(e, t[0]), s(e, t[1])) : null, Gt = ({ fieldExpr: e, filteredValues: t }) => t.length > 0 ? w(e, t) : null, Kt = ({ fieldExpr: t, filteredValues: n }) => n.length > 0 ? e(t, n) : null, qt = ({ fieldExpr: e }) => C(re(e), x(e, "")), Jt = ({ fieldExpr: e }) => n(u(e), _(e, "")), Yt = (e) => ({ fieldExpr: t, filteredValues: n, databaseAdapter: r }) => r.getEngineType() === "postgres" ? e(t, n) : null, Xt = {
+	return r ? te(e, r) : null;
+}, Ut = ({ fieldExpr: e, filteredValues: t }) => t.length >= 2 ? w(s(e, t[0]), x(e, t[1])) : null, Wt = ({ fieldExpr: t, filteredValues: n }) => n.length >= 2 ? e(ne(t, n[0]), te(t, n[1])) : null, Gt = ({ fieldExpr: e, filteredValues: t }) => t.length > 0 ? d(e, t) : null, Kt = ({ fieldExpr: e, filteredValues: t }) => t.length > 0 ? g(e, t) : null, qt = ({ fieldExpr: t }) => e(u(t), b(t, "")), Jt = ({ fieldExpr: e }) => w(se(e), re(e, "")), Yt = (e) => ({ fieldExpr: t, filteredValues: n, databaseAdapter: r }) => r.getEngineType() === "postgres" ? e(t, n) : null, Xt = {
 	equals: Mt,
 	notEquals: Nt,
 	contains: L("contains"),
@@ -2030,9 +2030,9 @@ var I = class {
 	notRegex: L("notRegex"),
 	isEmpty: qt,
 	isNotEmpty: Jt,
-	arrayContains: Yt(c),
-	arrayOverlaps: Yt(ee),
-	arrayContained: Yt(te)
+	arrayContains: Yt(ee),
+	arrayOverlaps: Yt(c),
+	arrayContained: Yt(n)
 };
 function Zt(e, t) {
 	let n = Xt[e];
@@ -2041,7 +2041,7 @@ function Zt(e, t) {
 //#endregion
 //#region src/server/builders/analysis-utils.ts
 function R(e) {
-	if (e.length !== 0) return e.length === 1 ? e[0] : n(...e);
+	if (e.length !== 0) return e.length === 1 ? e[0] : w(...e);
 }
 function z(e) {
 	if ("type" in e && "filters" in e) {
@@ -2059,9 +2059,9 @@ function Qt(e) {
 }
 function $t(e) {
 	return {
-		noMapping: ({ cubeName: n }) => t(`${e}.noBindingKeyMapping`, { cubeName: n }),
-		keyDimNotFound: ({ bindingKey: n }) => t(`${e}.bindingKeyDimNotFound`, { bindingKey: n }),
-		mappingDimNotFound: ({ dimension: n }) => t(`${e}.bindingKeyMappingDimNotFound`, { dimension: n })
+		noMapping: ({ cubeName: t }) => S(`${e}.noBindingKeyMapping`, { cubeName: t }),
+		keyDimNotFound: ({ bindingKey: t }) => S(`${e}.bindingKeyDimNotFound`, { bindingKey: t }),
+		mappingDimNotFound: ({ dimension: t }) => S(`${e}.bindingKeyMappingDimNotFound`, { dimension: t })
 	};
 }
 function en(e, t, n, r) {
@@ -2078,7 +2078,7 @@ function tn(e, t, n, r, i) {
 			cubeName: a,
 			dimName: o
 		}));
-		return f(s.sql, n);
+		return l(s.sql, n);
 	}
 	let a = e.find((e) => e.cube === t.name);
 	if (!a) throw Error(r.noMapping({ cubeName: t.name }));
@@ -2088,19 +2088,19 @@ function tn(e, t, n, r, i) {
 		cubeName: a.cube,
 		dimName: o
 	}));
-	return f(s.sql, n);
+	return l(s.sql, n);
 }
-function nn(e, n, r, i) {
+function nn(e, t, n, r) {
 	if (typeof e == "string") {
-		let [, a] = e.split("."), o = n.dimensions?.[a];
-		if (!o) throw Error(t(`${i}.timeDimNotFound`, { timeDimension: e }));
-		return f(o.sql, r);
+		let [, i] = e.split("."), a = t.dimensions?.[i];
+		if (!a) throw Error(S(`${r}.timeDimNotFound`, { timeDimension: e }));
+		return l(a.sql, n);
 	}
-	let a = e.find((e) => e.cube === n.name);
-	if (!a) throw Error(t(`${i}.noTimeDimMapping`, { cubeName: n.name }));
-	let [, o] = a.dimension.split("."), s = n.dimensions?.[o];
-	if (!s) throw Error(t(`${i}.timeDimMappingNotFound`, { dimension: a.dimension }));
-	return f(s.sql, r);
+	let i = e.find((e) => e.cube === t.name);
+	if (!i) throw Error(S(`${r}.noTimeDimMapping`, { cubeName: t.name }));
+	let [, a] = i.dimension.split("."), o = t.dimensions?.[a];
+	if (!o) throw Error(S(`${r}.timeDimMappingNotFound`, { dimension: i.dimension }));
+	return l(o.sql, n);
 }
 //#endregion
 //#region src/server/builders/filter-builder.ts
@@ -2133,20 +2133,20 @@ var B = class {
 	buildLogicalFilter(e, t, n) {
 		return "and" in e && e.and ? this.combineFilters(e.and, !0, t, n) : "or" in e && e.or ? this.combineFilters(e.or, !1, t, n) : null;
 	}
-	combineFilters(e, t, r, i) {
-		let a = e.map((e) => this.buildSingleFilter(e, r, i)).filter((e) => e !== null);
-		return a.length === 0 ? null : a.length === 1 ? a[0] : t ? n(...a) : C(...a);
+	combineFilters(t, n, r, i) {
+		let a = t.map((e) => this.buildSingleFilter(e, r, i)).filter((e) => e !== null);
+		return a.length === 0 ? null : a.length === 1 ? a[0] : n ? w(...a) : e(...a);
 	}
 	buildSingleFilter(e, t, n) {
 		if ("and" in e || "or" in e) return this.buildLogicalFilter(e, t, n);
 		let r = z(e);
 		if (r) return this.combineFilters(r.filters, r.isAnd, t, n);
-		let i = e, [a, o] = i.member.split("."), s = t.get(a);
-		if (!s) return null;
-		let c = s.dimensions?.[o];
+		let i = e, [a, s] = i.member.split("."), c = t.get(a);
 		if (!c) return null;
-		let u = l(c, n);
-		return this.buildFilterCondition(u, i.operator, i.values, c, i.dateRange);
+		let l = c.dimensions?.[s];
+		if (!l) return null;
+		let u = o(l, n);
+		return this.buildFilterCondition(u, i.operator, i.values, l, i.dateRange);
 	}
 }, rn = [
 	"lag",
@@ -2160,35 +2160,35 @@ var B = class {
 	"movingAvg",
 	"movingSum"
 ];
-function an(e) {
+function V(e) {
 	return rn.includes(e);
 }
-function on(e) {
-	return an(e.type) && e.windowConfig?.measure !== void 0;
+function an(e) {
+	return V(e.type) && e.windowConfig?.measure !== void 0;
 }
-function sn(e, t) {
+function on(e, t) {
 	if (!e.windowConfig?.measure) return null;
 	let n = e.windowConfig.measure;
 	return n.includes(".") ? n : `${t}.${n}`;
 }
-function cn(e) {
+function sn(e) {
 	switch (e) {
 		case "lag":
 		case "lead": return "difference";
 		default: return "raw";
 	}
 }
-function V(e, t) {
+function cn(e, t) {
 	let n = [], r = [], i = /* @__PURE__ */ new Set();
 	for (let a of e) {
 		let [e, o] = a.split("."), s = t.get(e);
 		if (s?.measures?.[o]) {
 			let t = s.measures[o];
-			if (on(t)) {
+			if (an(t)) {
 				r.push(a);
-				let n = sn(t, e);
+				let n = on(t, e);
 				n && i.add(n);
-			} else an(t.type) || n.push(a);
+			} else V(t.type) || n.push(a);
 		}
 	}
 	return {
@@ -2198,7 +2198,7 @@ function V(e, t) {
 	};
 }
 function ln(e, t) {
-	return V(e, t).postAggWindowMeasures.length > 0;
+	return cn(e, t).postAggWindowMeasures.length > 0;
 }
 //#endregion
 //#region src/server/resolvers/calculated-measure-resolver.ts
@@ -2338,35 +2338,35 @@ var H = class {
 };
 //#endregion
 //#region src/server/template-substitution.ts
-function dn(e, n) {
-	let { cube: r, allCubes: i, resolvedMeasures: a } = n, o = fn(e), s = /* @__PURE__ */ new Map();
-	for (let e of o) {
-		let { originalRef: n, cubeName: o, fieldName: c } = e, l = o || r.name;
-		if (!i.get(l)) throw Error(t("server.validation.template.substituteTargetCubeNotFound", {
-			ref: `{${n}}`,
-			cubeName: l
+function dn(e, t) {
+	let { cube: n, allCubes: r, resolvedMeasures: i } = t, a = fn(e), o = /* @__PURE__ */ new Map();
+	for (let e of a) {
+		let { originalRef: t, cubeName: a, fieldName: s } = e, c = a || n.name;
+		if (!r.get(c)) throw Error(S("server.validation.template.substituteTargetCubeNotFound", {
+			ref: `{${t}}`,
+			cubeName: c
 		}));
-		let u = `${l}.${c}`, d = a.get(u);
-		if (!d) throw Error(t("server.validation.template.substituteMeasureNotResolved", {
-			ref: `{${n}}`,
-			measureName: u
+		let l = `${c}.${s}`, u = i.get(l);
+		if (!u) throw Error(S("server.validation.template.substituteMeasureNotResolved", {
+			ref: `{${t}}`,
+			measureName: l
 		}));
-		let f = d(), p = T`${f}`;
-		s.set(n, p);
+		let d = u(), f = C`${d}`;
+		o.set(t, f);
 	}
-	let c = [], l = [], u = 0;
-	for (let t of o) {
-		let n = `{${t.originalRef}}`, r = e.indexOf(n, u);
+	let s = [], c = [], l = 0;
+	for (let t of a) {
+		let n = `{${t.originalRef}}`, r = e.indexOf(n, l);
 		if (r >= 0) {
-			c.push(e.substring(u, r));
-			let i = s.get(t.originalRef);
-			i && l.push(i), u = r + n.length;
+			s.push(e.substring(l, r));
+			let i = o.get(t.originalRef);
+			i && c.push(i), l = r + n.length;
 		}
 	}
-	if (c.push(e.substring(u)), l.length === 0) return T.raw(e);
-	let d = [];
-	for (let e = 0; e < c.length; e++) c[e] && d.push(new se(c[e])), e < l.length && d.push(l[e]);
-	return T.join(d, T.raw(""));
+	if (s.push(e.substring(l)), c.length === 0) return C.raw(e);
+	let u = [];
+	for (let e = 0; e < s.length; e++) s[e] && u.push(new le(s[e])), e < c.length && u.push(c[e]);
+	return C.join(u, C.raw(""));
 }
 function fn(e) {
 	if (e.length > 1e3) return [];
@@ -2389,21 +2389,21 @@ function fn(e) {
 	return n;
 }
 function pn(e) {
-	let n = [], r = 0;
-	for (let i = 0; i < e.length; i++) if (e[i] === "{") r++;
-	else if (e[i] === "}" && (r--, r < 0)) {
-		n.push(t("server.validation.template.unmatchedClosingBrace", { position: i }));
+	let t = [], n = 0;
+	for (let r = 0; r < e.length; r++) if (e[r] === "{") n++;
+	else if (e[r] === "}" && (n--, n < 0)) {
+		t.push(S("server.validation.template.unmatchedClosingBrace", { position: r }));
 		break;
 	}
-	r > 0 && n.push(t("server.validation.template.unmatchedOpeningBrace")), /\{\s*\}/.test(e) && n.push(t("server.validation.template.emptyReference")), /\{[^}]*\{/.test(e) && n.push(t("server.validation.template.nestedBraces"));
-	let i = fn(e);
-	for (let e of i) {
-		let r = e.cubeName ? `${e.cubeName}.${e.fieldName}` : e.fieldName;
-		/^[a-zA-Z_][a-zA-Z0-9_.]*$/.test(r) || n.push(t("server.validation.template.invalidMemberReference", { ref: `{${e.originalRef}}` })), r.split(".").length > 2 && n.push(t("server.validation.template.multipleDots", { ref: `{${e.originalRef}}` }));
+	n > 0 && t.push(S("server.validation.template.unmatchedOpeningBrace")), /\{\s*\}/.test(e) && t.push(S("server.validation.template.emptyReference")), /\{[^}]*\{/.test(e) && t.push(S("server.validation.template.nestedBraces"));
+	let r = fn(e);
+	for (let e of r) {
+		let n = e.cubeName ? `${e.cubeName}.${e.fieldName}` : e.fieldName;
+		/^[a-zA-Z_][a-zA-Z0-9_.]*$/.test(n) || t.push(S("server.validation.template.invalidMemberReference", { ref: `{${e.originalRef}}` })), n.split(".").length > 2 && t.push(S("server.validation.template.multipleDots", { ref: `{${e.originalRef}}` }));
 	}
 	return {
-		isValid: n.length === 0,
-		errors: n
+		isValid: t.length === 0,
+		errors: t
 	};
 }
 function mn(e, t) {
@@ -2485,7 +2485,7 @@ var U = class e {
 			if (o && o.measures[i]) {
 				let t = o.measures[i];
 				if (n.measures.includes(e)) {
-					let r = T`${T.identifier(n.cteAlias)}.${T.identifier(i)}`, o = this.reAggregateCteColumn(t.type, r);
+					let r = C`${C.identifier(n.cteAlias)}.${C.identifier(i)}`, o = this.reAggregateCteColumn(t.type, r);
 					a.set(e, () => o);
 				}
 			}
@@ -2512,34 +2512,34 @@ var U = class e {
 			if (i.joinCubes) for (let e of i.joinCubes) o.set(e.cube.name, e.cube);
 			return this.buildCTECalculatedMeasure(n, t, a, o, r);
 		}
-		let o = T`${T.identifier(a.cteAlias)}.${T.identifier(t)}`;
+		let o = C`${C.identifier(a.cteAlias)}.${C.identifier(t)}`;
 		return this.reAggregateCteColumn(n.type, o);
 	}
 	buildMeasureExpression(t, n, r) {
 		if (t.type === "calculated") throw Error(`Cannot build calculated measure '${t.name}' directly. Use buildCalculatedMeasure instead.`);
 		if (e.isPostAggregationWindow(t)) throw Error(`Post-aggregation window measure '${t.name}' should be built via buildPostAggregationWindowExpression, not buildMeasureExpression.`);
 		if (!t.sql) throw Error(`Measure '${t.name}' of type '${t.type}' is missing required 'sql' property. Only calculated measures and post-aggregation window functions can omit 'sql'.`);
-		let i = f(t.sql, n);
+		let i = l(t.sql, n);
 		if (n.ungrouped) return i;
 		let a = this.applyMeasureFilters(t, i, n);
 		return this.applyAggregation(t, a, n, r);
 	}
-	applyMeasureFilters(e, t, r) {
+	applyMeasureFilters(e, t, n) {
 		if (!e.filters || e.filters.length === 0) return t;
-		let i = e.filters.map((e) => {
-			let t = e(r);
-			return t ? T`(${t})` : void 0;
+		let r = e.filters.map((e) => {
+			let t = e(n);
+			return t ? C`(${t})` : void 0;
 		}).filter(Boolean);
-		if (i.length === 0) return t;
-		let a = i.length === 1 ? i[0] : n(...i);
+		if (r.length === 0) return t;
+		let i = r.length === 1 ? r[0] : w(...r);
 		return this.databaseAdapter.buildCaseWhen([{
-			when: a,
+			when: i,
 			then: t
 		}]);
 	}
 	applyAggregation(e, t, n, r) {
 		switch (e.type) {
-			case "count": return pe(t);
+			case "count": return T(t);
 			case "countDistinct": return me(t);
 			case "sum": return E(t);
 			case "avg": return this.databaseAdapter.buildAvg(t);
@@ -2564,12 +2564,12 @@ var U = class e {
 			case "lastValue":
 			case "movingAvg":
 			case "movingSum": return this.buildWindowMeasure(e, t, n, r);
-			default: return pe(t);
+			default: return T(t);
 		}
 	}
 	buildStatistical(e, t, n) {
 		let r = n();
-		return r === null ? (console.warn(`[drizzle-cube] ${e.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), T`MAX(NULL)`) : r;
+		return r === null ? (console.warn(`[drizzle-cube] ${e.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), C`MAX(NULL)`) : r;
 	}
 	resolvePercentile(e) {
 		switch (e.type) {
@@ -2590,13 +2590,13 @@ var U = class e {
 			nTile: i.nTile,
 			frame: i.frame
 		});
-		return s === null ? (console.warn(`[drizzle-cube] ${e.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), T`NULL`) : s;
+		return s === null ? (console.warn(`[drizzle-cube] ${e.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), C`NULL`) : s;
 	}
 	resolveWindowPartitions(e, t, n) {
 		if (!e.partitionBy || e.partitionBy.length === 0 || !n) return;
 		let r = e.partitionBy.map((e) => {
 			let r = e.includes(".") ? e.split(".")[1] : e, i = n.dimensions?.[r];
-			return i ? f(i.sql, t) : (console.warn(`[drizzle-cube] Window function partition dimension '${e}' not found in cube '${n.name}'`), null);
+			return i ? l(i.sql, t) : (console.warn(`[drizzle-cube] Window function partition dimension '${e}' not found in cube '${n.name}'`), null);
 		}).filter((e) => e !== null);
 		return r.length > 0 ? r : void 0;
 	}
@@ -2605,12 +2605,12 @@ var U = class e {
 		let r = e.orderBy.map((e) => {
 			let r = e.field.includes(".") ? e.field.split(".")[1] : e.field, i = n.dimensions?.[r];
 			if (i) return {
-				field: f(i.sql, t),
+				field: l(i.sql, t),
 				direction: e.direction
 			};
 			let a = n.measures?.[r];
 			return a && a.sql ? {
-				field: f(a.sql, t),
+				field: l(a.sql, t),
 				direction: e.direction
 			} : (console.warn(`[drizzle-cube] Window function order field '${e.field}' not found in cube '${n.name}'`), null);
 		}).filter((e) => e !== null);
@@ -2618,7 +2618,7 @@ var U = class e {
 	}
 	static WINDOW_FUNCTION_TYPES = rn;
 	static isWindowFunction(e) {
-		return an(e);
+		return V(e);
 	}
 	static categorizeMeasures(t, n) {
 		let r = [], i = [];
@@ -2639,16 +2639,16 @@ var U = class e {
 		return r.length > 0;
 	}
 	static isPostAggregationWindow(e) {
-		return on(e);
+		return an(e);
 	}
 	static getWindowBaseMeasure(e, t) {
-		return sn(e, t);
+		return on(e, t);
 	}
 	static getDefaultWindowOperation(e) {
-		return cn(e);
+		return sn(e);
 	}
 	static categorizeForPostAggregation(e, t) {
-		return V(e, t);
+		return cn(e, t);
 	}
 	static hasPostAggregationWindows(e, t) {
 		return ln(e, t);
@@ -2732,9 +2732,9 @@ var U = class e {
 		let s = r?.preAggregationCTEs?.find((e) => e.cube.name === i);
 		if (s) {
 			let e = s.joinKeys.find((e) => e.targetColumn === a);
-			return e && e.sourceColumnObj ? e.sourceColumnObj : T`${T.identifier(s.cteAlias)}.${T.identifier(a)}`;
+			return e && e.sourceColumnObj ? e.sourceColumnObj : C`${C.identifier(s.cteAlias)}.${C.identifier(a)}`;
 		}
-		return f(o.dimensions[a].sql, n);
+		return l(o.dimensions[a].sql, n);
 	}
 	resolveTimeDimensionGroupField(e, t, n, r) {
 		let [i, a] = e.dimension.split("."), o = t.get(i);
@@ -2742,7 +2742,7 @@ var U = class e {
 		let s = r?.preAggregationCTEs?.find((e) => e.cube.name === i);
 		if (s) {
 			let t = s.joinKeys.find((e) => e.targetColumn === a);
-			return t && t.sourceColumnObj ? this.dateTimeBuilder.buildTimeDimensionExpression(t.sourceColumnObj, e.granularity, n) : T`${T.identifier(s.cteAlias)}.${T.identifier(a)}`;
+			return t && t.sourceColumnObj ? this.dateTimeBuilder.buildTimeDimensionExpression(t.sourceColumnObj, e.granularity, n) : C`${C.identifier(s.cteAlias)}.${C.identifier(a)}`;
 		}
 		return this.dateTimeBuilder.buildTimeDimensionExpression(o.dimensions[a].sql, e.granularity, n);
 	}
@@ -2762,8 +2762,8 @@ var U = class e {
 		if (t.dimensions) for (let e of t.dimensions) {
 			let [t, a] = e.split("."), o = i.get(t);
 			if (o && o.dimensions && o.dimensions[a]) {
-				let t = o.dimensions[a], i = f(t.sql, n);
-				r[e] = T`${i}`.as(e);
+				let t = o.dimensions[a], i = l(t.sql, n);
+				r[e] = C`${i}`.as(e);
 			}
 		}
 		if (t.measures) {
@@ -2772,7 +2772,7 @@ var U = class e {
 				let t = e.get(n);
 				if (t && typeof t == "function") {
 					let e = t();
-					r[n] = T`${e}`.as(n);
+					r[n] = C`${e}`.as(n);
 				}
 			}
 		}
@@ -2780,10 +2780,10 @@ var U = class e {
 			let [t, a] = e.dimension.split("."), o = i.get(t);
 			if (o && o.dimensions && o.dimensions[a]) {
 				let t = o.dimensions[a], i = this.buildTimeDimensionExpression(t.sql, e.granularity, n);
-				r[e.dimension] = T`${i}`.as(e.dimension);
+				r[e.dimension] = C`${i}`.as(e.dimension);
 			}
 		}
-		return Object.keys(r).length === 0 && (r.count = pe()), r;
+		return Object.keys(r).length === 0 && (r.count = T()), r;
 	}
 	buildCalculatedMeasure(e, t, n, r, i) {
 		return this.measureBuilder.buildCalculatedMeasure(e, t, n, r, i);
@@ -2829,8 +2829,8 @@ var U = class e {
 				return;
 			}
 		}
-		let c = s.dimensions[o], l = f(c.sql, n), u = this.buildDateRangeCondition(l, e.dateRange);
-		u && i.push(u);
+		let c = s.dimensions[o], u = l(c.sql, n), d = this.buildDateRangeCondition(u, e.dateRange);
+		d && i.push(d);
 	}
 	cubeIsInCTE(e, t) {
 		return !!t?.preAggregationCTEs?.some((t) => t.cube.name === e);
@@ -2843,23 +2843,23 @@ var U = class e {
 		}
 		return i;
 	}
-	processFilter(e, t, r, i, a) {
-		if ("and" in e || "or" in e) {
-			let o = e;
+	processFilter(t, n, r, i, a) {
+		if ("and" in t || "or" in t) {
+			let o = t;
 			if (o.and) {
-				let e = o.and.map((e) => this.processFilter(e, t, r, i, a)).filter((e) => e !== null);
-				return e.length > 0 ? n(...e) : null;
+				let e = o.and.map((e) => this.processFilter(e, n, r, i, a)).filter((e) => e !== null);
+				return e.length > 0 ? w(...e) : null;
 			}
 			if (o.or) {
-				let e = o.or.map((e) => this.processFilter(e, t, r, i, a)).filter((e) => e !== null);
-				return e.length > 0 ? C(...e) : null;
+				let t = o.or.map((e) => this.processFilter(e, n, r, i, a)).filter((e) => e !== null);
+				return t.length > 0 ? e(...t) : null;
 			}
 		}
-		let o = e, [s, c] = o.member.split("."), l = t.get(s);
+		let o = t, [s, c] = o.member.split("."), l = n.get(s);
 		if (!l) return null;
 		let u = l.dimensions[c], d = l.measures[c], f = u || d;
 		if (!f) return null;
-		if (i === "where" && u) return this.processWhereDimensionFilter(e, o, u, f, s, r, a);
+		if (i === "where" && u) return this.processWhereDimensionFilter(t, o, u, f, s, r, a);
 		if (i === "where" && d) return null;
 		if (i === "having" && d) {
 			let e = this.buildHavingMeasureExpression(s, c, d, r, a);
@@ -2874,7 +2874,7 @@ var U = class e {
 			let t = M(e), n = a.filterCache.get(t);
 			if (n) return n;
 		}
-		let c = s ? f(n.sql, a) : typeof n.sql == "function" ? n.sql(a) : n.sql;
+		let c = s ? l(n.sql, a) : typeof n.sql == "function" ? n.sql(a) : n.sql;
 		return this.buildFilterCondition(c, t.operator, t.values, r, t.dateRange);
 	}
 	buildFilterCondition(e, t, n, r, i) {
@@ -2894,12 +2894,12 @@ var U = class e {
 		];
 		if (e.order && Object.keys(e.order).length > 0) for (let [t, i] of Object.entries(e.order)) {
 			if (!r.includes(t)) throw Error(`Cannot order by '${t}': field is not selected in the query`);
-			let e = i === "desc" ? fe(T.identifier(t)) : de(T.identifier(t));
+			let e = i === "desc" ? pe(C.identifier(t)) : fe(C.identifier(t));
 			n.push(e);
 		}
 		if (e.timeDimensions && e.timeDimensions.length > 0) {
 			let t = new Set(Object.keys(e.order || {})), r = [...e.timeDimensions].sort((e, t) => e.dimension.localeCompare(t.dimension));
-			for (let e of r) t.has(e.dimension) || n.push(de(T.identifier(e.dimension)));
+			for (let e of r) t.has(e.dimension) || n.push(fe(C.identifier(e.dimension)));
 		}
 		return n;
 	}
@@ -2945,7 +2945,7 @@ var U = class e {
 		let e = /* @__PURE__ */ new Map();
 		for (let [t, n] of this.cubes) if (n.joins) for (let [, r] of Object.entries(n.joins)) {
 			if (r.relationship === "belongsToMany") continue;
-			let n = o(r.targetCube, this.cubes);
+			let n = h(r.targetCube, this.cubes);
 			if (!n) continue;
 			let i = n.name, a = e.get(i);
 			a || (a = [], e.set(i, a)), a.push({
@@ -2980,7 +2980,7 @@ var U = class e {
 	neighbourSteps(e, t) {
 		let n = [], r = this.cubes.get(e);
 		if (r?.joins) for (let [, t] of Object.entries(r.joins)) {
-			let r = o(t.targetCube, this.cubes);
+			let r = h(t.targetCube, this.cubes);
 			if (!r) continue;
 			let i = r.name;
 			n.push({
@@ -3109,13 +3109,13 @@ var U = class e {
 		}
 		return null;
 	}
-	buildJoinCondition(e, t, r) {
-		let i = [];
-		for (let n of e.on) {
-			let e = t ? T`${T.identifier(t)}.${T.identifier(n.source.name)}` : g(n.source), a = r ? T`${T.identifier(r)}.${T.identifier(n.target.name)}` : g(n.target), o = n.as || x;
-			i.push(o(e, a));
+	buildJoinCondition(e, t, n) {
+		let r = [];
+		for (let i of e.on) {
+			let e = t ? C`${C.identifier(t)}.${C.identifier(i.source.name)}` : m(i.source), a = n ? C`${C.identifier(n)}.${C.identifier(i.target.name)}` : m(i.target), o = i.as || b;
+			r.push(o(e, a));
 		}
-		return n(...i);
+		return w(...r);
 	}
 	getReachableCubes(e) {
 		let t = /* @__PURE__ */ new Set([e]), n = [e];
@@ -3181,35 +3181,35 @@ var yn = class {
 	constructor(e) {
 		this.resolverCache = e;
 	}
-	buildJoinPlan(e, n, r, i, a) {
-		let o = this.resolverCache.get(e), s = [], c = /* @__PURE__ */ new Set([n.name]), l = /* @__PURE__ */ new Set();
-		if (a.measures) for (let e of a.measures) {
+	buildJoinPlan(e, t, n, r, i) {
+		let a = this.resolverCache.get(e), o = [], s = /* @__PURE__ */ new Set([t.name]), c = /* @__PURE__ */ new Set();
+		if (i.measures) for (let e of i.measures) {
 			let [t] = e.split(".");
-			l.add(t);
-		}
-		let u = G(a), d = /* @__PURE__ */ new Set();
-		for (let t of l) t !== n.name && this.findHasManyJoinDef(n, t, e) && d.add(t);
-		let f = r.filter((e) => e !== n.name);
-		for (let r of f) {
-			if (c.has(r)) continue;
-			let i = new Set([...c].filter((e) => !d.has(e))), a = o.findPathPreferring(n.name, r, u, i);
-			if (!a || a.length === 0) throw Error(t("server.errors.noJoinPath", {
-				fromCube: n.name,
-				toCube: r
+			c.add(t);
+		}
+		let l = G(i), u = /* @__PURE__ */ new Set();
+		for (let n of c) n !== t.name && this.findHasManyJoinDef(t, n, e) && u.add(n);
+		let d = n.filter((e) => e !== t.name);
+		for (let n of d) {
+			if (s.has(n)) continue;
+			let r = new Set([...s].filter((e) => !u.has(e))), i = a.findPathPreferring(t.name, n, l, r);
+			if (!i || i.length === 0) throw Error(S("server.errors.noJoinPath", {
+				fromCube: t.name,
+				toCube: n
 			}));
-			for (let { fromCube: n, toCube: r, joinDef: i, reversed: o } of a) {
-				if (c.has(r)) continue;
-				let a = e.get(r);
-				if (!a) throw Error(t("server.errors.cubeNotFound", { cubeName: r }));
-				s.push(this.buildJoinRef(a, r, n, i, o)), c.add(r);
+			for (let { fromCube: t, toCube: n, joinDef: r, reversed: a } of i) {
+				if (s.has(n)) continue;
+				let i = e.get(n);
+				if (!i) throw Error(S("server.errors.cubeNotFound", { cubeName: n }));
+				o.push(this.buildJoinRef(i, n, t, r, a)), s.add(n);
 			}
 		}
-		return s;
+		return o;
 	}
 	buildJoinRef(e, t, n, r, i) {
-		let a = i ? v(r.relationship) : r.relationship;
+		let a = i ? f(r.relationship) : r.relationship;
 		if (a === "belongsToMany" && r.through) {
-			let i = m("belongsToMany", r.sqlJoinType);
+			let i = p("belongsToMany", r.sqlJoinType);
 			return {
 				target: {
 					name: e.name,
@@ -3227,7 +3227,7 @@ var yn = class {
 				}
 			};
 		}
-		let o = m(a, r.sqlJoinType);
+		let o = p(a, r.sqlJoinType);
 		return {
 			target: {
 				name: e.name,
@@ -3242,7 +3242,7 @@ var yn = class {
 	findHasManyJoinDef(e, t, n) {
 		if (!e.joins) return null;
 		for (let [, r] of Object.entries(e.joins)) {
-			let e = o(r.targetCube, n);
+			let e = h(r.targetCube, n);
 			if (e && e.name === t && r.relationship === "hasMany") return r;
 		}
 		return null;
@@ -3293,7 +3293,7 @@ function Sn(e) {
 function Cn(e, t, n) {
 	if (!e.joins) return null;
 	for (let [, r] of Object.entries(e.joins)) {
-		let e = o(r.targetCube, n);
+		let e = h(r.targetCube, n);
 		if (e && e.name === t) return r;
 	}
 	return null;
@@ -3365,7 +3365,7 @@ var En = class {
 		if (l.length === 0) return null;
 		let u = this.resolveCTEJoinKeys(n, r, a, i);
 		if (!u) return null;
-		let { joinKeys: d, intermediateJoins: f } = u, p = this.filterPropagation.findPropagatingFilters(i, a, n), { aggregateMeasures: m, requiredBaseMeasures: h } = V(l, /* @__PURE__ */ new Map([[a.name, a]])), g = [.../* @__PURE__ */ new Set([...m, ...Array.from(h).filter((e) => e.startsWith(a.name + "."))])];
+		let { joinKeys: d, intermediateJoins: f } = u, p = this.filterPropagation.findPropagatingFilters(i, a, n), { aggregateMeasures: m, requiredBaseMeasures: h } = cn(l, /* @__PURE__ */ new Map([[a.name, a]])), g = [.../* @__PURE__ */ new Set([...m, ...Array.from(h).filter((e) => e.startsWith(a.name + "."))])];
 		if (g.length === 0) return null;
 		let _ = this.expandCalculatedMeasureDependencies(a, g), v = this.findDownstreamJoinKeys(a, i, n);
 		return {
@@ -3413,7 +3413,7 @@ var En = class {
 			joinDef: e.joinDef,
 			reversed: e.reversed
 		}));
-		if (!s.slice(0, -1).some((e) => (e.reversed ? v(e.joinDef.relationship) : e.joinDef.relationship) === "hasMany")) return {
+		if (!s.slice(0, -1).some((e) => (e.reversed ? f(e.joinDef.relationship) : e.joinDef.relationship) === "hasMany")) return {
 			path: s,
 			hasIntermediateHasMany: !1,
 			intermediateJoins: [],
@@ -3458,7 +3458,7 @@ var En = class {
 		let r = [], i = Tn(t, e.name);
 		if (!e.joins) return r;
 		for (let [, t] of Object.entries(e.joins)) {
-			let e = o(t.targetCube, n);
+			let e = h(t.targetCube, n);
 			if (!e) continue;
 			let a = e.name;
 			i.has(a) && r.push({
@@ -3518,11 +3518,11 @@ var En = class {
 		for (let a of i) {
 			if (a === t.name) continue;
 			let i = n.get(a);
-			if (i?.joins) for (let [, s] of Object.entries(i.joins)) {
-				let c = o(s.targetCube, n);
-				if (!c || c.name !== t.name || s.relationship !== "hasMany") continue;
-				let l = this.buildPropagatingFilter(e, i, a, s);
-				l && r.push(l);
+			if (i?.joins) for (let [, o] of Object.entries(i.joins)) {
+				let s = h(o.targetCube, n);
+				if (!s || s.name !== t.name || o.relationship !== "hasMany") continue;
+				let c = this.buildPropagatingFilter(e, i, a, o);
+				c && r.push(c);
 			}
 		}
 		return r;
@@ -3696,7 +3696,7 @@ var En = class {
 	}
 	convertInternalPathToJoinPathSteps(e) {
 		return e.map((e) => {
-			let t = e.reversed ? v(e.joinDef.relationship) : e.joinDef.relationship, n = m(t, e.joinDef.sqlJoinType), r = e.joinDef.on.map((e) => ({
+			let t = e.reversed ? f(e.joinDef.relationship) : e.joinDef.relationship, n = p(t, e.joinDef.sqlJoinType), r = e.joinDef.on.map((e) => ({
 				sourceColumn: e.source.name,
 				targetColumn: e.target.name
 			})), i = {
@@ -3787,7 +3787,7 @@ var En = class {
 };
 //#endregion
 //#region src/server/builders/cte-builder.ts
-function K(e, t) {
+function An(e, t) {
 	if (!t.joins) return e;
 	for (let n of t.joins) switch (n.type || "left") {
 		case "left":
@@ -3803,23 +3803,23 @@ function K(e, t) {
 	}
 	return e;
 }
-var An = class {
+var jn = class {
 	queryBuilder;
 	constructor(e) {
 		this.queryBuilder = e;
 	}
-	buildPreAggregationCTE(e, t, r, i, a) {
-		let o = e.cube, s = o.sql(r), c = !!(e.intermediateJoins && e.intermediateJoins.length > 0), l = this.buildCTESelections(e, o, t, r, c);
-		if (Object.keys(l).length === 0) return null;
-		let u = r.db.select(l).from(s.from);
-		u = K(u, s), u = this.applyIntermediateJoins(u, e, r, c);
-		let d = this.buildCTEWhereConditions(e, o, t, r, i, a, s);
-		if (d.length > 0) {
-			let e = d.length === 1 ? d[0] : n(...d);
-			u = u.where(e);
+	buildPreAggregationCTE(e, t, n, r, i) {
+		let a = e.cube, o = a.sql(n), s = !!(e.intermediateJoins && e.intermediateJoins.length > 0), c = this.buildCTESelections(e, a, t, n, s);
+		if (Object.keys(c).length === 0) return null;
+		let l = n.db.select(c).from(o.from);
+		l = An(l, o), l = this.applyIntermediateJoins(l, e, n, s);
+		let u = this.buildCTEWhereConditions(e, a, t, n, r, i, o);
+		if (u.length > 0) {
+			let e = u.length === 1 ? u[0] : w(...u);
+			l = l.where(e);
 		}
-		let f = this.buildCTEGroupByFields(e, o, t, r, c);
-		return f.length > 0 && (u = u.groupBy(...f)), r.db.$with(e.cteAlias).as(u);
+		let d = this.buildCTEGroupByFields(e, a, t, n, s);
+		return d.length > 0 && (l = l.groupBy(...d)), n.db.$with(e.cteAlias).as(l);
 	}
 	buildCTESelections(e, t, n, r, i) {
 		let a = {};
@@ -3833,7 +3833,7 @@ var An = class {
 		}
 		for (let r of t.joinKeys) if (r.targetColumnObj) {
 			e[r.targetColumn] = r.targetColumnObj;
-			for (let [t, i] of Object.entries(n.dimensions || {})) i.sql === r.targetColumnObj && t !== r.targetColumn && (e[t] = T`${r.targetColumnObj}`.as(t));
+			for (let [t, i] of Object.entries(n.dimensions || {})) i.sql === r.targetColumnObj && t !== r.targetColumn && (e[t] = C`${r.targetColumnObj}`.as(t));
 		}
 	}
 	addDownstreamKeySelections(e, t) {
@@ -3843,7 +3843,7 @@ var An = class {
 		let i = /* @__PURE__ */ new Map([[n.name, n]]), a = this.queryBuilder.buildResolvedMeasures(t.measures, i, r);
 		for (let n of t.measures) {
 			let [, t] = n.split("."), r = a.get(n);
-			r && (e[t] = T`${r()}`.as(t));
+			r && (e[t] = C`${r()}`.as(t));
 		}
 	}
 	addDimensionSelections(e, t, n, r) {
@@ -3855,23 +3855,23 @@ var An = class {
 					sql: t.dimensions[o].sql,
 					type: "number"
 				}, r);
-				e[o] = T`${n}`.as(o);
+				e[o] = C`${n}`.as(o);
 			}
 		}
 		for (let a of n.timeDimensions || []) {
 			let [n, o] = a.dimension.split(".");
 			if (n === i && t.dimensions?.[o]) {
 				let n = this.queryBuilder.buildTimeDimensionExpression(t.dimensions[o].sql, a.granularity, r);
-				e[o] = T`${n}`.as(o);
+				e[o] = C`${n}`.as(o);
 			}
 		}
 	}
-	applyIntermediateJoins(e, t, r, i) {
-		if (!i || !t.intermediateJoins) return e;
-		let a = [...t.intermediateJoins].reverse();
-		for (let t of a) {
-			let i = t.cube.sql(r), a = [x(t.cteJoinColumn, t.joinDef.on[0]?.target)];
-			i.where && a.push(i.where), e = e.leftJoin(i.from, n(...a));
+	applyIntermediateJoins(e, t, n, r) {
+		if (!r || !t.intermediateJoins) return e;
+		let i = [...t.intermediateJoins].reverse();
+		for (let t of i) {
+			let r = t.cube.sql(n), i = [b(t.cteJoinColumn, t.joinDef.on[0]?.target)];
+			r.where && i.push(r.where), e = e.leftJoin(r.from, w(...i));
 		}
 		return e;
 	}
@@ -3919,7 +3919,7 @@ var An = class {
 		}, e, i);
 		for (let e of n.dimensions || []) {
 			let [n, i] = e.split(".");
-			n === a && t.dimensions?.[i] && o.push(f(t.dimensions[i].sql, r));
+			n === a && t.dimensions?.[i] && o.push(l(t.dimensions[i].sql, r));
 		}
 		for (let e of n.timeDimensions || []) {
 			let [n, i] = e.dimension.split(".");
@@ -3934,67 +3934,67 @@ var An = class {
 		} else for (let n of t.joinKeys) n.targetColumnObj && e(n.targetColumnObj);
 		if (t.downstreamJoinKeys) for (let n of t.downstreamJoinKeys) for (let t of n.joinKeys) t.sourceColumnObj && e(t.sourceColumnObj);
 	}
-	buildCTEJoinCondition(e, t, r) {
-		let i = r.preAggregationCTEs?.find((t) => t.cube.name === e.cube.name);
-		if (!i) throw Error(`CTE info not found for cube ${e.cube.name}`);
-		let a = [];
-		if (i.intermediateJoins && i.intermediateJoins.length > 0) {
-			let e = i.intermediateJoins[0], n = this.resolveCTEJoinSourceColumn(i.joinKeys[0], i, r), o = T`${T.identifier(t)}.${T.identifier(e.primaryJoinColumn.name)}`;
-			a.push(x(n, o));
-		} else for (let e of i.joinKeys) {
-			let n = this.resolveCTEJoinSourceColumn(e, i, r), o = T`${T.identifier(t)}.${T.identifier(e.targetColumn)}`;
-			a.push(x(n, o));
+	buildCTEJoinCondition(e, t, n) {
+		let r = n.preAggregationCTEs?.find((t) => t.cube.name === e.cube.name);
+		if (!r) throw Error(`CTE info not found for cube ${e.cube.name}`);
+		let i = [];
+		if (r.intermediateJoins && r.intermediateJoins.length > 0) {
+			let e = r.intermediateJoins[0], a = this.resolveCTEJoinSourceColumn(r.joinKeys[0], r, n), o = C`${C.identifier(t)}.${C.identifier(e.primaryJoinColumn.name)}`;
+			i.push(b(a, o));
+		} else for (let e of r.joinKeys) {
+			let a = this.resolveCTEJoinSourceColumn(e, r, n), o = C`${C.identifier(t)}.${C.identifier(e.targetColumn)}`;
+			i.push(b(a, o));
 		}
-		return a.length === 1 ? a[0] : n(...a);
+		return i.length === 1 ? i[0] : w(...i);
 	}
 	resolveCTEJoinSourceColumn(e, t, n) {
 		if (!e) throw Error(`Missing join key while building CTE join condition for '${t.cube.name}'`);
-		let r = e.sourceColumnObj || T.identifier(e.sourceColumn);
+		let r = e.sourceColumnObj || C.identifier(e.sourceColumn);
 		if (!e.sourceColumnObj || !n.preAggregationCTEs) return r;
 		for (let r of n.preAggregationCTEs) if (r.cube.name !== t.cube.name) {
-			for (let [t, n] of Object.entries(r.cube.dimensions || {})) if (typeof n.sql != "function" && n.sql === e.sourceColumnObj) return T`${T.identifier(r.cteAlias)}.${T.identifier(t)}`;
+			for (let [t, n] of Object.entries(r.cube.dimensions || {})) if (typeof n.sql != "function" && n.sql === e.sourceColumnObj) return C`${C.identifier(r.cteAlias)}.${C.identifier(t)}`;
 		}
 		return r;
 	}
 	buildPropagatingFilterSubquery(e, t) {
-		let r = e.sourceCube, i = r.sql(t), a = [];
-		if (i.where && a.push(i.where), e.preBuiltFilterSQL) a.push(e.preBuiltFilterSQL);
+		let n = e.sourceCube, r = n.sql(t), i = [];
+		if (r.where && i.push(r.where), e.preBuiltFilterSQL) i.push(e.preBuiltFilterSQL);
 		else {
-			let n = { filters: e.filters }, i = /* @__PURE__ */ new Map([[r.name, r]]), o = this.queryBuilder.buildWhereConditions(i, n, t);
-			a.push(...o);
+			let r = { filters: e.filters }, a = /* @__PURE__ */ new Map([[n.name, n]]), o = this.queryBuilder.buildWhereConditions(a, r, t);
+			i.push(...o);
 		}
-		if (a.length === 0) return null;
-		let o = a.length === 1 ? a[0] : n(...a), s = e.joinConditions;
-		if (s.length === 1) {
-			let { source: e, target: n } = s[0], r = t.db.select({ pk: e }).from(i.from);
-			return r = K(r, i), r = r.where(o), T`${n} IN ${r}`;
+		if (i.length === 0) return null;
+		let a = i.length === 1 ? i[0] : w(...i), o = e.joinConditions;
+		if (o.length === 1) {
+			let { source: e, target: n } = o[0], i = t.db.select({ pk: e }).from(r.from);
+			return i = An(i, r), i = i.where(a), C`${n} IN ${i}`;
 		}
 		{
-			let e = s.map((e) => x(e.source, e.target)), r = n(...e, o), a = t.db.select({ one: T`1` }).from(i.from);
-			return a = K(a, i), a = a.where(r), T`EXISTS ${a}`;
+			let e = o.map((e) => b(e.source, e.target)), n = w(...e, a), i = t.db.select({ one: C`1` }).from(r.from);
+			return i = An(i, r), i = i.where(n), C`EXISTS ${i}`;
 		}
 	}
 };
 //#endregion
 //#region src/server/execution/annotation-builder.ts
-function jn(e, t) {
-	let n = Mn(e);
+function Mn(e, t) {
+	let n = Nn(e);
 	return {
-		measures: Pn(t, n),
-		dimensions: Fn(t, n),
+		measures: Fn(t, n),
+		dimensions: In(t, n),
 		segments: {},
-		timeDimensions: In(t, n)
+		timeDimensions: Ln(t, n)
 	};
 }
-function Mn(e) {
+function Nn(e) {
 	let t = [e.primaryCube].filter(Boolean);
 	if (e.joinCubes && e.joinCubes.length > 0 && t.push(...e.joinCubes.map((e) => e.cube).filter(Boolean)), e.multiFactMerge?.groups?.length) for (let n of e.multiFactMerge.groups) n.queryPlan.primaryCube && t.push(n.queryPlan.primaryCube), n.queryPlan.joinCubes?.length && t.push(...n.queryPlan.joinCubes.map((e) => e.cube).filter(Boolean));
 	return t;
 }
-function Nn(e, t, n) {
+function Pn(e, t, n) {
 	return e.find((e) => e?.name === t)?.dimensions?.[n];
 }
-function Pn(e, t) {
+function Fn(e, t) {
 	let n = {};
 	if (!e.measures) return n;
 	for (let r of e.measures) {
@@ -4007,11 +4007,11 @@ function Pn(e, t) {
 	}
 	return n;
 }
-function Fn(e, t) {
+function In(e, t) {
 	let n = {};
 	if (!e.dimensions) return n;
 	for (let r of e.dimensions) {
-		let [e, i] = r.split("."), a = Nn(t, e, i);
+		let [e, i] = r.split("."), a = Pn(t, e, i);
 		a && (n[r] = {
 			title: a.title || i,
 			shortTitle: a.title || i,
@@ -4020,11 +4020,11 @@ function Fn(e, t) {
 	}
 	return n;
 }
-function In(e, t) {
+function Ln(e, t) {
 	let n = {};
 	if (!e.timeDimensions) return n;
 	for (let r of e.timeDimensions) {
-		let [e, i] = r.dimension.split("."), a = Nn(t, e, i);
+		let [e, i] = r.dimension.split("."), a = Pn(t, e, i);
 		a && (n[r.dimension] = {
 			title: a.title || i,
 			shortTitle: a.title || i,
@@ -4036,7 +4036,7 @@ function In(e, t) {
 }
 //#endregion
 //#region src/shared/date-utils.ts
-function Ln(e) {
+function Rn(e) {
 	let t = /* @__PURE__ */ new Date(), n = e.toLowerCase().trim(), r = t.getUTCFullYear(), i = t.getUTCMonth(), a = t.getUTCDate(), o = t.getUTCDay();
 	if (n === "today") {
 		let e = new Date(t);
@@ -4151,13 +4151,13 @@ function Ln(e) {
 }
 //#endregion
 //#region src/server/gap-filler.ts
-var Rn = 1e4;
-function zn(e, t, n) {
-	let r = [], i = Bn(new Date(e), n), a = Bn(new Date(t), n);
-	for (; i <= a && r.length < 1e4;) r.push(new Date(i)), i = Vn(i, n);
+var zn = 1e4;
+function Bn(e, t, n) {
+	let r = [], i = Vn(new Date(e), n), a = Vn(new Date(t), n);
+	for (; i <= a && r.length < 1e4;) r.push(new Date(i)), i = Hn(i, n);
 	return r;
 }
-function Bn(e, t) {
+function Vn(e, t) {
 	let n = new Date(e);
 	switch (t) {
 		case "second":
@@ -4189,7 +4189,7 @@ function Bn(e, t) {
 	}
 	return n;
 }
-function Vn(e, t) {
+function Hn(e, t) {
 	let n = new Date(e);
 	switch (t) {
 		case "second":
@@ -4217,68 +4217,68 @@ function Vn(e, t) {
 	}
 	return n;
 }
-function Hn(e, t) {
+function Un(e, t) {
 	let n = null;
 	if (e instanceof Date) n = e;
 	else if (typeof e == "string") {
 		let t = new Date(e);
 		isNaN(t.getTime()) || (n = t);
 	}
-	return !n || isNaN(n.getTime()) ? null : Bn(n, t).toISOString();
+	return !n || isNaN(n.getTime()) ? null : Vn(n, t).toISOString();
 }
-function Un(e, t) {
+function Wn(e, t) {
 	return t.length === 0 ? "__all__" : t.map((t) => String(e[t] ?? "")).join("|||");
 }
-function Wn(e, t) {
-	let { timeDimensionKey: n, granularity: r, dateRange: i, dimensions: a } = t, o = zn(i[0], i[1], r);
+function Gn(e, t) {
+	let { timeDimensionKey: n, granularity: r, dateRange: i, dimensions: a } = t, o = Bn(i[0], i[1], r);
 	if (o.length === 0) return e;
-	if (o.length >= 1e4) return console.warn(`[drizzle-cube] Skipping gap filling for "${n}": the ${r} range exceeds the ${Rn}-bucket limit. Returning unfilled data.`), e;
-	let s = Gn(e, n, r, a), c = [];
+	if (o.length >= 1e4) return console.warn(`[drizzle-cube] Skipping gap filling for "${n}": the ${r} range exceeds the ${zn}-bucket limit. Returning unfilled data.`), e;
+	let s = Kn(e, n, r, a), c = [];
 	for (let [e, n] of s) {
 		let e = n.size > 0 ? n.values().next().value : null;
 		for (let r of o) {
 			let i = r.toISOString(), a = n.get(i);
-			c.push(a ?? Kn(i, e ?? null, t));
+			c.push(a ?? qn(i, e ?? null, t));
 		}
 	}
 	return c;
 }
-function Gn(e, t, n, r) {
+function Kn(e, t, n, r) {
 	let i = /* @__PURE__ */ new Map();
 	for (let a of e) {
-		let e = Un(a, r), o = Hn(a[t], n) ?? String(a[t]), s = i.get(e);
+		let e = Wn(a, r), o = Un(a[t], n) ?? String(a[t]), s = i.get(e);
 		s || (s = /* @__PURE__ */ new Map(), i.set(e, s)), s.set(o, a);
 	}
 	return i.size === 0 && r.length === 0 && i.set("__all__", /* @__PURE__ */ new Map()), i;
 }
-function Kn(e, t, n) {
+function qn(e, t, n) {
 	let { timeDimensionKey: r, fillValue: i, measures: a, dimensions: o } = n, s = { [r]: e };
 	if (t) for (let e of o) s[e] = t[e];
 	for (let e of a) s[e] = i;
 	return s;
 }
-function q(e) {
+function K(e) {
 	if (!e) return null;
 	if (Array.isArray(e)) {
 		if (e.length < 2) return null;
 		let t = new Date(e[0]), n = new Date(e[1]);
 		return isNaN(t.getTime()) || isNaN(n.getTime()) ? null : [t, n];
 	}
-	let t = Ln(e);
+	let t = Rn(e);
 	if (t) return [t.start, t.end];
 	let n = new Date(e);
 	return isNaN(n.getTime()) ? null : [n, n];
 }
-function qn(e, t, n) {
+function Jn(e, t, n) {
 	if (!t.timeDimensions || t.timeDimensions.length === 0) return e;
 	let r = t.timeDimensions.filter((e) => {
-		let n = e.fillMissingDates !== !1, r = !!e.granularity, i = e.dateRange || J(e.dimension, t.filters);
+		let n = e.fillMissingDates !== !1, r = !!e.granularity, i = e.dateRange || q(e.dimension, t.filters);
 		return n && r && i;
 	});
 	if (r.length === 0) return e;
 	let i = t.fillMissingDatesValue === void 0 ? 0 : t.fillMissingDatesValue, a = new Set(t.timeDimensions.map((e) => e.dimension)), o = (t.dimensions || []).filter((e) => !a.has(e)), s = e;
 	for (let e of r) {
-		let r = q(e.dateRange) || Jn(e.dimension, t.filters);
+		let r = K(e.dateRange) || Yn(e.dimension, t.filters);
 		if (!r) continue;
 		let a = {
 			timeDimensionKey: e.dimension,
@@ -4288,44 +4288,44 @@ function qn(e, t, n) {
 			measures: n,
 			dimensions: o
 		};
-		s = Wn(s, a);
+		s = Gn(s, a);
 	}
 	return s;
 }
-function J(e, t) {
+function q(e, t) {
 	if (!t) return null;
 	for (let n of t) {
 		if ("member" in n && "operator" in n && n.member === e && n.operator === "inDateRange") return n;
 		if ("and" in n && n.and) {
-			let t = J(e, n.and);
+			let t = q(e, n.and);
 			if (t) return t;
 		}
 		if ("or" in n && n.or) {
-			let t = J(e, n.or);
+			let t = q(e, n.or);
 			if (t) return t;
 		}
 	}
 	return null;
 }
-function Jn(e, t) {
-	let n = J(e, t);
+function Yn(e, t) {
+	let n = q(e, t);
 	if (!n) return null;
 	if (n.dateRange) {
-		let e = q(n.dateRange);
+		let e = K(n.dateRange);
 		if (e) return e;
 	}
 	let r = n.values;
 	if (!r || r.length === 0) return null;
 	if (r.length === 1 && typeof r[0] == "string") {
-		let e = Ln(r[0]);
-		return e ? [e.start, e.end] : q(r);
+		let e = Rn(r[0]);
+		return e ? [e.start, e.end] : K(r);
 	}
-	return r.length >= 2 ? q(r) : null;
+	return r.length >= 2 ? K(r) : null;
 }
 //#endregion
 //#region src/server/execution/result-post-processor.ts
-function Yn(e, t, n) {
-	return qn(Array.isArray(e) ? e.map((e) => {
+function Xn(e, t, n) {
+	return Jn(Array.isArray(e) ? e.map((e) => {
 		let r = { ...e };
 		if (t.timeDimensions) {
 			for (let e of t.timeDimensions) if (e.dimension in r) {
@@ -4342,7 +4342,7 @@ function Yn(e, t, n) {
 }
 //#endregion
 //#region src/server/execution/filter-cache-preloader.ts
-var Xn = class {
+var Zn = class {
 	queryBuilder;
 	constructor(e) {
 		this.queryBuilder = e;
@@ -4364,8 +4364,8 @@ var Xn = class {
 			"arrayOverlaps",
 			"arrayContained"
 		].includes(e.operator)) return;
-		let o = l(a, r), s = this.queryBuilder.buildFilterConditionPublic(o, e.operator, e.values, a, e.dateRange);
-		s && t.set(i, s);
+		let s = o(a, r), c = this.queryBuilder.buildFilterConditionPublic(s, e.operator, e.values, a, e.dateRange);
+		c && t.set(i, c);
 	}
 	preloadTimeDimensionFilter(e, t, n, r) {
 		if (!e.dateRange) return;
@@ -4373,78 +4373,78 @@ var Xn = class {
 		if (t.has(i)) return;
 		let a = this.resolveMemberDimension(e.dimension, n);
 		if (!a) return;
-		let o = f(a.sql, r), s = this.queryBuilder.buildDateRangeCondition(o, e.dateRange);
+		let o = l(a.sql, r), s = this.queryBuilder.buildDateRangeCondition(o, e.dateRange);
 		s && t.set(i, s);
 	}
-}, Zn = class {
+}, Qn = class {
 	builders;
 	constructor(e) {
 		this.builders = e;
 	}
 	resolveMode(e) {
-		let n = [];
-		if (this.builders.comparison.hasComparison(e) && n.push("comparison"), this.builders.funnel.hasFunnel(e) && n.push("funnel"), this.builders.flow.hasFlow(e) && n.push("flow"), this.builders.retention.hasRetention(e) && n.push("retention"), n.length === 0) return "regular";
-		if (n.length > 1) throw Error(t("server.errors.queryContainsMultipleModes", { modes: n.join(", ") }));
-		return n[0];
-	}
-	validateForMode(e, n, i) {
-		let a = () => {
-			let e = le(n, i);
-			if (!e.isValid) throw new r(t("server.errors.queryValidationFailed", { errors: e.errors.join(", ") }), e.issues);
+		let t = [];
+		if (this.builders.comparison.hasComparison(e) && t.push("comparison"), this.builders.funnel.hasFunnel(e) && t.push("funnel"), this.builders.flow.hasFlow(e) && t.push("flow"), this.builders.retention.hasRetention(e) && t.push("retention"), t.length === 0) return "regular";
+		if (t.length > 1) throw Error(S("server.errors.queryContainsMultipleModes", { modes: t.join(", ") }));
+		return t[0];
+	}
+	validateForMode(e, t, n) {
+		let i = () => {
+			let e = r(t, n);
+			if (!e.isValid) throw new v(S("server.errors.queryValidationFailed", { errors: e.errors.join(", ") }), e.issues);
 		};
 		({
-			regular: a,
-			comparison: a,
+			regular: i,
+			comparison: i,
 			funnel: () => {
-				let e = this.builders.funnel.validateConfig(i.funnel, n);
-				if (!e.isValid) throw Error(t("server.errors.funnelValidationFailed", { errors: e.errors.join(", ") }));
+				let e = this.builders.funnel.validateConfig(n.funnel, t);
+				if (!e.isValid) throw Error(S("server.errors.funnelValidationFailed", { errors: e.errors.join(", ") }));
 			},
 			flow: () => {
-				let e = this.builders.flow.validateConfig(i.flow, n);
-				if (!e.isValid) throw Error(t("server.errors.flowValidationFailed", { errors: e.errors.join(", ") }));
+				let e = this.builders.flow.validateConfig(n.flow, t);
+				if (!e.isValid) throw Error(S("server.errors.flowValidationFailed", { errors: e.errors.join(", ") }));
 			},
 			retention: () => {
-				let e = this.builders.retention.validateConfig(i.retention, n);
-				if (!e.isValid) throw Error(t("server.errors.retentionValidationFailed", { errors: e.errors.join(", ") }));
+				let e = this.builders.retention.validateConfig(n.retention, t);
+				if (!e.isValid) throw Error(S("server.errors.retentionValidationFailed", { errors: e.errors.join(", ") }));
 			}
-		})[ue(e)]();
+		})[_(e)]();
 	}
 };
 //#endregion
 //#region src/server/cache-utils.ts
-function Qn(e, t, n = {}, r) {
-	let i = n.keyPrefix ?? "drizzle-cube:", a = $n(e), o = `${i}query:${ir(JSON.stringify(a))}`;
+function $n(e, t, n = {}, r) {
+	let i = n.keyPrefix ?? "drizzle-cube:", a = er(e), o = `${i}query:${ar(JSON.stringify(a))}`;
 	if (n.includeSecurityContext !== !1) {
-		let e = ir(n.securityContextSerializer ? n.securityContextSerializer(t) : JSON.stringify(X(t)));
+		let e = ar(n.securityContextSerializer ? n.securityContextSerializer(t) : JSON.stringify(Y(t)));
 		o += `:ctx:${e}`;
 	}
 	return r && (o += `:cubes:${r}`), o;
 }
-function $n(e) {
+function er(e) {
 	return {
 		measures: e.measures ? [...e.measures].sort() : void 0,
 		dimensions: e.dimensions ? [...e.dimensions].sort() : void 0,
-		filters: e.filters ? Y(e.filters) : void 0,
-		timeDimensions: e.timeDimensions ? rr(e.timeDimensions) : void 0,
+		filters: e.filters ? J(e.filters) : void 0,
+		timeDimensions: e.timeDimensions ? ir(e.timeDimensions) : void 0,
 		limit: e.limit,
 		offset: e.offset,
-		order: e.order ? X(e.order) : void 0,
+		order: e.order ? Y(e.order) : void 0,
 		fillMissingDatesValue: e.fillMissingDatesValue,
 		ungrouped: e.ungrouped,
 		total: e.total,
-		funnel: e.funnel ? er(e.funnel) : void 0,
-		flow: e.flow ? tr(e.flow) : void 0,
-		retention: e.retention ? nr(e.retention) : void 0
+		funnel: e.funnel ? tr(e.funnel) : void 0,
+		flow: e.flow ? nr(e.flow) : void 0,
+		retention: e.retention ? rr(e.retention) : void 0
 	};
 }
-function er(e) {
+function tr(e) {
 	return {
 		bindingKey: e.bindingKey,
 		timeDimension: e.timeDimension,
 		steps: e.steps.map((e) => {
 			let t = {
 				name: e.name,
-				filter: e.filter ? Array.isArray(e.filter) ? Y(e.filter) : Y([e.filter])[0] : void 0,
+				filter: e.filter ? Array.isArray(e.filter) ? J(e.filter) : J([e.filter])[0] : void 0,
 				timeToConvert: e.timeToConvert
 			};
 			return "cube" in e && e.cube && (t.cube = e.cube), t;
@@ -4453,14 +4453,14 @@ function er(e) {
 		globalTimeWindow: e.globalTimeWindow
 	};
 }
-function tr(e) {
+function nr(e) {
 	return {
 		bindingKey: e.bindingKey,
 		timeDimension: e.timeDimension,
 		eventDimension: e.eventDimension,
 		startingStep: {
 			name: e.startingStep.name,
-			filter: e.startingStep.filter ? Array.isArray(e.startingStep.filter) ? Y(e.startingStep.filter) : Y([e.startingStep.filter])[0] : void 0
+			filter: e.startingStep.filter ? Array.isArray(e.startingStep.filter) ? J(e.startingStep.filter) : J([e.startingStep.filter])[0] : void 0
 		},
 		stepsBefore: e.stepsBefore,
 		stepsAfter: e.stepsAfter,
@@ -4469,7 +4469,7 @@ function tr(e) {
 		joinStrategy: e.joinStrategy
 	};
 }
-function nr(e) {
+function rr(e) {
 	return {
 		timeDimension: e.timeDimension,
 		bindingKey: e.bindingKey,
@@ -4477,15 +4477,15 @@ function nr(e) {
 		granularity: e.granularity,
 		periods: e.periods,
 		retentionType: e.retentionType,
-		cohortFilters: e.cohortFilters ? Array.isArray(e.cohortFilters) ? Y(e.cohortFilters) : Y([e.cohortFilters])[0] : void 0,
-		activityFilters: e.activityFilters ? Array.isArray(e.activityFilters) ? Y(e.activityFilters) : Y([e.activityFilters])[0] : void 0,
+		cohortFilters: e.cohortFilters ? Array.isArray(e.cohortFilters) ? J(e.cohortFilters) : J([e.cohortFilters])[0] : void 0,
+		activityFilters: e.activityFilters ? Array.isArray(e.activityFilters) ? J(e.activityFilters) : J([e.activityFilters])[0] : void 0,
 		breakdownDimensions: e.breakdownDimensions
 	};
 }
-function Y(e) {
+function J(e) {
 	return [...e].map((e) => {
-		if ("and" in e && e.and) return { and: Y(e.and) };
-		if ("or" in e && e.or) return { or: Y(e.or) };
+		if ("and" in e && e.and) return { and: J(e.and) };
+		if ("or" in e && e.or) return { or: J(e.or) };
 		let t = e;
 		return {
 			...t,
@@ -4493,7 +4493,7 @@ function Y(e) {
 		};
 	}).sort((e, t) => JSON.stringify(e).localeCompare(JSON.stringify(t)));
 }
-function rr(e) {
+function ir(e) {
 	return [...e].map((e) => ({
 		dimension: e.dimension,
 		granularity: e.granularity,
@@ -4505,10 +4505,10 @@ function rr(e) {
 		}) : void 0
 	})).sort((e, t) => e.dimension.localeCompare(t.dimension));
 }
-function X(e) {
-	return typeof e != "object" || !e ? e : Array.isArray(e) ? e.map(X) : Object.keys(e).sort().reduce((t, n) => (t[n] = X(e[n]), t), {});
+function Y(e) {
+	return typeof e != "object" || !e ? e : Array.isArray(e) ? e.map(Y) : Object.keys(e).sort().reduce((t, n) => (t[n] = Y(e[n]), t), {});
 }
-function ir(e) {
+function ar(e) {
 	let t = 2166136261, n = 2246822519, r = 3266489917, i = 668265263, a = 16777619;
 	for (let o = 0; o < e.length; o++) {
 		let s = e.charCodeAt(o);
@@ -4518,13 +4518,13 @@ function ir(e) {
 }
 //#endregion
 //#region src/server/execution/query-result-cache.ts
-var ar = class {
+var or = class {
 	cacheConfig;
 	constructor(e) {
 		this.cacheConfig = e;
 	}
 	generateKey(e, t, n) {
-		if (this.cacheConfig?.enabled !== !1 && this.cacheConfig?.provider) return Qn(e, t, this.cacheConfig, n);
+		if (this.cacheConfig?.enabled !== !1 && this.cacheConfig?.provider) return $n(e, t, this.cacheConfig, n);
 	}
 	async lookup(e, t) {
 		if (!(!e || !this.cacheConfig?.provider)) {
@@ -4578,13 +4578,13 @@ var ar = class {
 			this.cacheConfig.onError?.(e, "set");
 		}
 	}
-}, or = class {
+}, sr = class {
 	dateTimeBuilder;
 	constructor(e) {
 		this.dateTimeBuilder = new I(e);
 	}
 	hasComparison(e) {
-		return b(e);
+		return ue(e);
 	}
 	getComparisonTimeDimension(e) {
 		return e.timeDimensions?.find((e) => e.compareDateRange && e.compareDateRange.length >= 2);
@@ -4709,7 +4709,7 @@ var ar = class {
 			return typeof i == "string" && typeof a == "string" ? new Date(i).getTime() - new Date(a).getTime() : 0;
 		});
 	}
-}, sr = class {
+}, cr = class {
 	databaseAdapter;
 	filterBuilder;
 	dateTimeBuilder;
@@ -4717,93 +4717,93 @@ var ar = class {
 		this.databaseAdapter = e, this.dateTimeBuilder = new I(e), this.filterBuilder = new B(e, this.dateTimeBuilder);
 	}
 	hasFunnel(e) {
-		return i(e);
+		return a(e);
 	}
-	validateConfig(e, n) {
-		let r = [];
-		e.steps.length < 2 && r.push(t("server.validation.funnel.minSteps")), this.validateBindingKey(e, n, r), this.validateTimeDimension(e, n, r);
-		for (let t = 0; t < e.steps.length; t++) this.validateStep(e, e.steps[t], t, n, r);
+	validateConfig(e, t) {
+		let n = [];
+		e.steps.length < 2 && n.push(S("server.validation.funnel.minSteps")), this.validateBindingKey(e, t, n), this.validateTimeDimension(e, t, n);
+		for (let r = 0; r < e.steps.length; r++) this.validateStep(e, e.steps[r], r, t, n);
 		return {
-			isValid: r.length === 0,
-			errors: r
+			isValid: n.length === 0,
+			errors: n
 		};
 	}
-	validateBindingKey(e, n, r) {
+	validateBindingKey(e, t, n) {
 		if (typeof e.bindingKey == "string") {
-			let [i, a] = e.bindingKey.split(".");
-			if (!i || !a) {
-				r.push(t("server.validation.funnel.invalidBindingKeyFormat", { bindingKey: e.bindingKey }));
+			let [r, i] = e.bindingKey.split(".");
+			if (!r || !i) {
+				n.push(S("server.validation.funnel.invalidBindingKeyFormat", { bindingKey: e.bindingKey }));
 				return;
 			}
-			let o = n.get(i);
-			o ? o.dimensions?.[a] || r.push(t("server.validation.funnel.bindingKeyDimNotFound", {
-				dimName: a,
-				cubeName: i
-			})) : r.push(t("server.validation.funnel.bindingKeyCubeNotFound", { cubeName: i }));
+			let a = t.get(r);
+			a ? a.dimensions?.[i] || n.push(S("server.validation.funnel.bindingKeyDimNotFound", {
+				dimName: i,
+				cubeName: r
+			})) : n.push(S("server.validation.funnel.bindingKeyCubeNotFound", { cubeName: r }));
 			return;
 		}
-		if (Array.isArray(e.bindingKey)) for (let i of e.bindingKey) {
-			let e = n.get(i.cube);
+		if (Array.isArray(e.bindingKey)) for (let r of e.bindingKey) {
+			let e = t.get(r.cube);
 			if (!e) {
-				r.push(t("server.validation.funnel.bindingKeyMappingCubeNotFound", { cubeName: i.cube }));
+				n.push(S("server.validation.funnel.bindingKeyMappingCubeNotFound", { cubeName: r.cube }));
 				continue;
 			}
-			let [, a] = i.dimension.split(".");
-			e.dimensions?.[a] || r.push(t("server.validation.funnel.bindingKeyDimNotFound", {
-				dimName: a,
-				cubeName: i.cube
+			let [, i] = r.dimension.split(".");
+			e.dimensions?.[i] || n.push(S("server.validation.funnel.bindingKeyDimNotFound", {
+				dimName: i,
+				cubeName: r.cube
 			}));
 		}
 	}
-	validateTimeDimension(e, n, r) {
+	validateTimeDimension(e, t, n) {
 		if (typeof e.timeDimension != "string") return;
-		let [i, a] = e.timeDimension.split(".");
-		if (!i || !a) {
-			r.push(t("server.validation.funnel.invalidTimeDimFormat", { timeDimension: e.timeDimension }));
+		let [r, i] = e.timeDimension.split(".");
+		if (!r || !i) {
+			n.push(S("server.validation.funnel.invalidTimeDimFormat", { timeDimension: e.timeDimension }));
 			return;
 		}
-		let o = n.get(i);
-		o ? o.dimensions?.[a] || r.push(t("server.validation.funnel.timeDimNotFound", {
-			dimName: a,
-			cubeName: i
-		})) : r.push(t("server.validation.funnel.timeDimCubeNotFound", { cubeName: i }));
-	}
-	validateStep(e, n, r, i, a) {
-		n.name || a.push(t("server.validation.funnel.stepMustHaveName", { step: r })), "cube" in n && n.cube && !i.get(n.cube) && a.push(t("server.validation.funnel.stepCubeNotFound", {
-			step: r,
-			cube: n.cube
-		})), n.filter && this.validateStepFilters(e, n, r, i, a), n.timeToConvert && r > 0 && (/^P(?:\d+Y)?(?:\d+M)?(?:\d+D)?(?:T(?:\d+H)?(?:\d+M)?(?:\d+(?:\.\d+)?S)?)?$/.test(n.timeToConvert) || a.push(t("server.validation.funnel.stepTimeToConvertFormat", {
-			step: r,
-			value: n.timeToConvert
+		let a = t.get(r);
+		a ? a.dimensions?.[i] || n.push(S("server.validation.funnel.timeDimNotFound", {
+			dimName: i,
+			cubeName: r
+		})) : n.push(S("server.validation.funnel.timeDimCubeNotFound", { cubeName: r }));
+	}
+	validateStep(e, t, n, r, i) {
+		t.name || i.push(S("server.validation.funnel.stepMustHaveName", { step: n })), "cube" in t && t.cube && !r.get(t.cube) && i.push(S("server.validation.funnel.stepCubeNotFound", {
+			step: n,
+			cube: t.cube
+		})), t.filter && this.validateStepFilters(e, t, n, r, i), t.timeToConvert && n > 0 && (/^P(?:\d+Y)?(?:\d+M)?(?:\d+D)?(?:T(?:\d+H)?(?:\d+M)?(?:\d+(?:\.\d+)?S)?)?$/.test(t.timeToConvert) || i.push(S("server.validation.funnel.stepTimeToConvertFormat", {
+			step: n,
+			value: t.timeToConvert
 		})));
 	}
-	validateStepFilters(e, n, r, i, a) {
-		let o;
-		"cube" in n && n.cube ? o = n.cube : typeof e.bindingKey == "string" && ([o] = e.bindingKey.split("."));
-		let s = o ? new W(i) : null, c = Array.isArray(n.filter) ? n.filter : [n.filter];
-		for (let e of c) {
+	validateStepFilters(e, t, n, r, i) {
+		let a;
+		"cube" in t && t.cube ? a = t.cube : typeof e.bindingKey == "string" && ([a] = e.bindingKey.split("."));
+		let o = a ? new W(r) : null, s = Array.isArray(t.filter) ? t.filter : [t.filter];
+		for (let e of s) {
 			if (!("member" in e)) continue;
-			let [n, c] = e.member.split("."), l = i.get(n);
-			if (!l) {
-				a.push(t("server.validation.funnel.stepFilterCubeNotFound", {
-					step: r,
-					cubeName: n
+			let [t, s] = e.member.split("."), c = r.get(t);
+			if (!c) {
+				i.push(S("server.validation.funnel.stepFilterCubeNotFound", {
+					step: n,
+					cubeName: t
 				}));
 				continue;
 			}
-			if (l.dimensions?.[c] || (l.measures?.[c] ? a.push(t("server.validation.funnel.stepFilterIsMeasure", {
-				step: r,
-				member: `${n}.${c}`
-			})) : a.push(t("server.validation.funnel.stepFilterMemberNotFound", {
-				step: r,
-				field: c,
-				cubeName: n
-			}))), o && n !== o && s) {
-				let e = s.findPath(o, n);
-				(!e || e.length === 0) && a.push(t("server.validation.funnel.stepFilterNoJoinPath", {
-					step: r,
-					member: `${n}.${c}`,
-					stepCube: o
+			if (c.dimensions?.[s] || (c.measures?.[s] ? i.push(S("server.validation.funnel.stepFilterIsMeasure", {
+				step: n,
+				member: `${t}.${s}`
+			})) : i.push(S("server.validation.funnel.stepFilterMemberNotFound", {
+				step: n,
+				field: s,
+				cubeName: t
+			}))), a && t !== a && o) {
+				let e = o.findPath(a, t);
+				(!e || e.length === 0) && i.push(S("server.validation.funnel.stepFilterNoJoinPath", {
+					step: n,
+					member: `${t}.${s}`,
+					stepCube: a
 				}));
 			}
 		}
@@ -4882,18 +4882,18 @@ var ar = class {
 			};
 		});
 	}
-	resolveCubeForStep(e, n, r) {
+	resolveCubeForStep(e, t, n) {
 		if ("cube" in e && e.cube) {
-			let n = r.get(e.cube);
-			if (!n) throw Error(t("server.errors.funnel.cubeNotFoundForStep", { cube: e.cube }));
-			return n;
+			let t = n.get(e.cube);
+			if (!t) throw Error(S("server.errors.funnel.cubeNotFoundForStep", { cube: e.cube }));
+			return t;
 		}
-		if (typeof n.bindingKey == "string") {
-			let [e] = n.bindingKey.split("."), i = r.get(e);
-			if (!i) throw Error(t("server.errors.funnel.cubeNotFoundForBindingKey", { bindingKey: n.bindingKey }));
-			return i;
+		if (typeof t.bindingKey == "string") {
+			let [e] = t.bindingKey.split("."), r = n.get(e);
+			if (!r) throw Error(S("server.errors.funnel.cubeNotFoundForBindingKey", { bindingKey: t.bindingKey }));
+			return r;
 		}
-		throw Error(t("server.errors.funnel.cannotResolveCubeForStep"));
+		throw Error(S("server.errors.funnel.cannotResolveCubeForStep"));
 	}
 	resolveBindingKey(e, t, n) {
 		return tn(e.bindingKey, t, n, $t("server.errors.funnel"));
@@ -4914,33 +4914,33 @@ var ar = class {
 		let i = "and" in e || "or" in e, a = z(e);
 		return i || a ? this.buildLogicalFilterCondition(e, a, t, n, r) : this.buildSimpleFilterCondition(e, t, n, r);
 	}
-	buildLogicalFilterCondition(e, t, r, i, a) {
-		let o, s;
-		if (t) o = t.isAnd, s = t.filters;
+	buildLogicalFilterCondition(e, t, n, r, i) {
+		let a, o;
+		if (t) a = t.isAnd, o = t.filters;
 		else {
 			let t = e;
-			o = "and" in t && !!t.and, s = t.and || t.or || [];
+			a = "and" in t && !!t.and, o = t.and || t.or || [];
 		}
-		let c = [];
-		for (let e of s) {
-			let t = this.buildFilterCondition(e, r, i, a);
-			t && c.push(t);
+		let s = [];
+		for (let e of o) {
+			let t = this.buildFilterCondition(e, n, r, i);
+			t && s.push(t);
 		}
-		return c.length === 0 ? null : c.length === 1 ? c[0] : o ? n(...c) : T`(${T.join(c, T` OR `)})`;
+		return s.length === 0 ? null : s.length === 1 ? s[0] : a ? w(...s) : C`(${C.join(s, C` OR `)})`;
 	}
 	buildSimpleFilterCondition(e, t, n, r) {
-		let [i, a] = e.member.split("."), o = e.dateRange !== void 0;
-		if (e.operator !== "set" && e.operator !== "notSet" && !o && (!e.values || e.values.length === 0 || e.values[0] === void 0 || e.values[0] === "")) return null;
-		let s = n.get(i);
-		if (!s) return null;
+		let [i, a] = e.member.split("."), s = e.dateRange !== void 0;
+		if (e.operator !== "set" && e.operator !== "notSet" && !s && (!e.values || e.values.length === 0 || e.values[0] === void 0 || e.values[0] === "")) return null;
+		let c = n.get(i);
+		if (!c) return null;
 		if (i !== t.name) {
 			let e = new W(n).findPath(t.name, i);
 			if (!e || e.length === 0) return null;
 		}
-		let c = s.dimensions?.[a];
-		if (!c) return null;
-		let u = l(c, r);
-		return this.filterBuilder.buildFilterCondition(u, e.operator, e.values || [], c, e.dateRange);
+		let l = c.dimensions?.[a];
+		if (!l) return null;
+		let u = o(l, r);
+		return this.filterBuilder.buildFilterCondition(u, e.operator, e.values || [], l, e.dateRange);
 	}
 	buildStepCTE(e, t, n) {
 		return e.index === 0 ? this.buildFirstStepCTE(e, t) : this.buildSubsequentStepCTE(e, t, n);
@@ -4949,31 +4949,31 @@ var ar = class {
 		let n = `step_${e.index}`, r = e.cube.sql(t), i = [];
 		r.where && i.push(r.where), i.push(...e.filterConditions);
 		let a = t.db.select({
-			binding_key: T`${e.bindingKeyExpr}`.as("binding_key"),
-			step_time: T`MIN(${e.timeExpr})`.as("step_time")
+			binding_key: C`${e.bindingKeyExpr}`.as("binding_key"),
+			step_time: C`MIN(${e.timeExpr})`.as("step_time")
 		}).from(r.from);
 		return a = this.addCrossJoinsToQuery(a, e, t, i), i.length > 0 && (a = a.where(R(i))), a = a.groupBy(e.bindingKeyExpr), t.db.$with(n).as(a);
 	}
 	buildSubsequentStepCTE(e, t, n) {
 		let r = `step_${e.index}`, i = `step_${e.index - 1}`, a = e.cube.sql(t), o = [];
 		a.where && o.push(a.where), o.push(...e.filterConditions);
-		let s = T`${T.identifier(i)}.step_time`, c = T`${e.timeExpr} > ${s}`;
+		let s = C`${C.identifier(i)}.step_time`, c = C`${e.timeExpr} > ${s}`;
 		if (e.timeToConvert) {
 			let t = this.databaseAdapter.buildDateAddInterval(s, e.timeToConvert);
-			c = T`${c} AND ${e.timeExpr} <= ${t}`;
+			c = C`${c} AND ${e.timeExpr} <= ${t}`;
 		}
 		o.push(c);
 		let l = t.db.select({
-			binding_key: T`${e.bindingKeyExpr}`.as("binding_key"),
-			step_time: T`MIN(${e.timeExpr})`.as("step_time")
-		}).from(a.from).innerJoin(n, T`${e.bindingKeyExpr} = ${T.identifier(i)}.binding_key`);
+			binding_key: C`${e.bindingKeyExpr}`.as("binding_key"),
+			step_time: C`MIN(${e.timeExpr})`.as("step_time")
+		}).from(a.from).innerJoin(n, C`${e.bindingKeyExpr} = ${C.identifier(i)}.binding_key`);
 		return l = this.addCrossJoinsToQuery(l, e, t, o), o.length > 0 && (l = l.where(R(o))), l = l.groupBy(e.bindingKeyExpr), t.db.$with(r).as(l);
 	}
 	addCrossJoinsToQuery(e, t, n, r) {
 		if (t.joinedCubes.length === 0) return e;
 		for (let i of t.joinedCubes) for (let t of i.joinPath) {
 			let a = t.joinDef, o = [];
-			for (let e of a.on) e.as ? o.push(e.as(e.source, e.target)) : o.push(x(e.source, e.target));
+			for (let e of a.on) e.as ? o.push(e.as(e.source, e.target)) : o.push(b(e.source, e.target));
 			let s = R(o), c = i.cube.sql(n);
 			e = e.leftJoin(c.from, s), c.where && r.push(c.where);
 		}
@@ -4981,33 +4981,33 @@ var ar = class {
 	}
 	buildFunnelResultsCTE(e, t, n, r) {
 		let i = {
-			binding_key: T`s0.binding_key`,
-			step_0_time: T`s0.step_time`
+			binding_key: C`s0.binding_key`,
+			step_0_time: C`s0.step_time`
 		};
-		for (let e = 1; e < t.length; e++) i[`step_${e}_time`] = T`s${T.raw(String(e))}.step_time`;
-		let a = T`${T.identifier("step_0")} s0`;
-		for (let e = 1; e < t.length; e++) a = T`${a}
-      LEFT JOIN ${T.identifier(`step_${e}`)} s${T.raw(String(e))} ON s0.binding_key = s${T.raw(String(e))}.binding_key`;
-		let o = Object.entries(i).map(([e, t]) => T`${t} AS ${T.identifier(e)}`), s = T`SELECT ${T.join(o, T`, `)} FROM ${a}`;
+		for (let e = 1; e < t.length; e++) i[`step_${e}_time`] = C`s${C.raw(String(e))}.step_time`;
+		let a = C`${C.identifier("step_0")} s0`;
+		for (let e = 1; e < t.length; e++) a = C`${a}
+      LEFT JOIN ${C.identifier(`step_${e}`)} s${C.raw(String(e))} ON s0.binding_key = s${C.raw(String(e))}.binding_key`;
+		let o = Object.entries(i).map(([e, t]) => C`${t} AS ${C.identifier(e)}`), s = C`SELECT ${C.join(o, C`, `)} FROM ${a}`;
 		return r.db.$with("funnel_joined").as(s);
 	}
 	buildAggregationCTE(e, t, n, r, i) {
 		let a = {};
-		a.step_0_count = T`COUNT(*)`.as("step_0_count");
-		for (let e = 1; e < n.length; e++) a[`step_${e}_count`] = T`COUNT(${T.identifier(`step_${e}_time`)})`.as(`step_${e}_count`);
+		a.step_0_count = C`COUNT(*)`.as("step_0_count");
+		for (let e = 1; e < n.length; e++) a[`step_${e}_count`] = C`COUNT(${C.identifier(`step_${e}_time`)})`.as(`step_${e}_count`);
 		if (r.includeTimeMetrics) for (let e = 1; e < n.length; e++) {
-			let t = T.identifier(`step_${e}_time`), n = T.identifier(`step_${e - 1}_time`), r = this.databaseAdapter.buildTimeDifferenceSeconds(T`${t}`, T`${n}`), i = T`${t} IS NOT NULL`;
+			let t = C.identifier(`step_${e}_time`), n = C.identifier(`step_${e - 1}_time`), r = this.databaseAdapter.buildTimeDifferenceSeconds(C`${t}`, C`${n}`), i = C`${t} IS NOT NULL`;
 			if (a[`step_${e}_avg_seconds`] = this.databaseAdapter.buildConditionalAggregation("avg", r, i).as(`step_${e}_avg_seconds`), a[`step_${e}_min_seconds`] = this.databaseAdapter.buildConditionalAggregation("min", r, i).as(`step_${e}_min_seconds`), a[`step_${e}_max_seconds`] = this.databaseAdapter.buildConditionalAggregation("max", r, i).as(`step_${e}_max_seconds`), this.databaseAdapter.getCapabilities().supportsPercentileSubqueries) {
 				let n = this.databaseAdapter.buildPercentile(r, 50);
-				n && (a[`step_${e}_median_seconds`] = T`(SELECT ${n} FROM ${T.identifier("funnel_joined")} WHERE ${t} IS NOT NULL)`.as(`step_${e}_median_seconds`));
+				n && (a[`step_${e}_median_seconds`] = C`(SELECT ${n} FROM ${C.identifier("funnel_joined")} WHERE ${t} IS NOT NULL)`.as(`step_${e}_median_seconds`));
 				let i = this.databaseAdapter.buildPercentile(r, 90);
-				i && (a[`step_${e}_p90_seconds`] = T`(SELECT ${i} FROM ${T.identifier("funnel_joined")} WHERE ${t} IS NOT NULL)`.as(`step_${e}_p90_seconds`));
+				i && (a[`step_${e}_p90_seconds`] = C`(SELECT ${i} FROM ${C.identifier("funnel_joined")} WHERE ${t} IS NOT NULL)`.as(`step_${e}_p90_seconds`));
 			}
 		}
 		let o = i.db.select(a).from(e);
 		return i.db.$with("funnel_metrics").as(o);
 	}
-}, cr = class {
+}, lr = class {
 	filterBuilder;
 	dateTimeBuilder;
 	databaseAdapter;
@@ -5015,32 +5015,32 @@ var ar = class {
 		this.databaseAdapter = e, this.dateTimeBuilder = new I(e), this.filterBuilder = new B(e, this.dateTimeBuilder);
 	}
 	hasFlow(e) {
-		return a(e);
+		return y(e);
 	}
-	validateConfig(e, n) {
-		let r = [], i = [], a = this.databaseAdapter.getEngineType(), o = this.databaseAdapter.getCapabilities().supportsLateralSubqueriesInCTE;
-		return a === "sqlite" ? (r.push(t("server.validation.flow.sqliteNotSupported")), {
+	validateConfig(e, t) {
+		let n = [], r = [], i = this.databaseAdapter.getEngineType(), a = this.databaseAdapter.getCapabilities().supportsLateralSubqueriesInCTE;
+		return i === "sqlite" ? (n.push(S("server.validation.flow.sqliteNotSupported")), {
 			isValid: !1,
-			errors: r,
-			warnings: i
-		}) : (this.validateBindingKey(e, n, r), typeof e.timeDimension == "string" && this.validateMemberDimension(e.timeDimension, n, r, {
-			invalidFormat: () => t("server.validation.flow.invalidTimeDimFormat", { timeDimension: e.timeDimension }),
-			cubeNotFound: (e) => t("server.validation.flow.timeDimCubeNotFound", { cubeName: e }),
-			dimNotFound: (e, n) => t("server.validation.flow.timeDimNotFound", {
+			errors: n,
+			warnings: r
+		}) : (this.validateBindingKey(e, t, n), typeof e.timeDimension == "string" && this.validateMemberDimension(e.timeDimension, t, n, {
+			invalidFormat: () => S("server.validation.flow.invalidTimeDimFormat", { timeDimension: e.timeDimension }),
+			cubeNotFound: (e) => S("server.validation.flow.timeDimCubeNotFound", { cubeName: e }),
+			dimNotFound: (e, t) => S("server.validation.flow.timeDimNotFound", {
 				dimName: e,
-				cubeName: n
+				cubeName: t
 			})
-		}), e.eventDimension ? this.validateMemberDimension(e.eventDimension, n, r, {
-			invalidFormat: () => t("server.validation.flow.invalidEventDimFormat", { eventDimension: e.eventDimension }),
-			cubeNotFound: (e) => t("server.validation.flow.eventDimCubeNotFound", { cubeName: e }),
-			dimNotFound: (e, n) => t("server.validation.flow.eventDimNotFound", {
+		}), e.eventDimension ? this.validateMemberDimension(e.eventDimension, t, n, {
+			invalidFormat: () => S("server.validation.flow.invalidEventDimFormat", { eventDimension: e.eventDimension }),
+			cubeNotFound: (e) => S("server.validation.flow.eventDimCubeNotFound", { cubeName: e }),
+			dimNotFound: (e, t) => S("server.validation.flow.eventDimNotFound", {
 				dimName: e,
-				cubeName: n
+				cubeName: t
 			})
-		}) : r.push(t("server.validation.flow.eventDimRequired")), this.validateStartingStep(e, r, i), this.validateDepthBounds(e, r, i), this.validateJoinStrategy(e, o, r), {
-			isValid: r.length === 0,
-			errors: r,
-			warnings: i
+		}) : n.push(S("server.validation.flow.eventDimRequired")), this.validateStartingStep(e, n, r), this.validateDepthBounds(e, n, r), this.validateJoinStrategy(e, a, n), {
+			isValid: n.length === 0,
+			errors: n,
+			warnings: r
 		});
 	}
 	validateMemberDimension(e, t, n, r) {
@@ -5052,67 +5052,67 @@ var ar = class {
 		let o = t.get(i);
 		o ? o.dimensions?.[a] || n.push(r.dimNotFound(a, i)) : n.push(r.cubeNotFound(i));
 	}
-	validateBindingKey(e, n, r) {
+	validateBindingKey(e, t, n) {
 		if (typeof e.bindingKey == "string") {
-			this.validateMemberDimension(e.bindingKey, n, r, {
-				invalidFormat: () => t("server.validation.flow.invalidBindingKeyFormat", { bindingKey: e.bindingKey }),
-				cubeNotFound: (e) => t("server.validation.flow.bindingKeyCubeNotFound", { cubeName: e }),
-				dimNotFound: (e, n) => t("server.validation.flow.bindingKeyDimNotFound", {
+			this.validateMemberDimension(e.bindingKey, t, n, {
+				invalidFormat: () => S("server.validation.flow.invalidBindingKeyFormat", { bindingKey: e.bindingKey }),
+				cubeNotFound: (e) => S("server.validation.flow.bindingKeyCubeNotFound", { cubeName: e }),
+				dimNotFound: (e, t) => S("server.validation.flow.bindingKeyDimNotFound", {
 					dimName: e,
-					cubeName: n
+					cubeName: t
 				})
 			});
 			return;
 		}
-		if (Array.isArray(e.bindingKey)) for (let i of e.bindingKey) {
-			let e = n.get(i.cube);
+		if (Array.isArray(e.bindingKey)) for (let r of e.bindingKey) {
+			let e = t.get(r.cube);
 			if (!e) {
-				r.push(t("server.validation.flow.bindingKeyMappingCubeNotFound", { cubeName: i.cube }));
+				n.push(S("server.validation.flow.bindingKeyMappingCubeNotFound", { cubeName: r.cube }));
 				continue;
 			}
-			let [, a] = i.dimension.split(".");
-			e.dimensions?.[a] || r.push(t("server.validation.flow.bindingKeyDimNotFound", {
-				dimName: a,
-				cubeName: i.cube
+			let [, i] = r.dimension.split(".");
+			e.dimensions?.[i] || n.push(S("server.validation.flow.bindingKeyDimNotFound", {
+				dimName: i,
+				cubeName: r.cube
 			}));
 		}
 	}
-	validateStartingStep(e, n, r) {
+	validateStartingStep(e, t, n) {
 		if (!e.startingStep) {
-			n.push(t("server.validation.flow.startingStepRequired"));
+			t.push(S("server.validation.flow.startingStepRequired"));
 			return;
 		}
-		e.startingStep.filter || n.push(t("server.validation.flow.startingStepFilterRequired")), e.startingStep.name || r.push(t("server.validation.flow.startingStepNameMissing"));
+		e.startingStep.filter || t.push(S("server.validation.flow.startingStepFilterRequired")), e.startingStep.name || n.push(S("server.validation.flow.startingStepNameMissing"));
 	}
-	validateDepthBounds(e, n, r) {
-		(e.stepsBefore < 0 || e.stepsBefore > 5) && n.push(t("server.validation.flow.stepsBeforeRange", { value: e.stepsBefore })), (e.stepsAfter < 0 || e.stepsAfter > 5) && n.push(t("server.validation.flow.stepsAfterRange", { value: e.stepsAfter })), (e.stepsBefore >= 4 || e.stepsAfter >= 4) && r.push(t("server.validation.flow.highStepDepthWarning"));
+	validateDepthBounds(e, t, n) {
+		(e.stepsBefore < 0 || e.stepsBefore > 5) && t.push(S("server.validation.flow.stepsBeforeRange", { value: e.stepsBefore })), (e.stepsAfter < 0 || e.stepsAfter > 5) && t.push(S("server.validation.flow.stepsAfterRange", { value: e.stepsAfter })), (e.stepsBefore >= 4 || e.stepsAfter >= 4) && n.push(S("server.validation.flow.highStepDepthWarning"));
 	}
-	validateJoinStrategy(e, n, r) {
+	validateJoinStrategy(e, t, n) {
 		e.joinStrategy && ![
 			"auto",
 			"lateral",
 			"window"
-		].includes(e.joinStrategy) ? r.push(t("server.validation.flow.invalidJoinStrategy", { joinStrategy: e.joinStrategy })) : e.joinStrategy === "lateral" && !n && r.push(t("server.validation.flow.lateralNotSupported"));
+		].includes(e.joinStrategy) ? n.push(S("server.validation.flow.invalidJoinStrategy", { joinStrategy: e.joinStrategy })) : e.joinStrategy === "lateral" && !t && n.push(S("server.validation.flow.lateralNotSupported"));
 	}
-	buildFlowQuery(e, n, r) {
-		if (this.databaseAdapter.getEngineType() === "sqlite") throw Error(t("server.validation.flow.sqliteNotSupported"));
-		let i = this.databaseAdapter.getCapabilities().supportsLateralSubqueriesInCTE, a = e.joinStrategy ?? "auto", o = a === "lateral" || a === "auto" && i;
-		if (a === "lateral" && !i) throw Error(t("server.validation.flow.lateralNotSupportedExec"));
-		let s = {
+	buildFlowQuery(e, t, n) {
+		if (this.databaseAdapter.getEngineType() === "sqlite") throw Error(S("server.validation.flow.sqliteNotSupported"));
+		let r = this.databaseAdapter.getCapabilities().supportsLateralSubqueriesInCTE, i = e.joinStrategy ?? "auto", a = i === "lateral" || i === "auto" && r;
+		if (i === "lateral" && !r) throw Error(S("server.validation.flow.lateralNotSupportedExec"));
+		let o = {
 			...e,
 			stepsBefore: e.outputMode === "sunburst" ? 0 : e.stepsBefore
-		}, c = this.resolveFlowConfig(s, n, r), l = [], u = this.buildStartingEntitiesCTE(s, c, r);
-		l.push(u);
-		let d = o ? this.buildDirectionalCTEsLateral("before", s, c, r) : this.buildDirectionalCTEsWindow("before", s, c, r);
-		l.push(...d);
-		let f = o ? this.buildDirectionalCTEsLateral("after", s, c, r) : this.buildDirectionalCTEsWindow("after", s, c, r);
-		l.push(...f);
-		let p = this.buildNodesAggregationCTE(s, r);
-		l.push(p);
-		let m = this.buildLinksAggregationCTE(s, r);
-		l.push(m);
-		let h = this.buildFinalResultCTE(r);
-		return l.push(h), r.db.with(...l).select().from(h);
+		}, s = this.resolveFlowConfig(o, t, n), c = [], l = this.buildStartingEntitiesCTE(o, s, n);
+		c.push(l);
+		let u = a ? this.buildDirectionalCTEsLateral("before", o, s, n) : this.buildDirectionalCTEsWindow("before", o, s, n);
+		c.push(...u);
+		let d = a ? this.buildDirectionalCTEsLateral("after", o, s, n) : this.buildDirectionalCTEsWindow("after", o, s, n);
+		c.push(...d);
+		let f = this.buildNodesAggregationCTE(o, n);
+		c.push(f);
+		let p = this.buildLinksAggregationCTE(o, n);
+		c.push(p);
+		let m = this.buildFinalResultCTE(n);
+		return c.push(m), n.db.with(...c).select().from(m);
 	}
 	transformResult(e) {
 		if (!e || e.length === 0) return {
@@ -5149,14 +5149,14 @@ var ar = class {
 			startingStepFilters: this.buildStartingStepFilters(e, r, n)
 		};
 	}
-	resolveCube(e, n) {
-		let r;
-		if (typeof e.bindingKey == "string") [r] = e.bindingKey.split(".");
-		else if (Array.isArray(e.bindingKey) && e.bindingKey.length > 0) r = e.bindingKey[0].cube;
-		else throw Error(t("server.errors.flow.cannotResolveCube"));
-		let i = n.get(r);
-		if (!i) throw Error(t("server.errors.flow.cubeNotFound", { cubeName: r }));
-		return i;
+	resolveCube(e, t) {
+		let n;
+		if (typeof e.bindingKey == "string") [n] = e.bindingKey.split(".");
+		else if (Array.isArray(e.bindingKey) && e.bindingKey.length > 0) n = e.bindingKey[0].cube;
+		else throw Error(S("server.errors.flow.cannotResolveCube"));
+		let r = t.get(n);
+		if (!r) throw Error(S("server.errors.flow.cubeNotFound", { cubeName: n }));
+		return r;
 	}
 	resolveBindingKey(e, t, n) {
 		return tn(e.bindingKey, t, n, $t("server.errors.flow"));
@@ -5164,10 +5164,10 @@ var ar = class {
 	resolveTimeDimension(e, t, n) {
 		return nn(e.timeDimension, t, n, "server.errors.flow");
 	}
-	resolveEventDimension(e, n, r) {
-		let [, i] = e.eventDimension.split("."), a = n.dimensions?.[i];
-		if (!a) throw Error(t("server.errors.flow.eventDimNotFound", { eventDimension: e.eventDimension }));
-		return f(a.sql, r);
+	resolveEventDimension(e, t, n) {
+		let [, r] = e.eventDimension.split("."), i = t.dimensions?.[r];
+		if (!i) throw Error(S("server.errors.flow.eventDimNotFound", { eventDimension: e.eventDimension }));
+		return l(i.sql, n);
 	}
 	buildStartingStepFilters(e, t, n) {
 		if (!e.startingStep.filter) return [];
@@ -5188,10 +5188,10 @@ var ar = class {
 			let e = this.buildSubConditions(r.filters, t, n);
 			return this.combineConditions(e, r.isAnd);
 		}
-		let i = e, [, a] = i.member.split("."), o = t.dimensions?.[a];
-		if (!o) return null;
-		let s = l(o, n);
-		return this.filterBuilder.buildFilterCondition(s, i.operator, i.values || [], o, i.dateRange);
+		let i = e, [, a] = i.member.split("."), s = t.dimensions?.[a];
+		if (!s) return null;
+		let c = o(s, n);
+		return this.filterBuilder.buildFilterCondition(c, i.operator, i.values || [], s, i.dateRange);
 	}
 	buildSubConditions(e, t, n) {
 		let r = [];
@@ -5202,63 +5202,63 @@ var ar = class {
 		return r;
 	}
 	combineConditions(e, t) {
-		return e.length === 0 ? null : e.length === 1 ? e[0] : t ? n(...e) : T`(${T.join(e, T` OR `)})`;
+		return e.length === 0 ? null : e.length === 1 ? e[0] : t ? w(...e) : C`(${C.join(e, C` OR `)})`;
 	}
 	buildStartingEntitiesCTE(e, t, n) {
 		let { cubeBase: r, bindingKeyExpr: i, timeExpr: a, eventExpr: o, startingStepFilters: s } = t, c = [];
 		r.where && c.push(r.where), c.push(...s);
 		let l = n.db.select({
-			binding_key: T`${i}`.as("binding_key"),
-			start_time: T`MIN(${a})`.as("start_time"),
-			event_type: T`${o}`.as("event_type"),
-			event_path: T`${o}`.as("event_path")
+			binding_key: C`${i}`.as("binding_key"),
+			start_time: C`MIN(${a})`.as("start_time"),
+			event_type: C`${o}`.as("event_type"),
+			event_path: C`${o}`.as("event_path")
 		}).from(r.from);
 		return c.length > 0 && (l = l.where(R(c))), l = l.groupBy(i, o), e.entityLimit && (l = l.limit(e.entityLimit)), n.db.$with("starting_entities").as(l);
 	}
 	buildDirectionalCTEsLateral(e, t, n, r) {
-		let { cubeBase: i, bindingKeyExpr: a, timeExpr: o, eventExpr: s } = n, c = [], l = t.outputMode === "sunburst", u = e === "before", d = u ? t.stepsBefore : t.stepsAfter, f = u ? T`<` : T`>`, p = u ? T`DESC` : T`ASC`;
+		let { cubeBase: i, bindingKeyExpr: a, timeExpr: o, eventExpr: s } = n, c = [], l = t.outputMode === "sunburst", u = e === "before", d = u ? t.stepsBefore : t.stepsAfter, f = u ? C`<` : C`>`, p = u ? C`DESC` : C`ASC`;
 		for (let t = 1; t <= d; t++) {
 			let n = t === 1 ? "starting_entities" : `${e}_step_${t - 1}`, d = t === 1 ? "start_time" : "step_time", m = `${e}_step_${t}`, h = [];
-			i.where && h.push(i.where), h.push(T`${a} = ${T.identifier(n)}.binding_key`, T`${o} ${f} ${T.identifier(n)}.${T.identifier(d)}`);
-			let g = R(h), _ = l ? u ? T`${s} || ${"→"} || ${T.identifier(n)}.event_path` : T`${T.identifier(n)}.event_path || ${"→"} || ${s}` : T`${s}`, v = r.db.select({
-				binding_key: T`${a}`.as("binding_key"),
-				step_time: T`${o}`.as("step_time"),
-				event_type: T`${s}`.as("event_type"),
+			i.where && h.push(i.where), h.push(C`${a} = ${C.identifier(n)}.binding_key`, C`${o} ${f} ${C.identifier(n)}.${C.identifier(d)}`);
+			let g = R(h), _ = l ? u ? C`${s} || ${"→"} || ${C.identifier(n)}.event_path` : C`${C.identifier(n)}.event_path || ${"→"} || ${s}` : C`${s}`, v = r.db.select({
+				binding_key: C`${a}`.as("binding_key"),
+				step_time: C`${o}`.as("step_time"),
+				event_type: C`${s}`.as("event_type"),
 				event_path: _.as("event_path")
-			}).from(i.from).where(g).orderBy(T`${o} ${p}`).limit(1), y = r.db.$with(m).as(r.db.select({
-				binding_key: T`e.binding_key`.as("binding_key"),
-				step_time: T`e.step_time`.as("step_time"),
-				event_type: T`e.event_type`.as("event_type"),
-				event_path: T`e.event_path`.as("event_path")
-			}).from(T`${T.identifier(n)}`).crossJoinLateral(v.as("e")));
+			}).from(i.from).where(g).orderBy(C`${o} ${p}`).limit(1), y = r.db.$with(m).as(r.db.select({
+				binding_key: C`e.binding_key`.as("binding_key"),
+				step_time: C`e.step_time`.as("step_time"),
+				event_type: C`e.event_type`.as("event_type"),
+				event_path: C`e.event_path`.as("event_path")
+			}).from(C`${C.identifier(n)}`).crossJoinLateral(v.as("e")));
 			c.push(y);
 		}
 		return c;
 	}
 	buildDirectionalCTEsWindow(e, t, n, r) {
-		let { cubeBase: i, bindingKeyExpr: a, timeExpr: o, eventExpr: s } = n, c = [], l = t.outputMode === "sunburst", u = e === "before", d = u ? t.stepsBefore : t.stepsAfter, f = u ? T`<` : T`>`, p = u ? T`DESC` : T`ASC`;
+		let { cubeBase: i, bindingKeyExpr: a, timeExpr: o, eventExpr: s } = n, c = [], l = t.outputMode === "sunburst", u = e === "before", d = u ? t.stepsBefore : t.stepsAfter, f = u ? C`<` : C`>`, p = u ? C`DESC` : C`ASC`;
 		for (let t = 1; t <= d; t++) {
 			let n = t === 1 ? "starting_entities" : `${e}_step_${t - 1}`, d = t === 1 ? "start_time" : "step_time", m = `${e}_step_${t}`, h = [];
-			i.where && h.push(i.where), h.push(T`${o} ${f} ${T.identifier(n)}.${T.identifier(d)}`);
-			let g = R(h), _ = l ? u ? T`${s} || ${"→"} || ${T.identifier(n)}.event_path` : T`${T.identifier(n)}.event_path || ${"→"} || ${s}` : T`${s}`, v = r.db.select({
-				binding_key: T`${a}`.as("binding_key"),
-				step_time: T`${o}`.as("step_time"),
-				event_type: T`${s}`.as("event_type"),
+			i.where && h.push(i.where), h.push(C`${o} ${f} ${C.identifier(n)}.${C.identifier(d)}`);
+			let g = R(h), _ = l ? u ? C`${s} || ${"→"} || ${C.identifier(n)}.event_path` : C`${C.identifier(n)}.event_path || ${"→"} || ${s}` : C`${s}`, v = r.db.select({
+				binding_key: C`${a}`.as("binding_key"),
+				step_time: C`${o}`.as("step_time"),
+				event_type: C`${s}`.as("event_type"),
 				event_path: _.as("event_path"),
-				rn: T`ROW_NUMBER() OVER (PARTITION BY ${a} ORDER BY ${o} ${p})`.as("rn")
-			}).from(i.from).innerJoin(T`${T.identifier(n)}`, T`${a} = ${T.identifier(n)}.binding_key`).where(g), y = r.db.select({
-				binding_key: T`binding_key`.as("binding_key"),
-				step_time: T`step_time`.as("step_time"),
-				event_type: T`event_type`.as("event_type"),
-				event_path: T`event_path`.as("event_path")
-			}).from(v.as("ranked")).where(T`rn = 1`);
+				rn: C`ROW_NUMBER() OVER (PARTITION BY ${a} ORDER BY ${o} ${p})`.as("rn")
+			}).from(i.from).innerJoin(C`${C.identifier(n)}`, C`${a} = ${C.identifier(n)}.binding_key`).where(g), y = r.db.select({
+				binding_key: C`binding_key`.as("binding_key"),
+				step_time: C`step_time`.as("step_time"),
+				event_type: C`event_type`.as("event_type"),
+				event_path: C`event_path`.as("event_path")
+			}).from(v.as("ranked")).where(C`rn = 1`);
 			c.push(r.db.$with(m).as(y));
 		}
 		return c;
 	}
 	buildNodeArm(e, t, n, r) {
-		let i = T.raw(`'${e}_'`), a = T.raw(String(t)), o = T.identifier(n);
-		return r ? T`
+		let i = C.raw(`'${e}_'`), a = C.raw(String(t)), o = C.identifier(n);
+		return r ? C`
           SELECT
             ${i} || event_path AS node_id,
             event_type AS name,
@@ -5266,7 +5266,7 @@ var ar = class {
             COUNT(*) AS value
           FROM ${o}
           GROUP BY event_path, event_type
-        ` : T`
+        ` : C`
           SELECT
             ${i} || event_type AS node_id,
             event_type AS name,
@@ -5277,8 +5277,8 @@ var ar = class {
         `;
 	}
 	buildAdjacentLinkArm(e, t, n, r, i) {
-		let a = T.raw(`'${e}_'`), o = T.raw(`'${t}_'`), s = T.identifier(n), c = T.identifier(r);
-		return i ? T`
+		let a = C.raw(`'${e}_'`), o = C.raw(`'${t}_'`), s = C.identifier(n), c = C.identifier(r);
+		return i ? C`
           SELECT
             ${a} || f.event_path AS source_id,
             ${o} || t.event_path AS target_id,
@@ -5286,7 +5286,7 @@ var ar = class {
           FROM ${s} f
           INNER JOIN ${c} t ON f.binding_key = t.binding_key
           GROUP BY f.event_path, t.event_path
-        ` : T`
+        ` : C`
           SELECT
             ${a} || f.event_type AS source_id,
             ${o} || t.event_type AS target_id,
@@ -5299,9 +5299,9 @@ var ar = class {
 	buildNodesAggregationCTE(e, t) {
 		let n = [], r = e.outputMode === "sunburst";
 		for (let t = e.stepsBefore; t >= 1; t--) n.push(this.buildNodeArm(`before_${t}`, -t, `before_step_${t}`, r));
-		n.push(T`
+		n.push(C`
       SELECT
-        ${T.raw("'start_'")} || event_type AS node_id,
+        ${C.raw("'start_'")} || event_type AS node_id,
         event_type AS name,
         0 AS layer,
         COUNT(*) AS value
@@ -5309,45 +5309,45 @@ var ar = class {
       GROUP BY event_type
     `);
 		for (let t = 1; t <= e.stepsAfter; t++) n.push(this.buildNodeArm(`after_${t}`, t, `after_step_${t}`, r));
-		let i = T.join(n, T` UNION ALL `), a = t.db.select({
-			node_id: T`node_id`.as("node_id"),
-			name: T`name`.as("name"),
-			layer: T`layer`.as("layer"),
-			value: T`value`.as("value")
-		}).from(T`(${i}) AS nodes_union`);
+		let i = C.join(n, C` UNION ALL `), a = t.db.select({
+			node_id: C`node_id`.as("node_id"),
+			name: C`name`.as("name"),
+			layer: C`layer`.as("layer"),
+			value: C`value`.as("value")
+		}).from(C`(${i}) AS nodes_union`);
 		return t.db.$with("nodes_agg").as(a);
 	}
 	buildLinksAggregationCTE(e, t) {
 		let n = [], r = e.outputMode === "sunburst";
 		for (let t = e.stepsBefore; t >= 2; t--) n.push(this.buildAdjacentLinkArm(`before_${t}`, `before_${t - 1}`, `before_step_${t}`, `before_step_${t - 1}`, r));
-		e.stepsBefore >= 1 && (r ? n.push(T`
+		e.stepsBefore >= 1 && (r ? n.push(C`
           SELECT
-            ${T.raw("'before_1_'")} || b.event_path AS source_id,
-            ${T.raw("'start_'")} || s.event_type AS target_id,
+            ${C.raw("'before_1_'")} || b.event_path AS source_id,
+            ${C.raw("'start_'")} || s.event_type AS target_id,
             COUNT(*) AS value
           FROM before_step_1 b
           INNER JOIN starting_entities s ON b.binding_key = s.binding_key
           GROUP BY b.event_path, s.event_type
-        `) : n.push(T`
+        `) : n.push(C`
           SELECT
-            ${T.raw("'before_1_'")} || b.event_type AS source_id,
-            ${T.raw("'start_'")} || s.event_type AS target_id,
+            ${C.raw("'before_1_'")} || b.event_type AS source_id,
+            ${C.raw("'start_'")} || s.event_type AS target_id,
             COUNT(*) AS value
           FROM before_step_1 b
           INNER JOIN starting_entities s ON b.binding_key = s.binding_key
           GROUP BY b.event_type, s.event_type
-        `)), e.stepsAfter >= 1 && (r ? n.push(T`
+        `)), e.stepsAfter >= 1 && (r ? n.push(C`
           SELECT
-            ${T.raw("'start_'")} || s.event_type AS source_id,
-            ${T.raw("'after_1_'")} || a.event_path AS target_id,
+            ${C.raw("'start_'")} || s.event_type AS source_id,
+            ${C.raw("'after_1_'")} || a.event_path AS target_id,
             COUNT(*) AS value
           FROM starting_entities s
           INNER JOIN after_step_1 a ON s.binding_key = a.binding_key
           GROUP BY s.event_type, a.event_path
-        `) : n.push(T`
+        `) : n.push(C`
           SELECT
-            ${T.raw("'start_'")} || s.event_type AS source_id,
-            ${T.raw("'after_1_'")} || a.event_type AS target_id,
+            ${C.raw("'start_'")} || s.event_type AS source_id,
+            ${C.raw("'after_1_'")} || a.event_type AS target_id,
             COUNT(*) AS value
           FROM starting_entities s
           INNER JOIN after_step_1 a ON s.binding_key = a.binding_key
@@ -5356,21 +5356,21 @@ var ar = class {
 		for (let t = 1; t < e.stepsAfter; t++) n.push(this.buildAdjacentLinkArm(`after_${t}`, `after_${t + 1}`, `after_step_${t}`, `after_step_${t + 1}`, r));
 		if (n.length === 0) {
 			let e = t.db.select({
-				source_id: T`NULL`.as("source_id"),
-				target_id: T`NULL`.as("target_id"),
-				value: T`0`.as("value")
-			}).from(T`(SELECT 1) AS empty`).where(T`1 = 0`);
+				source_id: C`NULL`.as("source_id"),
+				target_id: C`NULL`.as("target_id"),
+				value: C`0`.as("value")
+			}).from(C`(SELECT 1) AS empty`).where(C`1 = 0`);
 			return t.db.$with("links_agg").as(e);
 		}
-		let i = T.join(n, T` UNION ALL `), a = t.db.select({
-			source_id: T`source_id`.as("source_id"),
-			target_id: T`target_id`.as("target_id"),
-			value: T`value`.as("value")
-		}).from(T`(${i}) AS links_union`);
+		let i = C.join(n, C` UNION ALL `), a = t.db.select({
+			source_id: C`source_id`.as("source_id"),
+			target_id: C`target_id`.as("target_id"),
+			value: C`value`.as("value")
+		}).from(C`(${i}) AS links_union`);
 		return t.db.$with("links_agg").as(a);
 	}
 	buildFinalResultCTE(e) {
-		let t = T`
+		let t = C`
       SELECT
         'node' AS record_type,
         node_id AS id,
@@ -5392,51 +5392,51 @@ var ar = class {
       FROM links_agg
       WHERE source_id IS NOT NULL
     `, n = e.db.select({
-			record_type: T`record_type`.as("record_type"),
-			id: T`id`.as("id"),
-			name: T`name`.as("name"),
-			layer: T`layer`.as("layer"),
-			value: T`value`.as("value"),
-			source_id: T`source_id`.as("source_id"),
-			target_id: T`target_id`.as("target_id")
-		}).from(T`(${t}) AS final_union`);
+			record_type: C`record_type`.as("record_type"),
+			id: C`id`.as("id"),
+			name: C`name`.as("name"),
+			layer: C`layer`.as("layer"),
+			value: C`value`.as("value"),
+			source_id: C`source_id`.as("source_id"),
+			target_id: C`target_id`.as("target_id")
+		}).from(C`(${t}) AS final_union`);
 		return e.db.$with("final_result").as(n);
 	}
 };
 //#endregion
 //#region src/server/types/retention.ts
-function lr(e) {
+function ur(e) {
 	return Array.isArray(e);
 }
-function ur(e) {
+function dr(e) {
 	return typeof e == "object" && !!e && "cube" in e;
 }
-function dr(e) {
-	if (ur(e)) return e.cube;
+function fr(e) {
+	if (dr(e)) return e.cube;
 	let t = e.indexOf(".");
 	if (t === -1) throw Error(`Invalid time dimension format: ${e}. Expected 'CubeName.dimensionName'`);
 	return e.substring(0, t);
 }
-function fr(e) {
-	if (ur(e)) return e.dimension;
+function pr(e) {
+	if (dr(e)) return e.dimension;
 	let t = e.indexOf(".");
 	if (t === -1) throw Error(`Invalid time dimension format: ${e}. Expected 'CubeName.dimensionName'`);
 	return e.substring(t + 1);
 }
 //#endregion
 //#region src/server/builders/retention-query-builder.ts
-var pr = {
-	noMapping: ({ cubeName: e }) => t("server.validation.retention.noBindingKeyMapping", { cubeName: e }),
-	cubeNotFound: ({ cubeName: e }) => t("server.validation.retention.bindingKeyCubeNotFound", { cubeName: e }),
-	keyDimNotFound: ({ bindingKey: e, cubeName: n }) => t("server.validation.retention.bindingKeyDimNotFound", {
+var mr = {
+	noMapping: ({ cubeName: e }) => S("server.validation.retention.noBindingKeyMapping", { cubeName: e }),
+	cubeNotFound: ({ cubeName: e }) => S("server.validation.retention.bindingKeyCubeNotFound", { cubeName: e }),
+	keyDimNotFound: ({ bindingKey: e, cubeName: t }) => S("server.validation.retention.bindingKeyDimNotFound", {
 		dimName: e,
-		cubeName: n
+		cubeName: t
 	}),
-	mappingDimNotFound: ({ dimension: e, cubeName: n }) => t("server.validation.retention.bindingKeyDimNotFound", {
+	mappingDimNotFound: ({ dimension: e, cubeName: t }) => S("server.validation.retention.bindingKeyDimNotFound", {
 		dimName: e,
-		cubeName: n
+		cubeName: t
 	})
-}, mr = class {
+}, hr = class {
 	databaseAdapter;
 	filterBuilder;
 	dateTimeBuilder;
@@ -5444,97 +5444,97 @@ var pr = {
 		this.databaseAdapter = e, this.dateTimeBuilder = new I(e), this.filterBuilder = new B(e, this.dateTimeBuilder);
 	}
 	hasRetention(e) {
-		return h(e);
+		return i(e);
 	}
-	validateConfig(e, n) {
-		let r = [], i = this.databaseAdapter.getEngineType();
-		return (i === "sqlite" || i === "mysql" || i === "singlestore") && r.push(t("server.validation.retention.engineNotSupported", { engine: i })), this.validateTimeDimension(e, n, r), this.validateBindingKey(e, n, r), this.validateBreakdownDimensions(e, n, r), this.validatePeriodsAndEnums(e, r), this.validateDateRange(e, r), {
-			isValid: r.length === 0,
-			errors: r
+	validateConfig(e, t) {
+		let n = [], r = this.databaseAdapter.getEngineType();
+		return (r === "sqlite" || r === "mysql" || r === "singlestore") && n.push(S("server.validation.retention.engineNotSupported", { engine: r })), this.validateTimeDimension(e, t, n), this.validateBindingKey(e, t, n), this.validateBreakdownDimensions(e, t, n), this.validatePeriodsAndEnums(e, n), this.validateDateRange(e, n), {
+			isValid: n.length === 0,
+			errors: n
 		};
 	}
-	validateTimeDimension(e, n, r) {
+	validateTimeDimension(e, t, n) {
 		try {
-			let i = dr(e.timeDimension), a = fr(e.timeDimension), o = n.get(i);
-			o ? o.dimensions?.[a] || r.push(t("server.validation.retention.timeDimNotFound", { dimName: a })) : r.push(t("server.validation.retention.cubeNotFound", { cubeName: i }));
+			let r = fr(e.timeDimension), i = pr(e.timeDimension), a = t.get(r);
+			a ? a.dimensions?.[i] || n.push(S("server.validation.retention.timeDimNotFound", { dimName: i })) : n.push(S("server.validation.retention.cubeNotFound", { cubeName: r }));
 		} catch {
-			r.push(t("server.validation.retention.invalidTimeDimFormat", { timeDimension: e.timeDimension }));
+			n.push(S("server.validation.retention.invalidTimeDimFormat", { timeDimension: e.timeDimension }));
 		}
 	}
-	validateBindingKey(e, n, r) {
-		if (lr(e.bindingKey)) {
-			for (let i of e.bindingKey) {
-				let e = n.get(i.cube);
+	validateBindingKey(e, t, n) {
+		if (ur(e.bindingKey)) {
+			for (let r of e.bindingKey) {
+				let e = t.get(r.cube);
 				if (!e) {
-					r.push(t("server.validation.retention.bindingKeyMappingCubeNotFound", { cubeName: i.cube }));
+					n.push(S("server.validation.retention.bindingKeyMappingCubeNotFound", { cubeName: r.cube }));
 					continue;
 				}
-				let a = Qt(i.dimension);
-				e.dimensions?.[a] || r.push(t("server.validation.retention.bindingKeyDimNotFound", {
-					dimName: a,
-					cubeName: i.cube
+				let i = Qt(r.dimension);
+				e.dimensions?.[i] || n.push(S("server.validation.retention.bindingKeyDimNotFound", {
+					dimName: i,
+					cubeName: r.cube
 				}));
 			}
 			return;
 		}
-		let [i, a] = e.bindingKey.split(".");
-		if (!i || !a) {
-			r.push(t("server.validation.retention.invalidBindingKeyFormat", { bindingKey: e.bindingKey }));
+		let [r, i] = e.bindingKey.split(".");
+		if (!r || !i) {
+			n.push(S("server.validation.retention.invalidBindingKeyFormat", { bindingKey: e.bindingKey }));
 			return;
 		}
-		let o = n.get(i);
-		o ? o.dimensions?.[a] || r.push(t("server.validation.retention.bindingKeyDimNotFound", {
-			dimName: a,
-			cubeName: i
-		})) : r.push(t("server.validation.retention.bindingKeyCubeNotFound", { cubeName: i }));
-	}
-	validateBreakdownDimensions(e, n, r) {
-		if (!(!e.breakdownDimensions || e.breakdownDimensions.length === 0)) for (let i of e.breakdownDimensions) {
-			let [e, a] = i.split(".");
-			if (!e || !a) {
-				r.push(t("server.validation.retention.invalidBreakdownDimFormat", { dimension: i }));
+		let a = t.get(r);
+		a ? a.dimensions?.[i] || n.push(S("server.validation.retention.bindingKeyDimNotFound", {
+			dimName: i,
+			cubeName: r
+		})) : n.push(S("server.validation.retention.bindingKeyCubeNotFound", { cubeName: r }));
+	}
+	validateBreakdownDimensions(e, t, n) {
+		if (!(!e.breakdownDimensions || e.breakdownDimensions.length === 0)) for (let r of e.breakdownDimensions) {
+			let [e, i] = r.split(".");
+			if (!e || !i) {
+				n.push(S("server.validation.retention.invalidBreakdownDimFormat", { dimension: r }));
 				continue;
 			}
-			let o = n.get(e);
-			o ? o.dimensions?.[a] || r.push(t("server.validation.retention.breakdownDimNotFound", {
-				dimName: a,
+			let a = t.get(e);
+			a ? a.dimensions?.[i] || n.push(S("server.validation.retention.breakdownDimNotFound", {
+				dimName: i,
 				cubeName: e
-			})) : r.push(t("server.validation.retention.breakdownDimCubeNotFound", { cubeName: e }));
+			})) : n.push(S("server.validation.retention.breakdownDimCubeNotFound", { cubeName: e }));
 		}
 	}
-	validatePeriodsAndEnums(e, n) {
-		e.periods < 1 && n.push(t("server.validation.retention.periodsMin")), e.periods > 52 && n.push(t("server.validation.retention.periodsMax")), [
+	validatePeriodsAndEnums(e, t) {
+		e.periods < 1 && t.push(S("server.validation.retention.periodsMin")), e.periods > 52 && t.push(S("server.validation.retention.periodsMax")), [
 			"day",
 			"week",
 			"month"
-		].includes(e.granularity) || n.push(t("server.validation.retention.invalidGranularity", { granularity: e.granularity })), ["classic", "rolling"].includes(e.retentionType) || n.push(t("server.validation.retention.invalidRetentionType", { retentionType: e.retentionType }));
+		].includes(e.granularity) || t.push(S("server.validation.retention.invalidGranularity", { granularity: e.granularity })), ["classic", "rolling"].includes(e.retentionType) || t.push(S("server.validation.retention.invalidRetentionType", { retentionType: e.retentionType }));
 	}
-	validateDateRange(e, n) {
+	validateDateRange(e, t) {
 		if (!e.dateRange) {
-			n.push(t("server.validation.retention.dateRangeRequired"));
+			t.push(S("server.validation.retention.dateRangeRequired"));
 			return;
 		}
-		if (e.dateRange.start ? isNaN(new Date(e.dateRange.start).getTime()) && n.push(t("server.validation.retention.dateRangeInvalidStart")) : n.push(t("server.validation.retention.dateRangeStartRequired")), e.dateRange.end ? isNaN(new Date(e.dateRange.end).getTime()) && n.push(t("server.validation.retention.dateRangeInvalidEnd")) : n.push(t("server.validation.retention.dateRangeEndRequired")), e.dateRange.start && e.dateRange.end) {
-			let r = new Date(e.dateRange.start), i = new Date(e.dateRange.end);
-			!isNaN(r.getTime()) && !isNaN(i.getTime()) && r > i && n.push(t("server.validation.retention.dateRangeStartBeforeEnd"));
+		if (e.dateRange.start ? isNaN(new Date(e.dateRange.start).getTime()) && t.push(S("server.validation.retention.dateRangeInvalidStart")) : t.push(S("server.validation.retention.dateRangeStartRequired")), e.dateRange.end ? isNaN(new Date(e.dateRange.end).getTime()) && t.push(S("server.validation.retention.dateRangeInvalidEnd")) : t.push(S("server.validation.retention.dateRangeEndRequired")), e.dateRange.start && e.dateRange.end) {
+			let n = new Date(e.dateRange.start), r = new Date(e.dateRange.end);
+			!isNaN(n.getTime()) && !isNaN(r.getTime()) && n > r && t.push(S("server.validation.retention.dateRangeStartBeforeEnd"));
 		}
 	}
 	buildRetentionQuery(e, t, n) {
 		let r = this.resolveConfig(e, t, n), i = r.breakdowns.length, a = this.buildCohortBaseCTE(e, r, n), o = this.buildActivityPeriodsCTE(e, r, n), s = this.buildCohortSizesCTE(e, n, i), c = this.buildRetentionCountsCTE(e, n, i), l = r.breakdowns.length > 0, u = {
-			period: T`rc.period_number`.as("period"),
-			cohort_size: T`cs.cohort_size`.as("cohort_size"),
-			retained_users: T`rc.retained_users`.as("retained_users"),
-			retention_rate: T`CAST(rc.retained_users AS NUMERIC) / NULLIF(cs.cohort_size, 0)`.as("retention_rate")
+			period: C`rc.period_number`.as("period"),
+			cohort_size: C`cs.cohort_size`.as("cohort_size"),
+			retained_users: C`rc.retained_users`.as("retained_users"),
+			retention_rate: C`CAST(rc.retained_users AS NUMERIC) / NULLIF(cs.cohort_size, 0)`.as("retention_rate")
 		};
-		for (let e = 0; e < r.breakdowns.length; e++) u[`breakdown_${e}`] = T.raw(`rc.breakdown_${e}`).as(`breakdown_${e}`);
-		let d = n.db.with(a, o, s, c).select(u).from(T`retention_counts rc`);
+		for (let e = 0; e < r.breakdowns.length; e++) u[`breakdown_${e}`] = C.raw(`rc.breakdown_${e}`).as(`breakdown_${e}`);
+		let d = n.db.with(a, o, s, c).select(u).from(C`retention_counts rc`);
 		if (l) {
-			let e = r.breakdowns.map((e, t) => T`COALESCE(CAST(rc.breakdown_${T.raw(String(t))} AS TEXT), '') = COALESCE(CAST(cs.breakdown_${T.raw(String(t))} AS TEXT), '')`), t = e.length === 1 ? e[0] : T.join(e, T` AND `);
-			d = d.innerJoin(T`cohort_sizes cs`, t);
-		} else d = d.innerJoin(T`cohort_sizes cs`, T`1 = 1`);
+			let e = r.breakdowns.map((e, t) => C`COALESCE(CAST(rc.breakdown_${C.raw(String(t))} AS TEXT), '') = COALESCE(CAST(cs.breakdown_${C.raw(String(t))} AS TEXT), '')`), t = e.length === 1 ? e[0] : C.join(e, C` AND `);
+			d = d.innerJoin(C`cohort_sizes cs`, t);
+		} else d = d.innerJoin(C`cohort_sizes cs`, C`1 = 1`);
 		let f = [];
-		for (let e = 0; e < r.breakdowns.length; e++) f.push(T.raw(`rc.breakdown_${e}`));
-		return f.push(T`rc.period_number`), d = d.orderBy(...f), d;
+		for (let e = 0; e < r.breakdowns.length; e++) f.push(C.raw(`rc.breakdown_${e}`));
+		return f.push(C`rc.period_number`), d = d.orderBy(...f), d;
 	}
 	transformResult(e, t) {
 		let n = t.breakdownDimensions || [], r = Math.min(n.length, 100), i = r > 0;
@@ -5556,29 +5556,29 @@ var pr = {
 			return t;
 		});
 	}
-	resolveConfig(e, n, r) {
-		let i = dr(e.timeDimension), a = fr(e.timeDimension), o = n.get(i);
-		if (!o) throw Error(t("server.validation.retention.cubeNotFound", { cubeName: i }));
-		let s = o.dimensions?.[a];
-		if (!s) throw Error(t("server.validation.retention.timeDimNotFound", { dimName: a }));
-		let c = f(s.sql, r), l = tn(e.bindingKey, o, r, pr, n), u = this.buildFilterConditions(e.cohortFilters, o, n, r), d = this.buildFilterConditions(e.activityFilters, o, n, r), p = [];
-		if (e.breakdownDimensions && e.breakdownDimensions.length > 0) for (let t of e.breakdownDimensions) {
-			let [e, i] = t.split("."), a = n.get(e);
+	resolveConfig(e, t, n) {
+		let r = fr(e.timeDimension), i = pr(e.timeDimension), a = t.get(r);
+		if (!a) throw Error(S("server.validation.retention.cubeNotFound", { cubeName: r }));
+		let o = a.dimensions?.[i];
+		if (!o) throw Error(S("server.validation.retention.timeDimNotFound", { dimName: i }));
+		let s = l(o.sql, n), c = tn(e.bindingKey, a, n, mr, t), u = this.buildFilterConditions(e.cohortFilters, a, t, n), d = this.buildFilterConditions(e.activityFilters, a, t, n), f = [];
+		if (e.breakdownDimensions && e.breakdownDimensions.length > 0) for (let r of e.breakdownDimensions) {
+			let [e, i] = r.split("."), a = t.get(e);
 			if (a && a.dimensions?.[i]) {
-				let e = f(a.dimensions[i].sql, r);
-				p.push({
-					dimension: t,
+				let e = l(a.dimensions[i].sql, n);
+				f.push({
+					dimension: r,
 					expr: e
 				});
 			}
 		}
 		return {
-			cube: o,
-			bindingKeyExpr: l,
-			timeExpr: c,
+			cube: a,
+			bindingKeyExpr: c,
+			timeExpr: s,
 			cohortFilterConditions: u,
 			activityFilterConditions: d,
-			breakdowns: p
+			breakdowns: f
 		};
 	}
 	buildFilterConditions(e, t, n, r) {
@@ -5590,21 +5590,21 @@ var pr = {
 		}
 		return a;
 	}
-	buildSingleFilterCondition(e, t, r, i) {
+	buildSingleFilterCondition(e, t, n, r) {
 		if ("and" in e || "or" in e) {
-			let a = e, o = [], s = "and" in a && !!a.and, c = a.and || a.or || [];
-			for (let e of c) {
-				let n = this.buildSingleFilterCondition(e, t, r, i);
-				n && o.push(n);
+			let i = e, a = [], o = "and" in i && !!i.and, s = i.and || i.or || [];
+			for (let e of s) {
+				let i = this.buildSingleFilterCondition(e, t, n, r);
+				i && a.push(i);
 			}
-			return o.length === 0 ? null : o.length === 1 ? o[0] : s ? n(...o) : T`(${T.join(o, T` OR `)})`;
+			return a.length === 0 ? null : a.length === 1 ? a[0] : o ? w(...a) : C`(${C.join(a, C` OR `)})`;
 		}
-		let a = e, [o, s] = a.member.split("."), c = r.get(o);
+		let i = e, [a, s] = i.member.split("."), c = n.get(a);
 		if (!c) return null;
-		let u = c.dimensions?.[s];
-		if (!u) return null;
-		let d = l(u, i);
-		return this.filterBuilder.buildFilterCondition(d, a.operator, a.values || [], u, a.dateRange);
+		let l = c.dimensions?.[s];
+		if (!l) return null;
+		let u = o(l, r);
+		return this.filterBuilder.buildFilterCondition(u, i.operator, i.values || [], l, i.dateRange);
 	}
 	buildCohortBaseCTE(e, t, n) {
 		let r = t.cube.sql(n), i = [];
@@ -5613,12 +5613,12 @@ var pr = {
 			i.push(n);
 		}
 		let a = this.databaseAdapter.buildTimeDimension(e.granularity, t.timeExpr), o = {
-			binding_key: T`${t.bindingKeyExpr}`.as("binding_key"),
-			cohort_entry: T`MIN(${a})`.as("cohort_entry")
+			binding_key: C`${t.bindingKeyExpr}`.as("binding_key"),
+			cohort_entry: C`MIN(${a})`.as("cohort_entry")
 		};
 		for (let e = 0; e < t.breakdowns.length; e++) {
 			let { expr: n } = t.breakdowns[e];
-			o[`breakdown_${e}`] = T`MIN(${n})`.as(`breakdown_${e}`);
+			o[`breakdown_${e}`] = C`MIN(${n})`.as(`breakdown_${e}`);
 		}
 		let s = n.db.select(o).from(r.from);
 		i.length > 0 && (s = s.where(R(i)));
@@ -5631,35 +5631,35 @@ var pr = {
 		return n.db.$with("cohort_base").as(s);
 	}
 	buildDateRangeCondition(e, t) {
-		let n = this.databaseAdapter.castToType(T`${t.start}`, "timestamp"), r = this.databaseAdapter.buildDateAddInterval(this.databaseAdapter.castToType(T`${t.end}`, "timestamp"), "P1D");
-		return T`${e} >= ${n} AND ${e} < ${r}`;
+		let n = this.databaseAdapter.castToType(C`${t.start}`, "timestamp"), r = this.databaseAdapter.buildDateAddInterval(this.databaseAdapter.castToType(C`${t.end}`, "timestamp"), "P1D");
+		return C`${e} >= ${n} AND ${e} < ${r}`;
 	}
 	buildDateRangeHavingCondition(e, t) {
-		let n = this.databaseAdapter.castToType(T`${t.start}`, "timestamp"), r = this.databaseAdapter.buildDateAddInterval(this.databaseAdapter.castToType(T`${t.end}`, "timestamp"), "P1D");
-		return T`MIN(${e}) >= ${n} AND MIN(${e}) < ${r}`;
+		let n = this.databaseAdapter.castToType(C`${t.start}`, "timestamp"), r = this.databaseAdapter.buildDateAddInterval(this.databaseAdapter.castToType(C`${t.end}`, "timestamp"), "P1D");
+		return C`MIN(${e}) >= ${n} AND MIN(${e}) < ${r}`;
 	}
 	buildActivityPeriodsCTE(e, t, n) {
 		let r = t.cube.sql(n), i = [];
-		r.where && i.push(r.where), i.push(...t.activityFilterConditions), i.push(T`${t.timeExpr} >= cohort_base.cohort_entry`);
-		let a = this.databaseAdapter.buildTimeDimension(e.granularity, t.timeExpr), o = this.buildPeriodNumberExpression(T`cohort_base.cohort_entry`, a, e.granularity), s = {
-			binding_key: T`cohort_base.binding_key`.as("binding_key"),
+		r.where && i.push(r.where), i.push(...t.activityFilterConditions), i.push(C`${t.timeExpr} >= cohort_base.cohort_entry`);
+		let a = this.databaseAdapter.buildTimeDimension(e.granularity, t.timeExpr), o = this.buildPeriodNumberExpression(C`cohort_base.cohort_entry`, a, e.granularity), s = {
+			binding_key: C`cohort_base.binding_key`.as("binding_key"),
 			period_number: o.as("period_number")
 		};
-		for (let e = 0; e < t.breakdowns.length; e++) s[`breakdown_${e}`] = T.raw(`cohort_base.breakdown_${e}`).as(`breakdown_${e}`);
-		let c = n.db.select(s).from(r.from).innerJoin(T`cohort_base`, T`${t.bindingKeyExpr} = cohort_base.binding_key`);
+		for (let e = 0; e < t.breakdowns.length; e++) s[`breakdown_${e}`] = C.raw(`cohort_base.breakdown_${e}`).as(`breakdown_${e}`);
+		let c = n.db.select(s).from(r.from).innerJoin(C`cohort_base`, C`${t.bindingKeyExpr} = cohort_base.binding_key`);
 		i.length > 0 && (c = c.where(R(i)));
-		let l = [T`cohort_base.binding_key`, o];
-		for (let e = 0; e < t.breakdowns.length; e++) l.push(T.raw(`cohort_base.breakdown_${e}`));
+		let l = [C`cohort_base.binding_key`, o];
+		for (let e = 0; e < t.breakdowns.length; e++) l.push(C.raw(`cohort_base.breakdown_${e}`));
 		return c = c.groupBy(...l), n.db.$with("activity_periods").as(c);
 	}
 	buildCohortSizesCTE(e, t, n) {
 		if (n > 0) {
-			let e = { cohort_size: T`COUNT(*)`.as("cohort_size") }, r = [];
-			for (let t = 0; t < n; t++) e[`breakdown_${t}`] = T.raw(`breakdown_${t}`).as(`breakdown_${t}`), r.push(T.raw(`breakdown_${t}`));
-			let i = t.db.select(e).from(T`cohort_base`).groupBy(...r);
+			let e = { cohort_size: C`COUNT(*)`.as("cohort_size") }, r = [];
+			for (let t = 0; t < n; t++) e[`breakdown_${t}`] = C.raw(`breakdown_${t}`).as(`breakdown_${t}`), r.push(C.raw(`breakdown_${t}`));
+			let i = t.db.select(e).from(C`cohort_base`).groupBy(...r);
 			return t.db.$with("cohort_sizes").as(i);
 		}
-		let r = t.db.select({ cohort_size: T`COUNT(*)`.as("cohort_size") }).from(T`cohort_base`);
+		let r = t.db.select({ cohort_size: C`COUNT(*)`.as("cohort_size") }).from(C`cohort_base`);
 		return t.db.$with("cohort_sizes").as(r);
 	}
 	buildRetentionCountsCTE(e, t, n) {
@@ -5667,32 +5667,32 @@ var pr = {
 		if (e.retentionType === "rolling") r = this.buildRollingRetentionCountsQuery(e, t, n);
 		else {
 			let i = {
-				period_number: T`period_number`.as("period_number"),
-				retained_users: T`COUNT(DISTINCT binding_key)`.as("retained_users")
-			}, a = [T`period_number`];
-			for (let e = 0; e < n; e++) i[`breakdown_${e}`] = T.raw(`breakdown_${e}`).as(`breakdown_${e}`), a.push(T.raw(`breakdown_${e}`));
+				period_number: C`period_number`.as("period_number"),
+				retained_users: C`COUNT(DISTINCT binding_key)`.as("retained_users")
+			}, a = [C`period_number`];
+			for (let e = 0; e < n; e++) i[`breakdown_${e}`] = C.raw(`breakdown_${e}`).as(`breakdown_${e}`), a.push(C.raw(`breakdown_${e}`));
 			let o = Math.min(e.periods, 52);
-			r = t.db.select(i).from(T`activity_periods`).where(T`period_number >= 0 AND period_number <= ${o}`).groupBy(...a);
+			r = t.db.select(i).from(C`activity_periods`).where(C`period_number >= 0 AND period_number <= ${o}`).groupBy(...a);
 		}
 		return t.db.$with("retention_counts").as(r);
 	}
 	buildRollingRetentionCountsQuery(e, t, n) {
 		let r = [];
 		for (let e = 0; e < n; e++) r.push(`breakdown_${e}`);
-		let i = r.length > 0 ? `, ${r.join(", ")}` : "", a = Math.min(e.periods, 52), o = T`(
+		let i = r.length > 0 ? `, ${r.join(", ")}` : "", a = Math.min(e.periods, 52), o = C`(
       SELECT
         binding_key,
-        ${T.raw(r.map((e) => `${e}`).join(", ") + (r.length > 0 ? "," : ""))}
+        ${C.raw(r.map((e) => `${e}`).join(", ") + (r.length > 0 ? "," : ""))}
         MAX(period_number) as max_period
       FROM activity_periods
       WHERE period_number >= 0 AND period_number <= ${a}
-      GROUP BY binding_key${T.raw(i)}
+      GROUP BY binding_key${C.raw(i)}
     )`, s = this.databaseAdapter.buildPeriodSeriesSubquery(a), c = {
-			period_number: T`p.period_number`.as("period_number"),
-			retained_users: T`COUNT(DISTINCT CASE WHEN ump.max_period >= p.period_number THEN ump.binding_key END)`.as("retained_users")
-		}, l = [T`p.period_number`];
-		for (let e = 0; e < n; e++) c[`breakdown_${e}`] = T.raw(`ump.breakdown_${e}`).as(`breakdown_${e}`), l.push(T.raw(`ump.breakdown_${e}`));
-		return t.db.select(c).from(T`${o} ump`).innerJoin(s, T`TRUE`).groupBy(...l);
+			period_number: C`p.period_number`.as("period_number"),
+			retained_users: C`COUNT(DISTINCT CASE WHEN ump.max_period >= p.period_number THEN ump.binding_key END)`.as("retained_users")
+		}, l = [C`p.period_number`];
+		for (let e = 0; e < n; e++) c[`breakdown_${e}`] = C.raw(`ump.breakdown_${e}`).as(`breakdown_${e}`), l.push(C.raw(`ump.breakdown_${e}`));
+		return t.db.select(c).from(C`${o} ump`).innerJoin(s, C`TRUE`).groupBy(...l);
 	}
 	buildPeriodNumberExpression(e, t, n) {
 		return this.databaseAdapter.buildDateDiffPeriods(e, t, n);
@@ -5700,51 +5700,51 @@ var pr = {
 };
 //#endregion
 //#region src/server/logical-plan/schema-builder.ts
-function Z(e) {
+function X(e) {
 	return {
 		name: e.name,
 		cube: e
 	};
 }
-function hr(e, n) {
+function Z(e, t) {
 	return e.measures ? e.measures.map((e) => {
-		let [r, i] = e.split("."), a = n.get(r);
-		if (!a) throw Error(t("server.errors.cubeNotFoundForMeasure", {
-			cubeName: r,
+		let [n, r] = e.split("."), i = t.get(n);
+		if (!i) throw Error(S("server.errors.cubeNotFoundForMeasure", {
+			cubeName: n,
 			measure: e
 		}));
 		return {
 			name: e,
-			cube: Z(a),
-			localName: i
+			cube: X(i),
+			localName: r
 		};
 	}) : [];
 }
-function gr(e, n) {
+function gr(e, t) {
 	return e.dimensions ? e.dimensions.map((e) => {
-		let [r, i] = e.split("."), a = n.get(r);
-		if (!a) throw Error(t("server.errors.cubeNotFoundForDimension", {
-			cubeName: r,
+		let [n, r] = e.split("."), i = t.get(n);
+		if (!i) throw Error(S("server.errors.cubeNotFoundForDimension", {
+			cubeName: n,
 			dimension: e
 		}));
 		return {
 			name: e,
-			cube: Z(a),
-			localName: i
+			cube: X(i),
+			localName: r
 		};
 	}) : [];
 }
-function _r(e, n) {
+function _r(e, t) {
 	return e.timeDimensions ? e.timeDimensions.map((e) => {
-		let [r, i] = e.dimension.split("."), a = n.get(r);
-		if (!a) throw Error(t("server.errors.cubeNotFoundForTimeDimension", {
-			cubeName: r,
+		let [n, r] = e.dimension.split("."), i = t.get(n);
+		if (!i) throw Error(S("server.errors.cubeNotFoundForTimeDimension", {
+			cubeName: n,
 			timeDimension: e.dimension
 		}));
 		return {
 			name: e.dimension,
-			cube: Z(a),
-			localName: i,
+			cube: X(i),
+			localName: r,
 			granularity: e.granularity,
 			dateRange: e.dateRange,
 			fillMissingDates: e.fillMissingDates,
@@ -5754,7 +5754,7 @@ function _r(e, n) {
 }
 function vr(e, t) {
 	return {
-		measures: hr(e, t),
+		measures: Z(e, t),
 		dimensions: gr(e, t),
 		timeDimensions: _r(e, t)
 	};
@@ -5786,57 +5786,57 @@ var br = class {
 	plan(e, t, n) {
 		return this.planWithAnalysis(e, t, n).plan;
 	}
-	planWithAnalysis(e, n, r) {
-		let i = Array.from(this.queryPlanner.analyzeCubeUsage(n));
-		if (i.length === 0) throw Error(t("server.errors.noCubesInQuery"));
-		let a = this.queryPlanner.analyzePrimaryCube(i, n, e), o = a.selectedCube, s = e.get(o);
-		if (!s) throw Error(t("server.errors.primaryCubeNotFound", { cubeName: o }));
-		let c = i.filter((e) => e !== o).map((t) => this.queryPlanner.analyzeJoinPathForTarget(e, o, t, n)), l = i.length > 1 ? this.queryPlanner.buildJoinPlanForPrimary(e, s, i, r, n) : [], u = i.length > 1 ? this.queryPlanner.buildPreAggregationCTEs(e, s, l, n, r) ?? [] : [], d = this.queryPlanner.buildWarnings(n, u), f = this.buildSourceFromPhases(s, l, u, e, n, r), p = f.source, m = this.buildQueryNode(p, n, e, d), h = this.buildPreAggregationAnalysis(u), g = /* @__PURE__ */ new Map();
-		for (let t of i) {
+	planWithAnalysis(e, t, n) {
+		let r = Array.from(this.queryPlanner.analyzeCubeUsage(t));
+		if (r.length === 0) throw Error(S("server.errors.noCubesInQuery"));
+		let i = this.queryPlanner.analyzePrimaryCube(r, t, e), a = i.selectedCube, o = e.get(a);
+		if (!o) throw Error(S("server.errors.primaryCubeNotFound", { cubeName: a }));
+		let s = r.filter((e) => e !== a).map((n) => this.queryPlanner.analyzeJoinPathForTarget(e, a, n, t)), c = r.length > 1 ? this.queryPlanner.buildJoinPlanForPrimary(e, o, r, n, t) : [], l = r.length > 1 ? this.queryPlanner.buildPreAggregationCTEs(e, o, c, t, n) ?? [] : [], u = this.queryPlanner.buildWarnings(t, l), d = this.buildSourceFromPhases(o, c, l, e, t, n), f = d.source, p = this.buildQueryNode(f, t, e, u), m = this.buildPreAggregationAnalysis(l), h = /* @__PURE__ */ new Map();
+		for (let t of r) {
 			let n = e.get(t);
-			n && g.set(t, n);
+			n && h.set(t, n);
 		}
-		let _ = ln(n.measures ?? [], g), v = [...c.filter((e) => !e.pathFound && e.error).map((e) => e.error), ...d.map((e) => e.message)];
+		let g = ln(t.measures ?? [], h), _ = [...s.filter((e) => !e.pathFound && e.error).map((e) => e.error), ...u.map((e) => e.message)];
 		return {
-			plan: m,
+			plan: p,
 			analysis: {
 				timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-				cubeCount: i.length,
-				cubesInvolved: [...i].sort(),
-				primaryCube: a,
-				joinPaths: c,
-				preAggregations: h,
+				cubeCount: r.length,
+				cubesInvolved: [...r].sort(),
+				primaryCube: i,
+				joinPaths: s,
+				preAggregations: m,
 				querySummary: {
-					queryType: u.length > 0 ? "multi_cube_cte" : i.length > 1 ? "multi_cube_join" : "single_cube",
-					measureStrategy: f.strategy,
-					joinCount: l.length,
-					cteCount: u.length,
-					hasPreAggregation: u.length > 0,
-					hasWindowFunctions: _
+					queryType: l.length > 0 ? "multi_cube_cte" : r.length > 1 ? "multi_cube_join" : "single_cube",
+					measureStrategy: d.strategy,
+					joinCount: c.length,
+					cteCount: l.length,
+					hasPreAggregation: l.length > 0,
+					hasWindowFunctions: g
 				},
-				warnings: v.length > 0 ? v : void 0,
+				warnings: _.length > 0 ? _ : void 0,
 				planningTrace: { steps: [
 					{
 						phase: "cube_usage",
-						decision: `Identified ${i.length} cube${i.length === 1 ? "" : "s"} from query members`,
-						details: { cubesInvolved: [...i].sort() }
+						decision: `Identified ${r.length} cube${r.length === 1 ? "" : "s"} from query members`,
+						details: { cubesInvolved: [...r].sort() }
 					},
 					{
 						phase: "primary_cube_selection",
-						decision: `Selected '${a.selectedCube}' as primary cube (${a.reason})`,
+						decision: `Selected '${i.selectedCube}' as primary cube (${i.reason})`,
 						details: {
-							selectedCube: a.selectedCube,
-							reason: a.reason,
-							candidates: a.candidates?.map((e) => e.cubeName)
+							selectedCube: i.selectedCube,
+							reason: i.reason,
+							candidates: i.candidates?.map((e) => e.cubeName)
 						}
 					},
 					{
 						phase: "join_planning",
-						decision: `Planned ${l.length} join${l.length === 1 ? "" : "s"}`,
+						decision: `Planned ${c.length} join${c.length === 1 ? "" : "s"}`,
 						details: {
-							joinCount: l.length,
-							joinTargets: l.map((e) => e.target.name),
-							pathSelection: c.map((e) => ({
+							joinCount: c.length,
+							joinTargets: c.map((e) => e.target.name),
+							pathSelection: s.map((e) => ({
 								targetCube: e.targetCube,
 								strategy: e.selection?.strategy,
 								selectedRank: e.selection?.selectedRank,
@@ -5846,27 +5846,27 @@ var br = class {
 					},
 					{
 						phase: "cte_planning",
-						decision: `Planned ${u.length} pre-aggregation CTE${u.length === 1 ? "" : "s"}`,
+						decision: `Planned ${l.length} pre-aggregation CTE${l.length === 1 ? "" : "s"}`,
 						details: {
-							cteCount: u.length,
-							cubes: u.map((e) => e.cube.name)
+							cteCount: l.length,
+							cubes: l.map((e) => e.cube.name)
 						}
 					},
 					{
 						phase: "measure_strategy",
-						decision: `Selected '${f.strategy}' measure strategy`,
+						decision: `Selected '${d.strategy}' measure strategy`,
 						details: {
-							strategy: f.strategy,
-							regularMeasures: f.classification.regular.map((e) => e.name),
-							multipliedMeasures: f.classification.multiplied.map((e) => e.name),
-							deduplicationSafeMeasures: f.classification.deduplicationSafe.map((e) => e.name),
-							sourceType: p.type
+							strategy: d.strategy,
+							regularMeasures: d.classification.regular.map((e) => e.name),
+							multipliedMeasures: d.classification.multiplied.map((e) => e.name),
+							deduplicationSafeMeasures: d.classification.deduplicationSafe.map((e) => e.name),
+							sourceType: f.type
 						}
 					},
 					{
 						phase: "warnings",
-						decision: d.length > 0 ? `Generated ${d.length} planning warning${d.length === 1 ? "" : "s"}` : "No planning warnings generated",
-						details: { warningCodes: d.map((e) => e.code) }
+						decision: u.length > 0 ? `Generated ${u.length} planning warning${u.length === 1 ? "" : "s"}` : "No planning warnings generated",
+						details: { warningCodes: u.map((e) => e.code) }
 					}
 				] }
 			}
@@ -5878,7 +5878,7 @@ var br = class {
 			source: o,
 			strategy: "multiFactMerge",
 			classification: {
-				regular: hr(i, r),
+				regular: Z(i, r),
 				multiplied: [],
 				deduplicationSafe: []
 			}
@@ -5895,8 +5895,8 @@ var br = class {
 		};
 	}
 	buildSimpleSourceFromPhases(e, t, n, r, i) {
-		let a = Z(e), o = t, s = n.map((e) => {
-			let t = Z(e.cube);
+		let a = X(e), o = t, s = n.map((e) => {
+			let t = X(e.cube);
 			return {
 				type: "ctePreAggregate",
 				schema: yr(e, r),
@@ -5943,7 +5943,7 @@ var br = class {
 		let o = Array.from(r);
 		if (!o.every((e) => this.hasDirectJoinToSharedDimension(t.get(e), a, t))) return null;
 		let s = gr(e, t), c = _r(e, t), l = {
-			measures: hr(e, t),
+			measures: Z(e, t),
 			dimensions: s,
 			timeDimensions: c
 		}, u = [];
@@ -5968,7 +5968,7 @@ var br = class {
 	hasDirectJoinToSharedDimension(e, t, n) {
 		if (!e?.joins) return !1;
 		for (let [, r] of Object.entries(e.joins)) {
-			let e = o(r.targetCube, n);
+			let e = h(r.targetCube, n);
 			if (!(!e || e.name !== t) && (r.relationship === "belongsTo" || r.relationship === "hasOne")) return !0;
 		}
 		return !1;
@@ -6161,19 +6161,19 @@ function Sr(e, t, n, r) {
 		downstreamCubeMap: s
 	};
 }
-function Cr(e, t, r) {
-	let i = /* @__PURE__ */ new Map();
-	if (!e.preAggregationCTEs || e.preAggregationCTEs.length === 0) return i;
-	for (let a of e.preAggregationCTEs) if (!(!a.propagatingFilters || a.propagatingFilters.length === 0)) for (let e of a.propagatingFilters) {
-		let a = e.sourceCube.name;
-		if (!i.has(a)) {
-			let n = { filters: e.filters }, o = /* @__PURE__ */ new Map([[a, e.sourceCube]]), s = r.queryBuilder.buildWhereConditions(o, n, t);
-			i.set(a, s);
+function Cr(e, t, n) {
+	let r = /* @__PURE__ */ new Map();
+	if (!e.preAggregationCTEs || e.preAggregationCTEs.length === 0) return r;
+	for (let i of e.preAggregationCTEs) if (!(!i.propagatingFilters || i.propagatingFilters.length === 0)) for (let e of i.propagatingFilters) {
+		let i = e.sourceCube.name;
+		if (!r.has(i)) {
+			let a = { filters: e.filters }, o = /* @__PURE__ */ new Map([[i, e.sourceCube]]), s = n.queryBuilder.buildWhereConditions(o, a, t);
+			r.set(i, s);
 		}
-		let o = i.get(a);
-		o && o.length > 0 && (e.preBuiltFilterSQL = o.length === 1 ? o[0] : n(...o));
+		let a = r.get(i);
+		a && a.length > 0 && (e.preBuiltFilterSQL = a.length === 1 ? a[0] : w(...a));
 	}
-	return i;
+	return r;
 }
 function wr(e, t) {
 	if (e.downstreamJoinKeys) for (let n of e.downstreamJoinKeys) t.set(n.targetCubeName, {
@@ -6195,21 +6195,21 @@ function Tr(e, t, n, r, i, a) {
 		if (!m?.measures?.[p]) continue;
 		let h = m.measures[p], g = t.preAggregationCTEs?.find((e) => e.cube?.name === f && e.measures?.includes(d)), _;
 		if (g) {
-			let e = T`${T.identifier(g.cteAlias)}.${T.identifier(p)}`;
-			_ = T`sum(${e})`;
+			let e = C`${C.identifier(g.cteAlias)}.${C.identifier(p)}`;
+			_ = C`sum(${e})`;
 		} else _ = a.queryBuilder.buildMeasureExpression(h, r, m);
-		e[d] || (e[d] = T`${_}`.as(d));
+		e[d] || (e[d] = C`${_}`.as(d));
 		let v = Er(u, _, n, r, l, t, a);
-		v && (e[o] = T`${v}`.as(o));
+		v && (e[o] = C`${v}`.as(o));
 	}
 }
 function Er(e, t, n, r, i, a, o) {
 	let s = e.windowConfig || {}, c = (e, t) => {
 		if (!a.preAggregationCTEs) return null;
 		let n = a.preAggregationCTEs.find((t) => t.cube?.name === e);
-		return n && n.cteAlias ? T`${T.identifier(n.cteAlias)}.${T.identifier(t)}` : null;
-	}, l;
-	if (s.orderBy && s.orderBy.length > 0) l = s.orderBy.map((e) => {
+		return n && n.cteAlias ? C`${C.identifier(n.cteAlias)}.${C.identifier(t)}` : null;
+	}, u;
+	if (s.orderBy && s.orderBy.length > 0) u = s.orderBy.map((e) => {
 		let a = e.field.includes(".") ? e.field.split(".")[1] : e.field;
 		if (n.timeDimensions) for (let t of n.timeDimensions) {
 			let [n, s] = t.dimension.split(".");
@@ -6226,9 +6226,9 @@ function Er(e, t, n, r, i, a, o) {
 				};
 			}
 		}
-		let l = i.dimensions?.[a];
-		return l ? {
-			field: f(l.sql, r),
+		let u = i.dimensions?.[a];
+		return u ? {
+			field: l(u.sql, r),
 			direction: e.direction
 		} : a === (s.measure?.includes(".") ? s.measure.split(".")[1] : s.measure) || e.field === s.measure ? {
 			field: t,
@@ -6237,7 +6237,7 @@ function Er(e, t, n, r, i, a, o) {
 	}).filter((e) => e !== null);
 	else if (n.timeDimensions && n.timeDimensions.length > 0) {
 		let e = n.timeDimensions[0], [t, a] = e.dimension.split("."), s = c(t, a);
-		if (s) l = [{
+		if (s) u = [{
 			field: s,
 			direction: "asc"
 		}];
@@ -6245,30 +6245,30 @@ function Er(e, t, n, r, i, a, o) {
 			let n = i.name === t ? i : void 0;
 			if (n?.dimensions?.[a]) {
 				let t = n.dimensions[a];
-				l = [{
+				u = [{
 					field: o.queryBuilder.buildTimeDimensionExpression(t.sql, e.granularity, r),
 					direction: "asc"
 				}];
 			}
 		}
 	}
-	let u;
-	s.partitionBy && s.partitionBy.length > 0 && (u = s.partitionBy.map((e) => {
+	let d;
+	s.partitionBy && s.partitionBy.length > 0 && (d = s.partitionBy.map((e) => {
 		let t = e.includes(".") ? e.split(".")[1] : e, n = i.dimensions?.[t];
-		return n ? f(n.sql, r) : null;
+		return n ? l(n.sql, r) : null;
 	}).filter((e) => e !== null));
-	let d = o.databaseAdapter.buildWindowFunction(e.type, t, u, l, {
+	let f = o.databaseAdapter.buildWindowFunction(e.type, t, d, u, {
 		offset: s.offset,
 		defaultValue: s.defaultValue,
 		nTile: s.nTile,
 		frame: s.frame
 	});
-	if (!d) return null;
+	if (!f) return null;
 	switch (s.operation || U.getDefaultWindowOperation(e.type)) {
-		case "difference": return T`${t} - ${d}`;
-		case "ratio": return T`${t} / NULLIF(${d}, 0)`;
-		case "percentChange": return T`((${t} - ${d}) / NULLIF(${d}, 0)) * 100`;
-		default: return d;
+		case "difference": return C`${t} - ${f}`;
+		case "ratio": return C`${t} / NULLIF(${f}, 0)`;
+		case "percentChange": return C`((${t} - ${f}) / NULLIF(${f}, 0)) * 100`;
+		default: return f;
 	}
 }
 //#endregion
@@ -6284,8 +6284,8 @@ function Or(e, t, n, r, i, a) {
 		if (!e[s]) continue;
 		let [, c] = s.split("."), l = i.get(o);
 		if (!l?.measures?.[c]) continue;
-		let u = l.measures[c], d = T`${T.identifier(t.cteAlias)}.${T.identifier(c)}`, f;
-		f = u.type === "calculated" && u.calculatedSql ? a.queryBuilder.buildCTECalculatedMeasure(u, l, t, i, r) : kr(u, d, t, n, i, a), e[s] = T`${f}`.as(s);
+		let u = l.measures[c], d = C`${C.identifier(t.cteAlias)}.${C.identifier(c)}`, f;
+		f = u.type === "calculated" && u.calculatedSql ? a.queryBuilder.buildCTECalculatedMeasure(u, l, t, i, r) : kr(u, d, t, n, i, a), e[s] = C`${f}`.as(s);
 	}
 }
 function kr(e, t, n, r, i, a) {
@@ -6313,7 +6313,7 @@ function Ar(e, t, n) {
 			let e = s.dimensions[o].sql;
 			u = t.joinKeys.find((t) => t.targetColumnObj === e);
 		}
-		(u || l && s?.dimensions?.[o]) && (e[i] = T`${T.identifier(t.cteAlias)}.${T.identifier(o)}`.as(i));
+		(u || l && s?.dimensions?.[o]) && (e[i] = C`${C.identifier(t.cteAlias)}.${C.identifier(o)}`.as(i));
 	}
 }
 function jr(e, t, n) {
@@ -6394,61 +6394,61 @@ function Rr(e, t, n, r, i, a) {
 		return e;
 	}
 }
-function zr(e, t, r, i) {
-	let a = e.joinCondition, o = e.sourceCubeName ? i.cteAliasMap.get(e.sourceCubeName) : void 0;
-	if (!o) return a;
-	let s = (r.preAggregationCTEs?.find((t) => t.cube.name === e.sourceCubeName))?.downstreamJoinKeys?.find((e) => e.targetCubeName === t.cube.name);
-	if (s && s.joinKeys.length > 0) {
+function zr(e, t, n, r) {
+	let i = e.joinCondition, a = e.sourceCubeName ? r.cteAliasMap.get(e.sourceCubeName) : void 0;
+	if (!a) return i;
+	let o = (n.preAggregationCTEs?.find((t) => t.cube.name === e.sourceCubeName))?.downstreamJoinKeys?.find((e) => e.targetCubeName === t.cube.name);
+	if (o && o.joinKeys.length > 0) {
 		let e = [];
-		for (let t of s.joinKeys) {
-			let n = T`${T.identifier(o)}.${T.identifier(t.sourceColumn)}`, r = t.targetColumnObj;
-			r && e.push(x(r, n));
+		for (let t of o.joinKeys) {
+			let n = C`${C.identifier(a)}.${C.identifier(t.sourceColumn)}`, r = t.targetColumnObj;
+			r && e.push(b(r, n));
 		}
-		e.length > 0 && (a = n(...e));
+		e.length > 0 && (i = w(...e));
 	}
-	return a;
+	return i;
 }
-function Br(e, t, r, i, a, o) {
+function Br(e, t, n, r, i, a) {
 	if (t) return {
-		joinTarget: T`${T.identifier(t)}`,
-		joinCondition: o.cteBuilder.buildCTEJoinCondition(e, t, i),
+		joinTarget: C`${C.identifier(t)}`,
+		joinCondition: a.cteBuilder.buildCTEJoinCondition(e, t, r),
 		securityCondition: void 0,
 		joinCubeBase: void 0
 	};
-	let s = r.downstreamCubeMap.get(e.cube.name), c = e.cube.sql(a), l;
-	if (s && !e.junctionTable) {
+	let o = n.downstreamCubeMap.get(e.cube.name), s = e.cube.sql(i), c;
+	if (o && !e.junctionTable) {
 		let e = [];
-		for (let t of s.joinKeys) {
-			let n = T`${T.identifier(s.cteAlias)}.${T.identifier(t.sourceColumn)}`, r = t.targetColumnObj || T.identifier(t.targetColumn);
-			e.push(x(n, r));
+		for (let t of o.joinKeys) {
+			let n = C`${C.identifier(o.cteAlias)}.${C.identifier(t.sourceColumn)}`, r = t.targetColumnObj || C.identifier(t.targetColumn);
+			e.push(b(n, r));
 		}
-		l = e.length === 1 ? e[0] : n(...e);
-	} else l = e.joinCondition;
+		c = e.length === 1 ? e[0] : w(...e);
+	} else c = e.joinCondition;
 	return {
-		joinTarget: c.from,
-		joinCondition: l,
-		securityCondition: c.where,
-		joinCubeBase: c
+		joinTarget: s.from,
+		joinCondition: c,
+		securityCondition: s.where,
+		joinCubeBase: s
 	};
 }
-function Vr(e, t, r, i, a, o, s) {
-	let { joinTarget: c, joinCondition: l, securityCondition: u, joinCubeBase: d } = Br(t, i.cteAliasMap.get(t.cube.name), i, r, a, o), f = t.joinType || "left", p = f !== "inner" && u ? n(l, u) : l;
+function Vr(e, t, n, r, i, a, o) {
+	let { joinTarget: s, joinCondition: c, securityCondition: l, joinCubeBase: u } = Br(t, r.cteAliasMap.get(t.cube.name), r, n, i, a), d = t.joinType || "left", f = d !== "inner" && l ? w(c, l) : c;
 	try {
 		let n;
-		return f === "inner" ? n = e.innerJoin(c, l) : (n = Q(e, f, c, p), u && s.add(t.cube.name)), Ir(n, d?.joins);
+		return d === "inner" ? n = e.innerJoin(s, c) : (n = Q(e, d, s, f), l && o.add(t.cube.name)), Ir(n, u?.joins);
 	} catch {
 		return e;
 	}
 }
 //#endregion
 //#region src/server/physical-plan/processors/predicates-processor.ts
-function Hr(e, t, r, i, a, o, s, c) {
-	let l = Ur(e, t, r, i, a, o, s, c), u = s.drizzleQuery;
-	if (l.length > 0) {
-		let e = l.length === 1 ? l[0] : n(...l);
-		u = u.where(e);
+function Hr(e, t, n, r, i, a, o, s) {
+	let c = Ur(e, t, n, r, i, a, o, s), l = o.drizzleQuery;
+	if (c.length > 0) {
+		let e = c.length === 1 ? c[0] : w(...c);
+		l = l.where(e);
 	}
-	return Wr(u, e, t, r, i, c);
+	return Wr(l, e, t, n, r, s);
 }
 function Ur(e, t, n, r, i, a, o, s) {
 	let c = [...o.allWhereConditions];
@@ -6461,17 +6461,17 @@ function Ur(e, t, n, r, i, a, o, s) {
 	let l = s.queryBuilder.buildWhereConditions(e.joinCubes.length > 0 ? r : e.primaryCube, t, n, e, a.preBuiltFilterMap);
 	return l.length > 0 && c.push(...l), c;
 }
-function Wr(e, t, r, i, a, o) {
-	let s = t.joinCubes.length > 0 ? a : t.primaryCube, c = e, l = o.queryBuilder.buildGroupByFields(s, r, i, t);
-	if (l.length > 0 && (c = c.groupBy(...l)), !r.ungrouped) {
-		let e = o.queryBuilder.buildHavingConditions(s, r, i, t);
+function Wr(e, t, n, r, i, a) {
+	let o = t.joinCubes.length > 0 ? i : t.primaryCube, s = e, c = a.queryBuilder.buildGroupByFields(o, n, r, t);
+	if (c.length > 0 && (s = s.groupBy(...c)), !n.ungrouped) {
+		let e = a.queryBuilder.buildHavingConditions(o, n, r, t);
 		if (e.length > 0) {
-			let t = e.length === 1 ? e[0] : n(...e);
-			c = c.having(t);
+			let t = e.length === 1 ? e[0] : w(...e);
+			s = s.having(t);
 		}
 	}
-	let u = o.queryBuilder.buildOrderBy(r);
-	return u.length > 0 && (c = c.orderBy(...u)), o.queryBuilder.applyLimitAndOffset(c, r);
+	let l = a.queryBuilder.buildOrderBy(n);
+	return l.length > 0 && (s = s.orderBy(...l)), a.queryBuilder.applyLimitAndOffset(s, n);
 }
 //#endregion
 //#region src/server/physical-plan/processors/keys-dedup-processor.ts
@@ -6501,37 +6501,37 @@ function Kr(e, t, n, r, i, a, o) {
 	if (e.dimensions) for (let n of e.dimensions) {
 		let [e, i] = n.split("."), a = r.get(e), o = a?.dimensions?.[i];
 		if (!a || !o) return null;
-		let l = f(o.sql, t);
-		s[n] = T`${l}`.as(n), c.push(l);
+		let u = l(o.sql, t);
+		s[n] = C`${u}`.as(n), c.push(u);
 	}
 	if (e.timeDimensions) for (let i of e.timeDimensions) {
 		let [e, a] = i.dimension.split("."), o = r.get(e), l = o?.dimensions?.[a];
 		if (!o || !l) return null;
 		let u = n.queryBuilder.buildTimeDimensionExpression(l.sql, i.granularity, t);
-		s[i.dimension] = T`${u}`.as(i.dimension), c.push(u);
+		s[i.dimension] = C`${u}`.as(i.dimension), c.push(u);
 	}
-	let l = [];
+	let u = [];
 	for (let e of a) {
 		let n = i.dimensions?.[e];
 		if (!n) return null;
-		let r = f(n.sql, t), a = `__pk__${e}`;
-		s[a] = T`${r}`.as(a), c.push(r), l.push(a);
+		let r = l(n.sql, t), a = `__pk__${e}`;
+		s[a] = C`${r}`.as(a), c.push(r), u.push(a);
 	}
-	let u = new Set(o), d = e.measures.filter((e) => !u.has(e));
+	let d = new Set(o), f = e.measures.filter((e) => !d.has(e));
 	if (o.length > 0) {
 		let e = n.queryBuilder.buildResolvedMeasures(o, r, t);
 		for (let t of o) {
 			let n = e.get(t);
 			if (!n) return null;
 			let r = `__reg__${t.replace(".", "__")}`;
-			s[r] = T`${n()}`.as(r);
+			s[r] = C`${n()}`.as(r);
 		}
 	}
 	return {
 		keysSelections: s,
 		keyGroupBy: c,
-		pkAliases: l,
-		multipliedMeasures: d
+		pkAliases: u,
+		multipliedMeasures: f
 	};
 }
 function qr(e, t, n, r, i, a, o, s) {
@@ -6567,8 +6567,8 @@ function Zr(e, t, n, r, i) {
 	for (let t of r) {
 		let r = n.dimensions?.[t];
 		if (!r) return null;
-		let i = f(r.sql, e);
-		a[t] = T`${i}`.as(t), o.push(i);
+		let i = l(r.sql, e);
+		a[t] = C`${i}`.as(t), o.push(i);
 	}
 	let s = /* @__PURE__ */ new Set();
 	for (let e of i) {
@@ -6584,7 +6584,7 @@ function Zr(e, t, n, r, i) {
 		for (let e of c) {
 			let [, t] = e.split("."), n = r.get(e);
 			if (!n || typeof n != "function") return null;
-			a[t] = T`${n()}`.as(t);
+			a[t] = C`${n()}`.as(t);
 		}
 	}
 	for (let t of i) {
@@ -6592,8 +6592,8 @@ function Zr(e, t, n, r, i) {
 		if (!s.has(r)) continue;
 		let i = n.measures?.[r];
 		if (!i?.sql) return null;
-		let o = f(i.sql, e), c = `__avg_sum__${r}`, l = `__avg_count__${r}`;
-		a[c] = T`sum(${o})`.as(c), a[l] = T`count(${o})`.as(l);
+		let o = l(i.sql, e), c = `__avg_sum__${r}`, u = `__avg_count__${r}`;
+		a[c] = C`sum(${o})`.as(c), a[u] = C`count(${o})`.as(u);
 	}
 	return {
 		aggSelections: a,
@@ -6601,26 +6601,26 @@ function Zr(e, t, n, r, i) {
 	};
 }
 function Qr(e, t) {
-	return t.length === 0 ? e : e.where(t.length === 1 ? t[0] : n(...t));
+	return t.length === 0 ? e : e.where(t.length === 1 ? t[0] : w(...t));
 }
-function $r(e, t, r, i, a, o) {
-	let { keysAlias: s, aggAlias: c, keysCte: l, aggCte: u, pkDimensions: d, pkAliases: f, multipliedMeasures: p, regularMeasureNames: m } = o, h = {};
-	for (let t of e.dimensions ?? []) h[t] = T`${T.identifier(s)}.${T.identifier(t)}`.as(t);
-	for (let t of e.timeDimensions ?? []) h[t.dimension] = T`${T.identifier(s)}.${T.identifier(t.dimension)}`.as(t.dimension);
-	for (let e of p) {
-		let [, t] = e.split("."), n = a.measures?.[t];
-		h[e] = ri(n?.type ?? "sum", c, t, e);
+function $r(e, t, n, r, i, a) {
+	let { keysAlias: o, aggAlias: s, keysCte: c, aggCte: l, pkDimensions: u, pkAliases: d, multipliedMeasures: f, regularMeasureNames: p } = a, m = {};
+	for (let t of e.dimensions ?? []) m[t] = C`${C.identifier(o)}.${C.identifier(t)}`.as(t);
+	for (let t of e.timeDimensions ?? []) m[t.dimension] = C`${C.identifier(o)}.${C.identifier(t.dimension)}`.as(t.dimension);
+	for (let e of f) {
+		let [, t] = e.split("."), n = i.measures?.[t];
+		m[e] = ri(n?.type ?? "sum", s, t, e);
 	}
-	for (let e of m) {
-		let [t, n] = e.split("."), r = i.get(t)?.measures?.[n], a = `__reg__${e.replace(".", "__")}`;
-		h[e] = ri(r?.type ?? "sum", s, a, e);
+	for (let e of p) {
+		let [t, n] = e.split("."), i = r.get(t)?.measures?.[n], a = `__reg__${e.replace(".", "__")}`;
+		m[e] = ri(i?.type ?? "sum", o, a, e);
 	}
-	let g = t.db.with(l, u).select(h).from(T`${T.identifier(s)}`), _ = f.map((e, t) => x(T`${T.identifier(s)}.${T.identifier(e)}`, T`${T.identifier(c)}.${T.identifier(d[t])}`)), v = _.length === 1 ? _[0] : n(..._);
-	g = g.leftJoin(T`${T.identifier(c)}`, v);
-	let y = [...(e.dimensions ?? []).map((e) => T`${T.identifier(s)}.${T.identifier(e)}`), ...(e.timeDimensions ?? []).map((e) => T`${T.identifier(s)}.${T.identifier(e.dimension)}`)];
-	y.length > 0 && (g = g.groupBy(...y));
-	let b = r.queryBuilder.buildOrderBy(e, Object.keys(h));
-	return b.length > 0 && (g = g.orderBy(...b)), r.queryBuilder.applyLimitAndOffset(g, e);
+	let h = t.db.with(c, l).select(m).from(C`${C.identifier(o)}`), g = d.map((e, t) => b(C`${C.identifier(o)}.${C.identifier(e)}`, C`${C.identifier(s)}.${C.identifier(u[t])}`)), _ = g.length === 1 ? g[0] : w(...g);
+	h = h.leftJoin(C`${C.identifier(s)}`, _);
+	let v = [...(e.dimensions ?? []).map((e) => C`${C.identifier(o)}.${C.identifier(e)}`), ...(e.timeDimensions ?? []).map((e) => C`${C.identifier(o)}.${C.identifier(e.dimension)}`)];
+	v.length > 0 && (h = h.groupBy(...v));
+	let y = n.queryBuilder.buildOrderBy(e, Object.keys(m));
+	return y.length > 0 && (h = h.orderBy(...y)), n.queryBuilder.applyLimitAndOffset(h, e);
 }
 function ei(e, t, n) {
 	if (!e.measures?.length) return !1;
@@ -6666,20 +6666,20 @@ function ni(e) {
 function ri(e, t, n, r) {
 	switch (e) {
 		case "min": {
-			let e = T`${T.identifier(t)}.${T.identifier(n)}`;
-			return T`min(${e})`.as(r);
+			let e = C`${C.identifier(t)}.${C.identifier(n)}`;
+			return C`min(${e})`.as(r);
 		}
 		case "max": {
-			let e = T`${T.identifier(t)}.${T.identifier(n)}`;
-			return T`max(${e})`.as(r);
+			let e = C`${C.identifier(t)}.${C.identifier(n)}`;
+			return C`max(${e})`.as(r);
 		}
 		case "avg": {
-			let e = T`${T.identifier(t)}.${T.identifier(`__avg_sum__${n}`)}`, i = T`${T.identifier(t)}.${T.identifier(`__avg_count__${n}`)}`;
-			return T`sum(${e}) / nullif(sum(${i}), 0)`.as(r);
+			let e = C`${C.identifier(t)}.${C.identifier(`__avg_sum__${n}`)}`, i = C`${C.identifier(t)}.${C.identifier(`__avg_count__${n}`)}`;
+			return C`sum(${e}) / nullif(sum(${i}), 0)`.as(r);
 		}
 		default: {
-			let e = T`${T.identifier(t)}.${T.identifier(n)}`;
-			return T`coalesce(sum(${e}), 0)`.as(r);
+			let e = C`${C.identifier(t)}.${C.identifier(n)}`;
+			return C`coalesce(sum(${e}), 0)`.as(r);
 		}
 	}
 }
@@ -6698,47 +6698,47 @@ function ai(e, t, n) {
 	let r = {};
 	for (let e of t) {
 		let t = fi(n, e);
-		r[e] = T`${t}`.as(e);
+		r[e] = C`${t}`.as(e);
 	}
 	for (let t of e.groups) for (let e of t.measures) {
-		let n = T`${T.identifier(t.alias)}.${T.identifier(e)}`;
-		r[e] = T`coalesce(${n}, 0)`.as(e);
+		let n = C`${C.identifier(t.alias)}.${C.identifier(e)}`;
+		r[e] = C`coalesce(${n}, 0)`.as(e);
 	}
 	return r;
 }
-function oi(e, t, r) {
-	if (t.length === 0) return T`1 = 1`;
-	let i = t.map((t) => x(r.get(t), T`${T.identifier(e)}.${T.identifier(t)}`));
-	return i.length === 1 ? i[0] : n(...i);
+function oi(e, t, n) {
+	if (t.length === 0) return C`1 = 1`;
+	let r = t.map((t) => b(n.get(t), C`${C.identifier(e)}.${C.identifier(t)}`));
+	return r.length === 1 ? r[0] : w(...r);
 }
 function si(e, t, n, r, i, a, o) {
-	let s = r.groups[0].alias, c = ai(r, a, r.groups.map((e) => e.alias)), l = t.db.with(...i).select(c).from(T`${T.identifier(s)}`), u = /* @__PURE__ */ new Map();
-	for (let e of a) u.set(e, T`${T.identifier(s)}.${T.identifier(e)}`);
+	let s = r.groups[0].alias, c = ai(r, a, r.groups.map((e) => e.alias)), l = t.db.with(...i).select(c).from(C`${C.identifier(s)}`), u = /* @__PURE__ */ new Map();
+	for (let e of a) u.set(e, C`${C.identifier(s)}.${C.identifier(e)}`);
 	for (let e = 1; e < r.groups.length; e++) {
 		let t = r.groups[e].alias, n = oi(t, a, u);
-		if (l = Q(l, o, T`${T.identifier(t)}`, n), a.length > 0 && o === "full") for (let e of a) u.set(e, T`coalesce(${u.get(e)}, ${T`${T.identifier(t)}.${T.identifier(e)}`})`);
+		if (l = Q(l, o, C`${C.identifier(t)}`, n), a.length > 0 && o === "full") for (let e of a) u.set(e, C`coalesce(${u.get(e)}, ${C`${C.identifier(t)}.${C.identifier(e)}`})`);
 	}
 	let d = n.queryBuilder.buildOrderBy(e, Object.keys(c));
 	return d.length > 0 && (l = l.orderBy(...d)), n.queryBuilder.applyLimitAndOffset(l, e);
 }
-function ci(e, t, r, i, a, o) {
-	let s = "mf_all_keys", c = i.groups.map((e) => T`select ${li(e.alias, o)} from ${T.identifier(e.alias)}`), l = T`${T.join(c, T` union `)}`, u = t.db.$with(s).as(l), d = {};
-	for (let e of o) d[e] = T`${T.identifier(s)}.${T.identifier(e)}`.as(e);
-	for (let e of i.groups) for (let t of e.measures) {
-		let n = T`${T.identifier(e.alias)}.${T.identifier(t)}`;
-		d[t] = T`coalesce(${n}, 0)`.as(t);
+function ci(e, t, n, r, i, a) {
+	let o = "mf_all_keys", s = r.groups.map((e) => C`select ${li(e.alias, a)} from ${C.identifier(e.alias)}`), c = C`${C.join(s, C` union `)}`, l = t.db.$with(o).as(c), u = {};
+	for (let e of a) u[e] = C`${C.identifier(o)}.${C.identifier(e)}`.as(e);
+	for (let e of r.groups) for (let t of e.measures) {
+		let n = C`${C.identifier(e.alias)}.${C.identifier(t)}`;
+		u[t] = C`coalesce(${n}, 0)`.as(t);
 	}
-	let f = t.db.with(...a, u).select(d).from(T`${T.identifier(s)}`);
-	for (let e of i.groups) {
-		let t = o.map((t) => x(T`${T.identifier(s)}.${T.identifier(t)}`, T`${T.identifier(e.alias)}.${T.identifier(t)}`)), r = t.length === 1 ? t[0] : n(...t);
-		f = f.leftJoin(T`${T.identifier(e.alias)}`, r);
+	let d = t.db.with(...i, l).select(u).from(C`${C.identifier(o)}`);
+	for (let e of r.groups) {
+		let t = a.map((t) => b(C`${C.identifier(o)}.${C.identifier(t)}`, C`${C.identifier(e.alias)}.${C.identifier(t)}`)), n = t.length === 1 ? t[0] : w(...t);
+		d = d.leftJoin(C`${C.identifier(e.alias)}`, n);
 	}
-	let p = r.queryBuilder.buildOrderBy(e, Object.keys(d));
-	return p.length > 0 && (f = f.orderBy(...p)), r.queryBuilder.applyLimitAndOffset(f, e);
+	let f = n.queryBuilder.buildOrderBy(e, Object.keys(u));
+	return f.length > 0 && (d = d.orderBy(...f)), n.queryBuilder.applyLimitAndOffset(d, e);
 }
 function li(e, t) {
-	let n = t.map((t) => T`${T.identifier(e)}.${T.identifier(t)} as ${T.identifier(t)}`);
-	return T.join(n, T`, `);
+	let n = t.map((t) => C`${C.identifier(e)}.${C.identifier(t)} as ${C.identifier(t)}`);
+	return C.join(n, C`, `);
 }
 function ui(e, t, n) {
 	return !t || e === "innerJoin" ? "inner" : e === "leftJoin" ? "left" : n ? "full" : "left";
@@ -6748,9 +6748,9 @@ function di(e) {
 	return t === "postgres" || t === "duckdb";
 }
 function fi(e, t) {
-	if (e.length === 1) return T`${T.identifier(e[0])}.${T.identifier(t)}`;
-	let n = e.map((e) => T`${T.identifier(e)}.${T.identifier(t)}`), r = n[0];
-	for (let e = 1; e < n.length; e++) r = T`coalesce(${r}, ${n[e]})`;
+	if (e.length === 1) return C`${C.identifier(e[0])}.${C.identifier(t)}`;
+	let n = e.map((e) => C`${C.identifier(e)}.${C.identifier(t)}`), r = n[0];
+	for (let e = 1; e < n.length; e++) r = C`coalesce(${r}, ${n[e]})`;
 	return r;
 }
 //#endregion
@@ -6788,7 +6788,7 @@ var pi = class {
 	}
 	materializeJoin(e) {
 		if (e.junctionTable) {
-			let t = p(e.joinDef);
+			let t = oe(e.joinDef);
 			return {
 				cube: e.target.cube,
 				alias: e.alias,
@@ -6809,7 +6809,7 @@ var pi = class {
 			cube: e.target.cube,
 			alias: e.alias,
 			joinType: e.joinType,
-			joinCondition: oe(e.joinDef),
+			joinCondition: t(e.joinDef),
 			relationship: e.relationship
 		};
 	}
@@ -6947,42 +6947,42 @@ var mi = class {
 	resultCache;
 	filterCachePreloader;
 	rlsSetup;
-	constructor(e, n, r, i) {
-		if (this.dbExecutor = e, this.databaseAdapter = e.databaseAdapter, !this.databaseAdapter) throw Error(t("server.errors.dbAdapterRequired"));
+	constructor(e, t, n, r) {
+		if (this.dbExecutor = e, this.databaseAdapter = e.databaseAdapter, !this.databaseAdapter) throw Error(S("server.errors.dbAdapterRequired"));
 		this.queryBuilder = new gn(this.databaseAdapter);
-		let a = new kn(), o = new An(this.queryBuilder);
-		this.drizzlePlanBuilder = new pi(this.queryBuilder, o, this.databaseAdapter), this.comparisonQueryBuilder = new or(this.databaseAdapter), this.funnelQueryBuilder = new sr(this.databaseAdapter), this.flowQueryBuilder = new cr(this.databaseAdapter), this.retentionQueryBuilder = new mr(this.databaseAdapter), this.logicalPlanBuilder = new br(a), this.planOptimiser = i ?? new xr(), this.rlsSetup = r, this.modeRouter = new Zn({
+		let i = new kn(), a = new jn(this.queryBuilder);
+		this.drizzlePlanBuilder = new pi(this.queryBuilder, a, this.databaseAdapter), this.comparisonQueryBuilder = new sr(this.databaseAdapter), this.funnelQueryBuilder = new cr(this.databaseAdapter), this.flowQueryBuilder = new lr(this.databaseAdapter), this.retentionQueryBuilder = new hr(this.databaseAdapter), this.logicalPlanBuilder = new br(i), this.planOptimiser = r ?? new xr(), this.rlsSetup = n, this.modeRouter = new Qn({
 			comparison: this.comparisonQueryBuilder,
 			funnel: this.funnelQueryBuilder,
 			flow: this.flowQueryBuilder,
 			retention: this.retentionQueryBuilder
-		}), this.resultCache = new ar(n), this.filterCachePreloader = new Xn(this.queryBuilder);
-	}
-	async withRLSContext(e, n) {
-		if (!this.rlsSetup) return n();
-		let r = this.dbExecutor.db;
-		if (!r.transaction) throw Error(t("server.errors.rlsRequiresTransactions"));
-		let i = this.rlsSetup;
-		return r.transaction(async (t) => {
-			await i(t, e);
-			let r = Object.create(this.dbExecutor);
-			return r.db = t, this.dbExecutor = r, n();
+		}), this.resultCache = new or(t), this.filterCachePreloader = new Zn(this.queryBuilder);
+	}
+	async withRLSContext(e, t) {
+		if (!this.rlsSetup) return t();
+		let n = this.dbExecutor.db;
+		if (!n.transaction) throw Error(S("server.errors.rlsRequiresTransactions"));
+		let r = this.rlsSetup;
+		return n.transaction(async (n) => {
+			await r(n, e);
+			let i = Object.create(this.dbExecutor);
+			return i.db = n, this.dbExecutor = i, t();
 		});
 	}
-	async execute(e, n, r, i) {
+	async execute(e, t, n, r) {
 		try {
-			let t = this.modeRouter.resolveMode(n);
-			this.modeRouter.validateForMode(t, e, n);
-			let a = this.resultCache.generateKey(n, r, i?.cubeSetKey);
-			return await this.resultCache.lookup(a, i?.skipCache ?? !1) || await this.withRLSContext(r, () => this.executeQueryByModeWithCache(t, e, n, r, a));
+			let i = this.modeRouter.resolveMode(t);
+			this.modeRouter.validateForMode(i, e, t);
+			let a = this.resultCache.generateKey(t, n, r?.cubeSetKey);
+			return await this.resultCache.lookup(a, r?.skipCache ?? !1) || await this.withRLSContext(n, () => this.executeQueryByModeWithCache(i, e, t, n, a));
 		} catch (e) {
 			if (e instanceof Error) {
-				let n = e;
-				for (; n.cause instanceof Error;) n = n.cause;
-				let r = n.message, i = n;
-				throw i.code && (r += ` [${i.code}]`), i.detail && (r += ` Detail: ${i.detail}`), i.hint && (r += ` Hint: ${i.hint}`), e.message = t("server.errors.queryExecutionFailed", { message: r }), e;
+				let t = e;
+				for (; t.cause instanceof Error;) t = t.cause;
+				let n = t.message, r = t;
+				throw r.code && (n += ` [${r.code}]`), r.detail && (n += ` Detail: ${r.detail}`), r.hint && (n += ` Hint: ${r.hint}`), e.message = S("server.errors.queryExecutionFailed", { message: n }), e;
 			}
-			throw Error(t("server.errors.queryExecutionUnknown"), { cause: e });
+			throw Error(S("server.errors.queryExecutionUnknown"), { cause: e });
 		}
 	}
 	buildLogicalPlan(e, t, n) {
@@ -7009,16 +7009,16 @@ var mi = class {
 		return l.data = this.comparisonQueryBuilder.sortComparisonResults(l.data, r.dimension), l;
 	}
 	buildComparisonExecutionPlan(e) {
-		let n = this.comparisonQueryBuilder.getComparisonTimeDimension(e);
-		if (!n || !n.compareDateRange) throw Error(t("server.errors.noCompareDateRange"));
-		let r = this.comparisonQueryBuilder.normalizePeriods(n.compareDateRange);
-		if (r.length < 2) throw Error(t("server.errors.compareDateRangeInvalid"));
-		let i = r.map((t) => this.comparisonQueryBuilder.createPeriodQuery(e, t));
+		let t = this.comparisonQueryBuilder.getComparisonTimeDimension(e);
+		if (!t || !t.compareDateRange) throw Error(S("server.errors.noCompareDateRange"));
+		let n = this.comparisonQueryBuilder.normalizePeriods(t.compareDateRange);
+		if (n.length < 2) throw Error(S("server.errors.compareDateRangeInvalid"));
+		let r = n.map((t) => this.comparisonQueryBuilder.createPeriodQuery(e, t));
 		return {
-			timeDimension: n,
-			granularity: n.granularity || "day",
-			periods: r,
-			periodQueries: i
+			timeDimension: t,
+			granularity: t.granularity || "day",
+			periods: n,
+			periodQueries: r
 		};
 	}
 	async executeAnalysisQueryWithCache(e, t) {
@@ -7093,8 +7093,8 @@ var mi = class {
 		let l = this.drizzlePlanBuilder.build(s, c, a);
 		$("query", l);
 		let u = this.queryBuilder.collectNumericFields(e, t), d = {
-			data: Yn(await this.dbExecutor.execute(l, u), t, this.databaseAdapter),
-			annotation: jn(s, t),
+			data: Xn(await this.dbExecutor.execute(l, u), t, this.databaseAdapter),
+			annotation: Mn(s, t),
 			warnings: o.warnings?.length ? o.warnings : void 0,
 			total: t.total ? await this.executeTotalCount(s, c, a) : void 0
 		};
@@ -7106,7 +7106,7 @@ var mi = class {
 			limit: void 0,
 			offset: void 0,
 			order: void 0
-		}, n), i = n.db.select({ total: T`count(*)`.as("total") }).from(r.as("dc_total"));
+		}, n), i = n.db.select({ total: C`count(*)`.as("total") }).from(r.as("dc_total"));
 		$("total", i);
 		let a = await this.dbExecutor.execute(i), o = a?.[0] ? Object.values(a[0])[0] : void 0, s = Number(o);
 		return Number.isFinite(s) ? s : 0;
@@ -7185,14 +7185,14 @@ var mi = class {
 			build: (t, n) => this.retentionQueryBuilder.buildRetentionQuery(t, e, n)
 		});
 	}
-	async dryRunAnalysis(e, n, r) {
-		if (!r.has(e)) throw Error(t(r.invalidConfigKey));
-		let i = r.getConfig(e), a = r.validate(i);
-		if (!a.isValid) throw Error(t(r.validationFailedKey, { errors: a.errors.join(", ") }));
-		let o = this.createQueryContext(n), s = r.build(i, o).toSQL();
+	async dryRunAnalysis(e, t, n) {
+		if (!n.has(e)) throw Error(S(n.invalidConfigKey));
+		let r = n.getConfig(e), i = n.validate(r);
+		if (!i.isValid) throw Error(S(n.validationFailedKey, { errors: i.errors.join(", ") }));
+		let a = this.createQueryContext(t), o = n.build(r, a).toSQL();
 		return {
-			sql: s.sql,
-			params: s.params
+			sql: o.sql,
+			params: o.params
 		};
 	}
 	async explainQuery(e, t, n, r) {
@@ -7219,7 +7219,7 @@ var mi = class {
 			funnel: () => this.executeAnalysisQueryWithCache(() => this.executeFunnelQuery(t, n, r), i),
 			flow: () => this.executeAnalysisQueryWithCache(() => this.executeFlowQuery(t, n, r), i),
 			retention: () => this.executeAnalysisQueryWithCache(() => this.executeRetentionQuery(t, n, r), i)
-		}[ue(e)]();
+		}[_(e)]();
 	}
 	async generateSqlForMode(e, t, n, r) {
 		return {
@@ -7228,7 +7228,7 @@ var mi = class {
 			funnel: () => this.dryRunFunnel(t, n, r),
 			flow: () => this.dryRunFlow(t, n, r),
 			retention: () => this.dryRunRetention(t, n, r)
-		}[ue(e)]();
+		}[_(e)]();
 	}
 	async generateComparisonSQL(e, t, n) {
 		let r = this.buildComparisonExecutionPlan(t).periodQueries[0];
@@ -7292,7 +7292,7 @@ function bi(e, t, n) {
 	let r = [];
 	if (!e.joins) return r;
 	for (let [, i] of Object.entries(e.joins)) {
-		let e = o(i.targetCube, t);
+		let e = h(i.targetCube, t);
 		e && r.push({
 			targetCube: e.name,
 			relationship: i.relationship,
@@ -7358,7 +7358,7 @@ var Ci = class {
 		return !!this.db;
 	}
 	createDbExecutor() {
-		if (!this.db) throw Error(t("server.errors.dbNotConfigured"));
+		if (!this.db) throw Error(S("server.errors.dbNotConfigured"));
 		return bt(this.db, this.schema, this.engineType);
 	}
 	createQueryExecutor(e = !1) {
@@ -7367,38 +7367,38 @@ var Ci = class {
 	formatSqlResult(e) {
 		let t = this.getEngineType() ?? "postgres";
 		return {
-			sql: y(e.sql, t),
+			sql: de(e.sql, t),
 			params: e.params
 		};
 	}
 	registerCube(e) {
 		this.prepareCube(e, this.baseCubes), this.baseCubes.set(e.name, e), this.baseGeneration++, this.rebuildAllMergedSets(), this.metadataCache.clear();
 	}
-	registerCubeSet(e, n) {
-		if (e === "") throw Error(t("server.errors.cubeSetIdEmpty"));
-		let r = Date.now(), i = /* @__PURE__ */ new Map();
-		for (let e of n) {
+	registerCubeSet(e, t) {
+		if (e === "") throw Error(S("server.errors.cubeSetIdEmpty"));
+		let n = Date.now(), r = /* @__PURE__ */ new Map();
+		for (let e of t) {
 			let t = new Map(this.baseCubes);
-			for (let [e, n] of i) t.set(e, n);
-			this.prepareCube(e, t), i.set(e.name, e);
+			for (let [e, n] of r) t.set(e, n);
+			this.prepareCube(e, t), r.set(e.name, e);
 		}
-		let a = ++this.registrationCounter, o = this.mergeWithBase(i), s = Date.now() - r;
+		let i = ++this.registrationCounter, a = this.mergeWithBase(r), o = Date.now() - n;
 		this.cubeSets.set(e, {
-			overlay: i,
-			merged: o,
-			generation: a,
-			durationMs: s
+			overlay: r,
+			merged: a,
+			generation: i,
+			durationMs: o
 		}), this.metadataCache.delete(e);
-		let c = 0;
-		for (let e of i.values()) c += Object.keys(e.dimensions ?? {}).length;
-		let l = {
+		let s = 0;
+		for (let e of r.values()) s += Object.keys(e.dimensions ?? {}).length;
+		let c = {
 			setId: e,
-			cubeCount: o.size,
-			dimensionCount: c,
-			generation: a,
-			durationMs: s
+			cubeCount: a.size,
+			dimensionCount: s,
+			generation: i,
+			durationMs: o
 		};
-		Si(`registered cube set '${e}': ${i.size} cube(s), ${c} dimension(s), generation ${a}, ${s}ms`), this.onCubeSetRegistered?.(l);
+		Si(`registered cube set '${e}': ${r.size} cube(s), ${s} dimension(s), generation ${i}, ${o}ms`), this.onCubeSetRegistered?.(c);
 	}
 	unregisterCubeSet(e) {
 		let t = this.cubeSets.delete(e);
@@ -7436,14 +7436,14 @@ var Ci = class {
 	}
 	resolveSetId(e) {
 		if (!this.contextToCubeSetId) return "";
-		let n = this.contextToCubeSetId(e);
-		if (n == null || n === "") return "";
-		let r = String(n);
-		if (!this.cubeSets.has(r)) {
-			if (this.missingCubeSet === "throw") throw Error(t("server.errors.cubeSetNotFound", { setId: r }));
+		let t = this.contextToCubeSetId(e);
+		if (t == null || t === "") return "";
+		let n = String(t);
+		if (!this.cubeSets.has(n)) {
+			if (this.missingCubeSet === "throw") throw Error(S("server.errors.cubeSetNotFound", { setId: n }));
 			return "";
 		}
-		return r;
+		return n;
 	}
 	resolveCubes(e) {
 		let t = this.resolveSetId(e);
@@ -7458,59 +7458,59 @@ var Ci = class {
 		for (let t of this.unresolvedJoinRefs(this.baseCubes)) e.add(t);
 		for (let t of this.cubeSets.values()) for (let n of this.unresolvedJoinRefs(t.merged)) e.add(n);
 		if (e.size > 0) {
-			let n = Array.from(e, (e) => `  - ${e}`).join("\n");
-			throw Error(t("server.errors.unresolvedCubeRefs", { details: n }));
+			let t = Array.from(e, (e) => `  - ${e}`).join("\n");
+			throw Error(S("server.errors.unresolvedCubeRefs", { details: t }));
 		}
 	}
 	*unresolvedJoinRefs(e) {
-		for (let [n, r] of e) if (r.joins) for (let [i, a] of Object.entries(r.joins)) {
-			let { targetCube: r } = a;
-			typeof r == "string" && !e.has(r) && (yield t("server.errors.cubeRefUnresolved", {
-				cubeName: n,
-				joinName: i,
-				targetCube: r
+		for (let [t, n] of e) if (n.joins) for (let [r, i] of Object.entries(n.joins)) {
+			let { targetCube: n } = i;
+			typeof n == "string" && !e.has(n) && (yield S("server.errors.cubeRefUnresolved", {
+				cubeName: t,
+				joinName: r,
+				targetCube: n
 			}));
 		}
 	}
-	validateCalculatedMeasures(e, n) {
-		let r = [];
-		for (let [i, a] of Object.entries(e.measures)) if (a.type === "calculated") {
-			if (!a.calculatedSql) {
-				r.push(t("server.validation.calculatedMeasure.mustHaveCalculatedSql", {
+	validateCalculatedMeasures(e, t) {
+		let n = [];
+		for (let [r, i] of Object.entries(e.measures)) if (i.type === "calculated") {
+			if (!i.calculatedSql) {
+				n.push(S("server.validation.calculatedMeasure.mustHaveCalculatedSql", {
 					cubeName: e.name,
-					fieldName: i
+					fieldName: r
 				}));
 				continue;
 			}
-			let o = pn(a.calculatedSql);
-			if (!o.isValid) {
-				r.push(t("server.validation.calculatedMeasure.invalidSyntax", {
+			let a = pn(i.calculatedSql);
+			if (!a.isValid) {
+				n.push(S("server.validation.calculatedMeasure.invalidSyntax", {
 					cubeName: e.name,
-					fieldName: i,
-					errors: o.errors.join(", ")
+					fieldName: r,
+					errors: a.errors.join(", ")
 				}));
 				continue;
 			}
-			let s = new Map(n);
-			s.set(e.name, e);
-			let c = new H(s);
+			let o = new Map(t);
+			o.set(e.name, e);
+			let s = new H(o);
 			try {
-				c.validateDependencies(e);
+				s.validateDependencies(e);
 			} catch (e) {
-				r.push(e instanceof Error ? e.message : String(e));
+				n.push(e instanceof Error ? e.message : String(e));
 			}
 		}
-		if (r.length === 0) {
-			let i = new Map(n);
-			i.set(e.name, e);
-			let a = new H(i);
-			a.buildGraph(e);
-			let o = a.detectCycle();
-			o && r.push(t("server.validation.calculatedMeasure.circularDependency", { cycle: o.join(" -> ") }));
-		}
-		if (r.length > 0) throw Error(t("server.errors.calculatedMeasureValidation", {
+		if (n.length === 0) {
+			let r = new Map(t);
+			r.set(e.name, e);
+			let i = new H(r);
+			i.buildGraph(e);
+			let a = i.detectCycle();
+			a && n.push(S("server.validation.calculatedMeasure.circularDependency", { cycle: a.join(" -> ") }));
+		}
+		if (n.length > 0) throw Error(S("server.errors.calculatedMeasureValidation", {
 			cubeName: e.name,
-			details: r.join("\n")
+			details: n.join("\n")
 		}));
 	}
 	getCube(e, t) {
@@ -7532,9 +7532,9 @@ var Ci = class {
 	async executeMultiCubeQuery(e, t, n) {
 		return this.execute(e, t, n);
 	}
-	async executeQuery(e, n, r) {
-		if (!this.resolveCubes(r).get(e)) throw Error(t("server.errors.cubeNotFound", { cubeName: e }));
-		return this.execute(n, r);
+	async executeQuery(e, t, n) {
+		if (!this.resolveCubes(n).get(e)) throw Error(S("server.errors.cubeNotFound", { cubeName: e }));
+		return this.execute(t, n);
 	}
 	getMetadata(e) {
 		let t = this.resolveSetId(e), n = this.metadataCache.get(t);
@@ -7567,11 +7567,11 @@ var Ci = class {
 			meta: e.meta
 		};
 	}
-	async generateSQL(e, n, r) {
-		let i = this.getCube(e, r);
-		if (!i) throw Error(t("server.errors.cubeNotFound", { cubeName: e }));
-		let a = await this.createQueryExecutor().generateSQL(i, n, r);
-		return this.formatSqlResult(a);
+	async generateSQL(e, t, n) {
+		let r = this.getCube(e, n);
+		if (!r) throw Error(S("server.errors.cubeNotFound", { cubeName: e }));
+		let i = await this.createQueryExecutor().generateSQL(r, t, n);
+		return this.formatSqlResult(i);
 	}
 	async generateMultiCubeSQL(e, t) {
 		let n = await this.createQueryExecutor().generateMultiCubeSQL(this.resolveCubes(t), e, t);
@@ -7616,7 +7616,7 @@ var Ci = class {
 		return Array.from(this.resolveCubes(e).keys());
 	}
 	validateQuery(e, t) {
-		return le(this.resolveCubes(t), e);
+		return r(this.resolveCubes(t), e);
 	}
 	analyzeQuery(e, t) {
 		return this.createQueryExecutor(!0).analyzeQuery(this.resolveCubes(t), e, t);