drizzle-cube 0.4.52 → 0.4.53

package/dist/adapters/{compiler-D_o2IzHn.js → compiler-S6KHiOY6.js}

@@ -121,7 +121,7 @@ var x = class {
 		}
 	}
 	static [t] = "SQL";
-	decoder = T;
+	decoder = w;
 	shouldInlineParams = !1;
 	usedTables = [];
 	append(e) {
@@ -182,15 +182,15 @@ var x = class {
 					params: []
 				};
 			}
-			if (n(t, j)) {
+			if (n(t, A)) {
 				let e = t[l].schema, n = t[l].name;
 				return {
 					sql: e === void 0 || t[l].isAlias ? u(n) : u(e) + "." + u(n),
 					params: []
 				};
 			}
-			if (n(t, D)) {
-				if (n(t.value, k)) return {
+			if (n(t, E)) {
+				if (n(t.value, O)) return {
 					sql: d(m.value++, t),
 					params: [t],
 					typings: ["none"]
@@ -208,7 +208,7 @@ var x = class {
 					typings: i
 				};
 			}
-			return n(t, k) ? {
+			return n(t, O) ? {
 				sql: d(m.value++, t),
 				params: [t],
 				typings: ["none"]
@@ -278,16 +278,16 @@ var x = class {
 		return new S([this]);
 	}
 };
-function w(e) {
+function ee(e) {
 	return typeof e == "object" && !!e && "mapToDriverValue" in e && typeof e.mapToDriverValue == "function";
 }
-var T = { mapFromDriverValue: (e) => e }, E = { mapToDriverValue: (e) => e };
+var w = { mapFromDriverValue: (e) => e }, T = { mapToDriverValue: (e) => e };
 ({
-	...T,
-	...E
+	...w,
+	...T
 });
-var D = class {
-	constructor(e, t = E) {
+var E = class {
+	constructor(e, t = T) {
 		this.value = e, this.encoder = t;
 	}
 	static [t] = "Param";
@@ -296,7 +296,7 @@ var D = class {
 		return new S([this]);
 	}
 };
-function O(e, ...t) {
+function D(e, ...t) {
 	let n = [];
 	(t.length > 0 || e.length > 0 && e[0] !== "") && n.push(new x(e[0]));
 	for (let [r, i] of t.entries()) n.push(i, new x(e[r + 1]));
@@ -326,14 +326,14 @@ function O(e, ...t) {
 	}
 	e.identifier = a;
 	function o(e) {
-		return new k(e);
+		return new O(e);
 	}
 	e.placeholder = o;
 	function s(e, t) {
-		return new D(e, t);
+		return new E(e, t);
 	}
 	e.param = s;
-})(O ||= {}), ((e) => {
+})(D ||= {}), ((e) => {
 	class n {
 		constructor(e, t) {
 			this.sql = e, this.fieldAlias = t;
@@ -349,7 +349,7 @@ function O(e, ...t) {
 	}
 	e.Aliased = n;
 })(S ||= {});
-var k = class {
+var O = class {
 	constructor(e) {
 		this.name = e;
 	}
@@ -357,10 +357,10 @@ var k = class {
 	getSQL() {
 		return new S([this]);
 	}
-}, A = Symbol.for("drizzle:IsDrizzleView"), j = class {
+}, k = Symbol.for("drizzle:IsDrizzleView"), A = class {
 	static [t] = "View";
 	[l];
-	[A] = !0;
+	[k] = !0;
 	constructor({ name: e, schema: t, selectedFields: n, query: r }) {
 		this[l] = {
 			name: e,
@@ -385,84 +385,84 @@ r.prototype.getSQL = function() {
 };
 //#endregion
 //#region node_modules/drizzle-orm/sql/expressions/conditions.js
-function M(e, t) {
-	return w(t) && !y(e) && !n(e, D) && !n(e, k) && !n(e, r) && !n(e, v) && !n(e, j) ? new D(e, t) : e;
+function j(e, t) {
+	return ee(t) && !y(e) && !n(e, E) && !n(e, O) && !n(e, r) && !n(e, v) && !n(e, A) ? new E(e, t) : e;
 }
-var N = (e, t) => O`${e} = ${M(t, e)}`, P = (e, t) => O`${e} <> ${M(t, e)}`;
-function F(...e) {
+var M = (e, t) => D`${e} = ${j(t, e)}`, N = (e, t) => D`${e} <> ${j(t, e)}`;
+function P(...e) {
 	let t = e.filter((e) => e !== void 0);
 	if (t.length !== 0) return t.length === 1 ? new S(t) : new S([
 		new x("("),
-		O.join(t, new x(" and ")),
+		D.join(t, new x(" and ")),
 		new x(")")
 	]);
 }
-function I(...e) {
+function F(...e) {
 	let t = e.filter((e) => e !== void 0);
 	if (t.length !== 0) return t.length === 1 ? new S(t) : new S([
 		new x("("),
-		O.join(t, new x(" or ")),
+		D.join(t, new x(" or ")),
 		new x(")")
 	]);
 }
-var ee = (e, t) => O`${e} > ${M(t, e)}`, L = (e, t) => O`${e} >= ${M(t, e)}`, te = (e, t) => O`${e} < ${M(t, e)}`, R = (e, t) => O`${e} <= ${M(t, e)}`;
-function ne(e, t) {
-	return Array.isArray(t) ? t.length === 0 ? O`false` : O`${e} in ${t.map((t) => M(t, e))}` : O`${e} in ${M(t, e)}`;
-}
+var te = (e, t) => D`${e} > ${j(t, e)}`, I = (e, t) => D`${e} >= ${j(t, e)}`, ne = (e, t) => D`${e} < ${j(t, e)}`, L = (e, t) => D`${e} <= ${j(t, e)}`;
 function re(e, t) {
-	return Array.isArray(t) ? t.length === 0 ? O`true` : O`${e} not in ${t.map((t) => M(t, e))}` : O`${e} not in ${M(t, e)}`;
+	return Array.isArray(t) ? t.length === 0 ? D`false` : D`${e} in ${t.map((t) => j(t, e))}` : D`${e} in ${j(t, e)}`;
 }
-function ie(e) {
-	return O`${e} is null`;
+function ie(e, t) {
+	return Array.isArray(t) ? t.length === 0 ? D`true` : D`${e} not in ${t.map((t) => j(t, e))}` : D`${e} not in ${j(t, e)}`;
 }
 function ae(e) {
-	return O`${e} is not null`;
+	return D`${e} is null`;
 }
-function oe(e, t) {
+function oe(e) {
+	return D`${e} is not null`;
+}
+function se(e, t) {
 	if (Array.isArray(t)) {
 		if (t.length === 0) throw Error("arrayContains requires at least one value");
-		return O`${e} @> ${O`${M(t, e)}`}`;
+		return D`${e} @> ${D`${j(t, e)}`}`;
 	}
-	return O`${e} @> ${M(t, e)}`;
+	return D`${e} @> ${j(t, e)}`;
 }
-function se(e, t) {
+function ce(e, t) {
 	if (Array.isArray(t)) {
 		if (t.length === 0) throw Error("arrayContained requires at least one value");
-		return O`${e} <@ ${O`${M(t, e)}`}`;
+		return D`${e} <@ ${D`${j(t, e)}`}`;
 	}
-	return O`${e} <@ ${M(t, e)}`;
+	return D`${e} <@ ${j(t, e)}`;
 }
-function ce(e, t) {
+function le(e, t) {
 	if (Array.isArray(t)) {
 		if (t.length === 0) throw Error("arrayOverlaps requires at least one value");
-		return O`${e} && ${O`${M(t, e)}`}`;
+		return D`${e} && ${D`${j(t, e)}`}`;
 	}
-	return O`${e} && ${M(t, e)}`;
+	return D`${e} && ${j(t, e)}`;
 }
 //#endregion
 //#region node_modules/drizzle-orm/sql/expressions/select.js
-function le(e) {
-	return O`${e} asc`;
-}
 function ue(e) {
-	return O`${e} desc`;
+	return D`${e} asc`;
 }
-//#endregion
-//#region node_modules/drizzle-orm/sql/functions/aggregate.js
 function de(e) {
-	return O`count(${e || O.raw("*")})`.mapWith(Number);
+	return D`${e} desc`;
 }
+//#endregion
+//#region node_modules/drizzle-orm/sql/functions/aggregate.js
 function fe(e) {
-	return O`count(distinct ${e})`.mapWith(Number);
+	return D`count(${e || D.raw("*")})`.mapWith(Number);
+}
+function pe(e) {
+	return D`count(distinct ${e})`.mapWith(Number);
+}
+function R(e) {
+	return D`sum(${e})`.mapWith(String);
 }
 function z(e) {
-	return O`sum(${e})`.mapWith(String);
+	return D`max(${e})`.mapWith(n(e, r) ? e : String);
 }
 function B(e) {
-	return O`max(${e})`.mapWith(n(e, r) ? e : String);
-}
-function pe(e) {
-	return O`min(${e})`.mapWith(n(e, r) ? e : String);
+	return D`min(${e})`.mapWith(n(e, r) ? e : String);
 }
 //#endregion
 //#region src/server/adapters/base-adapter.ts
@@ -506,73 +506,73 @@ var V = 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 O`INTERVAL '${O.raw(r)}'`;
+		return D`INTERVAL '${D.raw(r)}'`;
 	}
 	buildTimeDifferenceSeconds(e, t) {
-		return O`EXTRACT(EPOCH FROM (${e} - ${t}))`;
+		return D`EXTRACT(EPOCH FROM (${e} - ${t}))`;
 	}
 	buildDateAddInterval(e, t) {
-		return O`(${e} + ${this.buildIntervalFromISO(t)})`;
+		return D`(${e} + ${this.buildIntervalFromISO(t)})`;
 	}
 	buildConditionalAggregation(e, t, n) {
 		let r = e.toUpperCase();
-		return e === "count" && !t ? O`COUNT(*) FILTER (WHERE ${n})` : O`${O.raw(r)}(${t}) FILTER (WHERE ${n})`;
+		return e === "count" && !t ? D`COUNT(*) FILTER (WHERE ${n})` : D`${D.raw(r)}(${t}) FILTER (WHERE ${n})`;
 	}
 	buildDateDiffPeriods(e, t, n) {
 		switch (n) {
-			case "day": return O`(${t}::date - ${e}::date)`;
-			case "week": return O`FLOOR((${t}::date - ${e}::date) / 7)`;
-			case "month": return O`(EXTRACT(YEAR FROM AGE(${t}::timestamp, ${e}::timestamp)) * 12 + EXTRACT(MONTH FROM AGE(${t}::timestamp, ${e}::timestamp)))::integer`;
+			case "day": return D`(${t}::date - ${e}::date)`;
+			case "week": return D`FLOOR((${t}::date - ${e}::date) / 7)`;
+			case "month": return D`(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 O`(SELECT generate_series(0, ${e}) as period_number) p`;
+		return D`(SELECT generate_series(0, ${e}) as period_number) p`;
 	}
 	buildTimeDimension(e, t) {
 		switch (e) {
-			case "year": return O`DATE_TRUNC('year', ${t}::timestamp)`;
-			case "quarter": return O`DATE_TRUNC('quarter', ${t}::timestamp)`;
-			case "month": return O`DATE_TRUNC('month', ${t}::timestamp)`;
-			case "week": return O`DATE_TRUNC('week', ${t}::timestamp)`;
-			case "day": return O`DATE_TRUNC('day', ${t}::timestamp)::timestamp`;
-			case "hour": return O`DATE_TRUNC('hour', ${t}::timestamp)`;
-			case "minute": return O`DATE_TRUNC('minute', ${t}::timestamp)`;
-			case "second": return O`DATE_TRUNC('second', ${t}::timestamp)`;
+			case "year": return D`DATE_TRUNC('year', ${t}::timestamp)`;
+			case "quarter": return D`DATE_TRUNC('quarter', ${t}::timestamp)`;
+			case "month": return D`DATE_TRUNC('month', ${t}::timestamp)`;
+			case "week": return D`DATE_TRUNC('week', ${t}::timestamp)`;
+			case "day": return D`DATE_TRUNC('day', ${t}::timestamp)::timestamp`;
+			case "hour": return D`DATE_TRUNC('hour', ${t}::timestamp)`;
+			case "minute": return D`DATE_TRUNC('minute', ${t}::timestamp)`;
+			case "second": return D`DATE_TRUNC('second', ${t}::timestamp)`;
 			default: return t;
 		}
 	}
 	buildStringCondition(e, t, n) {
 		switch (t) {
-			case "contains": return O`${e} ILIKE ${`%${n}%`}`;
-			case "notContains": return O`${e} NOT ILIKE ${`%${n}%`}`;
-			case "startsWith": return O`${e} ILIKE ${`${n}%`}`;
-			case "endsWith": return O`${e} ILIKE ${`%${n}`}`;
-			case "like": return O`${e} LIKE ${n}`;
-			case "notLike": return O`${e} NOT LIKE ${n}`;
-			case "ilike": return O`${e} ILIKE ${n}`;
-			case "regex": return O`${e} ~* ${n}`;
-			case "notRegex": return O`${e} !~* ${n}`;
+			case "contains": return D`${e} ILIKE ${`%${n}%`}`;
+			case "notContains": return D`${e} NOT ILIKE ${`%${n}%`}`;
+			case "startsWith": return D`${e} ILIKE ${`${n}%`}`;
+			case "endsWith": return D`${e} ILIKE ${`%${n}`}`;
+			case "like": return D`${e} LIKE ${n}`;
+			case "notLike": return D`${e} NOT LIKE ${n}`;
+			case "ilike": return D`${e} ILIKE ${n}`;
+			case "regex": return D`${e} ~* ${n}`;
+			case "notRegex": return D`${e} !~* ${n}`;
 			default: throw Error(`Unsupported string operator: ${t}`);
 		}
 	}
 	castToType(e, t) {
 		switch (t) {
-			case "timestamp": return O`${e}::timestamp`;
-			case "decimal": return O`${e}::decimal`;
-			case "integer": return O`${e}::integer`;
+			case "timestamp": return D`${e}::timestamp`;
+			case "decimal": return D`${e}::decimal`;
+			case "integer": return D`${e}::integer`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	buildAvg(e) {
-		return O`COALESCE(AVG(${e}), 0)`;
+		return D`COALESCE(AVG(${e}), 0)`;
 	}
 	buildCaseWhen(e, t) {
-		let n = e.map((e) => O`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => O`${e} ${t}`);
-		return t === void 0 ? O`CASE ${n} END` : O`CASE ${n} ELSE ${t} END`;
+		let n = e.map((e) => D`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => D`${e} ${t}`);
+		return t === void 0 ? D`CASE ${n} END` : D`CASE ${n} ELSE ${t} END`;
 	}
 	buildBooleanLiteral(e) {
-		return e ? O`TRUE` : O`FALSE`;
+		return e ? D`TRUE` : D`FALSE`;
 	}
 	convertFilterValue(e) {
 		return e;
@@ -601,35 +601,35 @@ var V = class {
 	}
 	buildStddev(e, t = !1) {
 		let n = t ? "STDDEV_SAMP" : "STDDEV_POP";
-		return O`COALESCE(${O.raw(n)}(${e}), 0)`;
+		return D`COALESCE(${D.raw(n)}(${e}), 0)`;
 	}
 	buildVariance(e, t = !1) {
 		let n = t ? "VAR_SAMP" : "VAR_POP";
-		return O`COALESCE(${O.raw(n)}(${e}), 0)`;
+		return D`COALESCE(${D.raw(n)}(${e}), 0)`;
 	}
 	buildPercentile(e, t) {
-		return O`PERCENTILE_CONT(${t / 100}) WITHIN GROUP (ORDER BY ${e})`;
+		return D`PERCENTILE_CONT(${t / 100}) WITHIN GROUP (ORDER BY ${e})`;
 	}
 	buildWindowFunction(e, t, n, r, i) {
-		let a = n && n.length > 0 ? O`PARTITION BY ${O.join(n, O`, `)}` : O``, o = r && r.length > 0 ? O`ORDER BY ${O.join(r.map((e) => e.direction === "desc" ? O`${e.field} DESC` : O`${e.field} ASC`), O`, `)}` : O``, s = O``;
+		let a = n && n.length > 0 ? D`PARTITION BY ${D.join(n, D`, `)}` : D``, o = r && r.length > 0 ? D`ORDER BY ${D.join(r.map((e) => e.direction === "desc" ? D`${e.field} DESC` : D`${e.field} ASC`), D`, `)}` : D``, s = D``;
 		if (i?.frame) {
 			let { type: e, start: t, end: n } = i.frame, r = e.toUpperCase(), a = t === "unbounded" ? "UNBOUNDED PRECEDING" : typeof t == "number" ? `${t} PRECEDING` : "CURRENT ROW", o = n === "unbounded" ? "UNBOUNDED FOLLOWING" : n === "current" ? "CURRENT ROW" : typeof n == "number" ? `${n} FOLLOWING` : "CURRENT ROW";
-			s = O`${O.raw(r)} BETWEEN ${O.raw(a)} AND ${O.raw(o)}`;
+			s = D`${D.raw(r)} BETWEEN ${D.raw(a)} AND ${D.raw(o)}`;
 		}
 		let c = [];
 		n && n.length > 0 && c.push(a), r && r.length > 0 && c.push(o), i?.frame && c.push(s);
-		let l = O`OVER (${c.length > 0 ? O.join(c, O` `) : O``})`;
+		let l = D`OVER (${c.length > 0 ? D.join(c, D` `) : D``})`;
 		switch (e) {
-			case "lag": return O`LAG(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? O`` : O`, ${i.defaultValue}`}) ${l}`;
-			case "lead": return O`LEAD(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? O`` : O`, ${i.defaultValue}`}) ${l}`;
-			case "rank": return O`RANK() ${l}`;
-			case "denseRank": return O`DENSE_RANK() ${l}`;
-			case "rowNumber": return O`ROW_NUMBER() ${l}`;
-			case "ntile": return O`NTILE(${i?.nTile ?? 4}) ${l}`;
-			case "firstValue": return O`FIRST_VALUE(${t}) ${l}`;
-			case "lastValue": return O`LAST_VALUE(${t}) ${l}`;
-			case "movingAvg": return O`AVG(${t}) ${l}`;
-			case "movingSum": return O`SUM(${t}) ${l}`;
+			case "lag": return D`LAG(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? D`` : D`, ${i.defaultValue}`}) ${l}`;
+			case "lead": return D`LEAD(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? D`` : D`, ${i.defaultValue}`}) ${l}`;
+			case "rank": return D`RANK() ${l}`;
+			case "denseRank": return D`DENSE_RANK() ${l}`;
+			case "rowNumber": return D`ROW_NUMBER() ${l}`;
+			case "ntile": return D`NTILE(${i?.nTile ?? 4}) ${l}`;
+			case "firstValue": return D`FIRST_VALUE(${t}) ${l}`;
+			case "lastValue": return D`LAST_VALUE(${t}) ${l}`;
+			case "movingAvg": return D`AVG(${t}) ${l}`;
+			case "movingSum": return D`SUM(${t}) ${l}`;
 			default: throw Error(`Unsupported window function: ${e}`);
 		}
 	}
@@ -642,25 +642,25 @@ var V = class {
 	}
 	buildIntervalFromISO(e) {
 		let t = this.parseISODuration(e), n = [];
-		return 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`), O`${this.durationToSeconds(e)}`;
+		return 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`), D`${this.durationToSeconds(e)}`;
 	}
 	buildTimeDifferenceSeconds(e, t) {
-		return O`TIMESTAMPDIFF(SECOND, ${t}, ${e})`;
+		return D`TIMESTAMPDIFF(SECOND, ${t}, ${e})`;
 	}
 	buildDateAddInterval(e, t) {
 		let n = this.parseISODuration(t), r = e;
-		return n.years && (r = O`DATE_ADD(${r}, INTERVAL ${n.years} YEAR)`), n.months && (r = O`DATE_ADD(${r}, INTERVAL ${n.months} MONTH)`), n.days && (r = O`DATE_ADD(${r}, INTERVAL ${n.days} DAY)`), n.hours && (r = O`DATE_ADD(${r}, INTERVAL ${n.hours} HOUR)`), n.minutes && (r = O`DATE_ADD(${r}, INTERVAL ${n.minutes} MINUTE)`), n.seconds && (r = O`DATE_ADD(${r}, INTERVAL ${n.seconds} SECOND)`), r;
+		return n.years && (r = D`DATE_ADD(${r}, INTERVAL ${n.years} YEAR)`), n.months && (r = D`DATE_ADD(${r}, INTERVAL ${n.months} MONTH)`), n.days && (r = D`DATE_ADD(${r}, INTERVAL ${n.days} DAY)`), n.hours && (r = D`DATE_ADD(${r}, INTERVAL ${n.hours} HOUR)`), n.minutes && (r = D`DATE_ADD(${r}, INTERVAL ${n.minutes} MINUTE)`), n.seconds && (r = D`DATE_ADD(${r}, INTERVAL ${n.seconds} SECOND)`), r;
 	}
 	buildConditionalAggregation(e, t, n) {
 		let r = e.toUpperCase();
-		return e === "count" && !t ? O`COUNT(CASE WHEN ${n} THEN 1 END)` : O`${O.raw(r)}(CASE WHEN ${n} THEN ${t} END)`;
+		return e === "count" && !t ? D`COUNT(CASE WHEN ${n} THEN 1 END)` : D`${D.raw(r)}(CASE WHEN ${n} THEN ${t} END)`;
 	}
 	buildDateDiffPeriods(e, t, n) {
 		let r = n.toUpperCase();
-		return O`TIMESTAMPDIFF(${O.raw(r)}, ${e}, ${t})`;
+		return D`TIMESTAMPDIFF(${D.raw(r)}, ${e}, ${t})`;
 	}
 	buildPeriodSeriesSubquery(e) {
-		return O`(
+		return D`(
       WITH RECURSIVE periods(period_number) AS (
         SELECT 0
         UNION ALL
@@ -681,45 +681,45 @@ var V = class {
 			second: "%Y-%m-%d %H:%i:%s"
 		};
 		switch (e) {
-			case "quarter": return O`DATE_ADD(MAKEDATE(YEAR(${t}), 1), INTERVAL (QUARTER(${t}) - 1) * 3 MONTH)`;
-			case "week": return O`DATE_SUB(${t}, INTERVAL WEEKDAY(${t}) DAY)`;
+			case "quarter": return D`DATE_ADD(MAKEDATE(YEAR(${t}), 1), INTERVAL (QUARTER(${t}) - 1) * 3 MONTH)`;
+			case "week": return D`DATE_SUB(${t}, INTERVAL WEEKDAY(${t}) DAY)`;
 			default: {
 				let r = n[e];
-				return r ? O`STR_TO_DATE(DATE_FORMAT(${t}, ${r}), '%Y-%m-%d %H:%i:%s')` : t;
+				return r ? D`STR_TO_DATE(DATE_FORMAT(${t}, ${r}), '%Y-%m-%d %H:%i:%s')` : t;
 			}
 		}
 	}
 	buildStringCondition(e, t, n) {
 		switch (t) {
-			case "contains": return O`LOWER(${e}) LIKE ${`%${n.toLowerCase()}%`}`;
-			case "notContains": return O`LOWER(${e}) NOT LIKE ${`%${n.toLowerCase()}%`}`;
-			case "startsWith": return O`LOWER(${e}) LIKE ${`${n.toLowerCase()}%`}`;
-			case "endsWith": return O`LOWER(${e}) LIKE ${`%${n.toLowerCase()}`}`;
-			case "like": return O`${e} LIKE ${n}`;
-			case "notLike": return O`${e} NOT LIKE ${n}`;
-			case "ilike": return O`LOWER(${e}) LIKE ${n.toLowerCase()}`;
-			case "regex": return O`${e} REGEXP ${n}`;
-			case "notRegex": return O`${e} NOT REGEXP ${n}`;
+			case "contains": return D`LOWER(${e}) LIKE ${`%${n.toLowerCase()}%`}`;
+			case "notContains": return D`LOWER(${e}) NOT LIKE ${`%${n.toLowerCase()}%`}`;
+			case "startsWith": return D`LOWER(${e}) LIKE ${`${n.toLowerCase()}%`}`;
+			case "endsWith": return D`LOWER(${e}) LIKE ${`%${n.toLowerCase()}`}`;
+			case "like": return D`${e} LIKE ${n}`;
+			case "notLike": return D`${e} NOT LIKE ${n}`;
+			case "ilike": return D`LOWER(${e}) LIKE ${n.toLowerCase()}`;
+			case "regex": return D`${e} REGEXP ${n}`;
+			case "notRegex": return D`${e} NOT REGEXP ${n}`;
 			default: throw Error(`Unsupported string operator: ${t}`);
 		}
 	}
 	castToType(e, t) {
 		switch (t) {
-			case "timestamp": return O`CAST(${e} AS DATETIME)`;
-			case "decimal": return O`CAST(${e} AS DECIMAL(10,2))`;
-			case "integer": return O`CAST(${e} AS SIGNED INTEGER)`;
+			case "timestamp": return D`CAST(${e} AS DATETIME)`;
+			case "decimal": return D`CAST(${e} AS DECIMAL(10,2))`;
+			case "integer": return D`CAST(${e} AS SIGNED INTEGER)`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	buildAvg(e) {
-		return O`IFNULL(AVG(${e}), 0)`;
+		return D`IFNULL(AVG(${e}), 0)`;
 	}
 	buildCaseWhen(e, t) {
-		let n = e.map((e) => O`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => O`${e} ${t}`);
-		return t === void 0 ? O`CASE ${n} END` : O`CASE ${n} ELSE ${t} END`;
+		let n = e.map((e) => D`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => D`${e} ${t}`);
+		return t === void 0 ? D`CASE ${n} END` : D`CASE ${n} ELSE ${t} END`;
 	}
 	buildBooleanLiteral(e) {
-		return e ? O`TRUE` : O`FALSE`;
+		return e ? D`TRUE` : D`FALSE`;
 	}
 	convertFilterValue(e) {
 		return e;
@@ -748,35 +748,35 @@ var V = class {
 	}
 	buildStddev(e, t = !1) {
 		let n = t ? "STDDEV_SAMP" : "STDDEV_POP";
-		return O`IFNULL(${O.raw(n)}(${e}), 0)`;
+		return D`IFNULL(${D.raw(n)}(${e}), 0)`;
 	}
 	buildVariance(e, t = !1) {
 		let n = t ? "VAR_SAMP" : "VAR_POP";
-		return O`IFNULL(${O.raw(n)}(${e}), 0)`;
+		return D`IFNULL(${D.raw(n)}(${e}), 0)`;
 	}
 	buildPercentile(e, t) {
 		return null;
 	}
 	buildWindowFunction(e, t, n, r, i) {
-		let a = n && n.length > 0 ? O`PARTITION BY ${O.join(n, O`, `)}` : O``, o = r && r.length > 0 ? O`ORDER BY ${O.join(r.map((e) => e.direction === "desc" ? O`${e.field} DESC` : O`${e.field} ASC`), O`, `)}` : O``, s = O``;
+		let a = n && n.length > 0 ? D`PARTITION BY ${D.join(n, D`, `)}` : D``, o = r && r.length > 0 ? D`ORDER BY ${D.join(r.map((e) => e.direction === "desc" ? D`${e.field} DESC` : D`${e.field} ASC`), D`, `)}` : D``, s = D``;
 		if (i?.frame) {
 			let { type: e, start: t, end: n } = i.frame, r = e.toUpperCase(), a = t === "unbounded" ? "UNBOUNDED PRECEDING" : typeof t == "number" ? `${t} PRECEDING` : "CURRENT ROW", o = n === "unbounded" ? "UNBOUNDED FOLLOWING" : n === "current" ? "CURRENT ROW" : typeof n == "number" ? `${n} FOLLOWING` : "CURRENT ROW";
-			s = O`${O.raw(r)} BETWEEN ${O.raw(a)} AND ${O.raw(o)}`;
+			s = D`${D.raw(r)} BETWEEN ${D.raw(a)} AND ${D.raw(o)}`;
 		}
 		let c = [];
 		n && n.length > 0 && c.push(a), r && r.length > 0 && c.push(o), i?.frame && c.push(s);
-		let l = O`OVER (${c.length > 0 ? O.join(c, O` `) : O``})`;
+		let l = D`OVER (${c.length > 0 ? D.join(c, D` `) : D``})`;
 		switch (e) {
-			case "lag": return O`LAG(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? O`` : O`, ${i.defaultValue}`}) ${l}`;
-			case "lead": return O`LEAD(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? O`` : O`, ${i.defaultValue}`}) ${l}`;
-			case "rank": return O`RANK() ${l}`;
-			case "denseRank": return O`DENSE_RANK() ${l}`;
-			case "rowNumber": return O`ROW_NUMBER() ${l}`;
-			case "ntile": return O`NTILE(${i?.nTile ?? 4}) ${l}`;
-			case "firstValue": return O`FIRST_VALUE(${t}) ${l}`;
-			case "lastValue": return O`LAST_VALUE(${t}) ${l}`;
-			case "movingAvg": return O`AVG(${t}) ${l}`;
-			case "movingSum": return O`SUM(${t}) ${l}`;
+			case "lag": return D`LAG(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? D`` : D`, ${i.defaultValue}`}) ${l}`;
+			case "lead": return D`LEAD(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? D`` : D`, ${i.defaultValue}`}) ${l}`;
+			case "rank": return D`RANK() ${l}`;
+			case "denseRank": return D`DENSE_RANK() ${l}`;
+			case "rowNumber": return D`ROW_NUMBER() ${l}`;
+			case "ntile": return D`NTILE(${i?.nTile ?? 4}) ${l}`;
+			case "firstValue": return D`FIRST_VALUE(${t}) ${l}`;
+			case "lastValue": return D`LAST_VALUE(${t}) ${l}`;
+			case "movingAvg": return D`AVG(${t}) ${l}`;
+			case "movingSum": return D`SUM(${t}) ${l}`;
 			default: throw Error(`Unsupported window function: ${e}`);
 		}
 	}
@@ -788,28 +788,28 @@ var V = class {
 		return !1;
 	}
 	buildIntervalFromISO(e) {
-		return O`${this.durationToSeconds(e)}`;
+		return D`${this.durationToSeconds(e)}`;
 	}
 	buildTimeDifferenceSeconds(e, t) {
-		return O`(${e} - ${t})`;
+		return D`(${e} - ${t})`;
 	}
 	buildDateAddInterval(e, t) {
-		return O`(${e} + ${this.durationToSeconds(t)})`;
+		return D`(${e} + ${this.durationToSeconds(t)})`;
 	}
 	buildConditionalAggregation(e, t, n) {
 		let r = e.toUpperCase();
-		return e === "count" && !t ? O`COUNT(CASE WHEN ${n} THEN 1 END)` : O`${O.raw(r)}(CASE WHEN ${n} THEN ${t} END)`;
+		return e === "count" && !t ? D`COUNT(CASE WHEN ${n} THEN 1 END)` : D`${D.raw(r)}(CASE WHEN ${n} THEN ${t} END)`;
 	}
 	buildDateDiffPeriods(e, t, n) {
 		switch (n) {
-			case "day": return O`CAST((julianday(datetime(${t}, 'unixepoch')) - julianday(datetime(${e}, 'unixepoch'))) AS INTEGER)`;
-			case "week": return O`CAST((julianday(datetime(${t}, 'unixepoch')) - julianday(datetime(${e}, 'unixepoch'))) / 7 AS INTEGER)`;
-			case "month": return O`((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 D`CAST((julianday(datetime(${t}, 'unixepoch')) - julianday(datetime(${e}, 'unixepoch'))) AS INTEGER)`;
+			case "week": return D`CAST((julianday(datetime(${t}, 'unixepoch')) - julianday(datetime(${e}, 'unixepoch'))) / 7 AS INTEGER)`;
+			case "month": return D`((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 O`(
+		return D`(
       WITH RECURSIVE periods(period_number) AS (
         SELECT 0
         UNION ALL
@@ -820,52 +820,52 @@ var V = class {
 	}
 	buildTimeDimension(e, t) {
 		switch (e) {
-			case "year": return O`datetime(${t}, 'unixepoch', 'start of year')`;
+			case "year": return D`datetime(${t}, 'unixepoch', 'start of year')`;
 			case "quarter": {
-				let e = O`datetime(${t}, 'unixepoch')`;
-				return O`datetime(${e}, 'start of year',
+				let e = D`datetime(${t}, 'unixepoch')`;
+				return D`datetime(${e}, 'start of year',
           '+' || (((CAST(strftime('%m', ${e}) AS INTEGER) - 1) / 3) * 3) || ' months')`;
 			}
-			case "month": return O`datetime(${t}, 'unixepoch', 'start of month')`;
-			case "week": return O`date(datetime(${t}, 'unixepoch'), 'weekday 1', '-6 days')`;
-			case "day": return O`datetime(${t}, 'unixepoch', 'start of day')`;
-			case "hour": return O`datetime(strftime('%Y-%m-%d %H:00:00', ${O`datetime(${t}, 'unixepoch')`}))`;
-			case "minute": return O`datetime(strftime('%Y-%m-%d %H:%M:00', ${O`datetime(${t}, 'unixepoch')`}))`;
-			case "second": return O`datetime(strftime('%Y-%m-%d %H:%M:%S', ${O`datetime(${t}, 'unixepoch')`}))`;
-			default: return O`datetime(${t}, 'unixepoch')`;
+			case "month": return D`datetime(${t}, 'unixepoch', 'start of month')`;
+			case "week": return D`date(datetime(${t}, 'unixepoch'), 'weekday 1', '-6 days')`;
+			case "day": return D`datetime(${t}, 'unixepoch', 'start of day')`;
+			case "hour": return D`datetime(strftime('%Y-%m-%d %H:00:00', ${D`datetime(${t}, 'unixepoch')`}))`;
+			case "minute": return D`datetime(strftime('%Y-%m-%d %H:%M:00', ${D`datetime(${t}, 'unixepoch')`}))`;
+			case "second": return D`datetime(strftime('%Y-%m-%d %H:%M:%S', ${D`datetime(${t}, 'unixepoch')`}))`;
+			default: return D`datetime(${t}, 'unixepoch')`;
 		}
 	}
 	buildStringCondition(e, t, n) {
 		switch (t) {
-			case "contains": return O`LOWER(${e}) LIKE ${`%${n.toLowerCase()}%`}`;
-			case "notContains": return O`LOWER(${e}) NOT LIKE ${`%${n.toLowerCase()}%`}`;
-			case "startsWith": return O`LOWER(${e}) LIKE ${`${n.toLowerCase()}%`}`;
-			case "endsWith": return O`LOWER(${e}) LIKE ${`%${n.toLowerCase()}`}`;
-			case "like": return O`${e} LIKE ${n}`;
-			case "notLike": return O`${e} NOT LIKE ${n}`;
-			case "ilike": return O`LOWER(${e}) LIKE ${n.toLowerCase()}`;
-			case "regex": return O`${e} GLOB ${n}`;
-			case "notRegex": return O`${e} NOT GLOB ${n}`;
+			case "contains": return D`LOWER(${e}) LIKE ${`%${n.toLowerCase()}%`}`;
+			case "notContains": return D`LOWER(${e}) NOT LIKE ${`%${n.toLowerCase()}%`}`;
+			case "startsWith": return D`LOWER(${e}) LIKE ${`${n.toLowerCase()}%`}`;
+			case "endsWith": return D`LOWER(${e}) LIKE ${`%${n.toLowerCase()}`}`;
+			case "like": return D`${e} LIKE ${n}`;
+			case "notLike": return D`${e} NOT LIKE ${n}`;
+			case "ilike": return D`LOWER(${e}) LIKE ${n.toLowerCase()}`;
+			case "regex": return D`${e} GLOB ${n}`;
+			case "notRegex": return D`${e} NOT GLOB ${n}`;
 			default: throw Error(`Unsupported string operator: ${t}`);
 		}
 	}
 	castToType(e, t) {
 		switch (t) {
-			case "timestamp": return O`datetime(${e} / 1000, 'unixepoch')`;
-			case "decimal": return O`CAST(${e} AS REAL)`;
-			case "integer": return O`CAST(${e} AS INTEGER)`;
+			case "timestamp": return D`datetime(${e} / 1000, 'unixepoch')`;
+			case "decimal": return D`CAST(${e} AS REAL)`;
+			case "integer": return D`CAST(${e} AS INTEGER)`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	buildAvg(e) {
-		return O`IFNULL(AVG(${e}), 0)`;
+		return D`IFNULL(AVG(${e}), 0)`;
 	}
 	buildCaseWhen(e, t) {
-		let n = e.map((e) => e.then && typeof e.then == "object" && (e.then.queryChunks || e.then._ || e.then.sql) ? O`WHEN ${e.when} THEN ${O.raw("(")}${e.then}${O.raw(")")}` : O`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => O`${e} ${t}`);
-		return t === void 0 ? O`CASE ${n} END` : t && typeof t == "object" && (t.queryChunks || t._ || t.sql) ? O`CASE ${n} ELSE ${O.raw("(")}${t}${O.raw(")")} END` : O`CASE ${n} ELSE ${t} END`;
+		let n = e.map((e) => e.then && typeof e.then == "object" && (e.then.queryChunks || e.then._ || e.then.sql) ? D`WHEN ${e.when} THEN ${D.raw("(")}${e.then}${D.raw(")")}` : D`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => D`${e} ${t}`);
+		return t === void 0 ? D`CASE ${n} END` : t && typeof t == "object" && (t.queryChunks || t._ || t.sql) ? D`CASE ${n} ELSE ${D.raw("(")}${t}${D.raw(")")} END` : D`CASE ${n} ELSE ${t} END`;
 	}
 	buildBooleanLiteral(e) {
-		return e ? O`1` : O`0`;
+		return e ? D`1` : D`0`;
 	}
 	preprocessCalculatedTemplate(e) {
 		return e.length > 1e3 ? e : e.replace(/(\{[^}]+\})\s*\/\s*/g, (e, t) => `${t.replace(/\{([^}]+)\}/, "CAST({$1} AS REAL)")} / `);
@@ -910,25 +910,25 @@ var V = class {
 		return null;
 	}
 	buildWindowFunction(e, t, n, r, i) {
-		let a = n && n.length > 0 ? O`PARTITION BY ${O.join(n, O`, `)}` : O``, o = r && r.length > 0 ? O`ORDER BY ${O.join(r.map((e) => e.direction === "desc" ? O`${e.field} DESC` : O`${e.field} ASC`), O`, `)}` : O``, s = O``;
+		let a = n && n.length > 0 ? D`PARTITION BY ${D.join(n, D`, `)}` : D``, o = r && r.length > 0 ? D`ORDER BY ${D.join(r.map((e) => e.direction === "desc" ? D`${e.field} DESC` : D`${e.field} ASC`), D`, `)}` : D``, s = D``;
 		if (i?.frame) {
 			let { type: e, start: t, end: n } = i.frame, r = e.toUpperCase(), a = t === "unbounded" ? "UNBOUNDED PRECEDING" : typeof t == "number" ? `${t} PRECEDING` : "CURRENT ROW", o = n === "unbounded" ? "UNBOUNDED FOLLOWING" : n === "current" ? "CURRENT ROW" : typeof n == "number" ? `${n} FOLLOWING` : "CURRENT ROW";
-			s = O`${O.raw(r)} BETWEEN ${O.raw(a)} AND ${O.raw(o)}`;
+			s = D`${D.raw(r)} BETWEEN ${D.raw(a)} AND ${D.raw(o)}`;
 		}
 		let c = [];
 		n && n.length > 0 && c.push(a), r && r.length > 0 && c.push(o), i?.frame && c.push(s);
-		let l = O`OVER (${c.length > 0 ? O.join(c, O` `) : O``})`;
+		let l = D`OVER (${c.length > 0 ? D.join(c, D` `) : D``})`;
 		switch (e) {
-			case "lag": return O`LAG(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? O`` : O`, ${i.defaultValue}`}) ${l}`;
-			case "lead": return O`LEAD(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? O`` : O`, ${i.defaultValue}`}) ${l}`;
-			case "rank": return O`RANK() ${l}`;
-			case "denseRank": return O`DENSE_RANK() ${l}`;
-			case "rowNumber": return O`ROW_NUMBER() ${l}`;
-			case "ntile": return O`NTILE(${i?.nTile ?? 4}) ${l}`;
-			case "firstValue": return O`FIRST_VALUE(${t}) ${l}`;
-			case "lastValue": return O`LAST_VALUE(${t}) ${l}`;
-			case "movingAvg": return O`AVG(${t}) ${l}`;
-			case "movingSum": return O`SUM(${t}) ${l}`;
+			case "lag": return D`LAG(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? D`` : D`, ${i.defaultValue}`}) ${l}`;
+			case "lead": return D`LEAD(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? D`` : D`, ${i.defaultValue}`}) ${l}`;
+			case "rank": return D`RANK() ${l}`;
+			case "denseRank": return D`DENSE_RANK() ${l}`;
+			case "rowNumber": return D`ROW_NUMBER() ${l}`;
+			case "ntile": return D`NTILE(${i?.nTile ?? 4}) ${l}`;
+			case "firstValue": return D`FIRST_VALUE(${t}) ${l}`;
+			case "lastValue": return D`LAST_VALUE(${t}) ${l}`;
+			case "movingAvg": return D`AVG(${t}) ${l}`;
+			case "movingSum": return D`SUM(${t}) ${l}`;
 			default: throw Error(`Unsupported window function: ${e}`);
 		}
 	}
@@ -947,68 +947,68 @@ var V = 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 O`INTERVAL '${O.raw(r)}'`;
+		return D`INTERVAL '${D.raw(r)}'`;
 	}
 	buildTimeDifferenceSeconds(e, t) {
-		return O`(EPOCH(${e}) - EPOCH(${t}))`;
+		return D`(EPOCH(${e}) - EPOCH(${t}))`;
 	}
 	buildDateAddInterval(e, t) {
-		return O`(${e} + ${this.buildIntervalFromISO(t)})`;
+		return D`(${e} + ${this.buildIntervalFromISO(t)})`;
 	}
 	buildConditionalAggregation(e, t, n) {
 		let r = e.toUpperCase();
-		return e === "count" && !t ? O`COUNT(*) FILTER (WHERE ${n})` : O`${O.raw(r)}(${t}) FILTER (WHERE ${n})`;
+		return e === "count" && !t ? D`COUNT(*) FILTER (WHERE ${n})` : D`${D.raw(r)}(${t}) FILTER (WHERE ${n})`;
 	}
 	buildDateDiffPeriods(e, t, n) {
-		return O`DATE_DIFF('${O.raw(n)}', ${e}::timestamp, ${t}::timestamp)`;
+		return D`DATE_DIFF('${D.raw(n)}', ${e}::timestamp, ${t}::timestamp)`;
 	}
 	buildPeriodSeriesSubquery(e) {
-		return O`(SELECT UNNEST(generate_series(0, ${e})) as period_number) p`;
+		return D`(SELECT UNNEST(generate_series(0, ${e})) as period_number) p`;
 	}
 	buildTimeDimension(e, t) {
 		switch (e) {
-			case "year": return O`DATE_TRUNC('year', ${t}::timestamp)`;
-			case "quarter": return O`DATE_TRUNC('quarter', ${t}::timestamp)`;
-			case "month": return O`DATE_TRUNC('month', ${t}::timestamp)`;
-			case "week": return O`DATE_TRUNC('week', ${t}::timestamp)`;
-			case "day": return O`DATE_TRUNC('day', ${t}::timestamp)::timestamp`;
-			case "hour": return O`DATE_TRUNC('hour', ${t}::timestamp)`;
-			case "minute": return O`DATE_TRUNC('minute', ${t}::timestamp)`;
-			case "second": return O`DATE_TRUNC('second', ${t}::timestamp)`;
+			case "year": return D`DATE_TRUNC('year', ${t}::timestamp)`;
+			case "quarter": return D`DATE_TRUNC('quarter', ${t}::timestamp)`;
+			case "month": return D`DATE_TRUNC('month', ${t}::timestamp)`;
+			case "week": return D`DATE_TRUNC('week', ${t}::timestamp)`;
+			case "day": return D`DATE_TRUNC('day', ${t}::timestamp)::timestamp`;
+			case "hour": return D`DATE_TRUNC('hour', ${t}::timestamp)`;
+			case "minute": return D`DATE_TRUNC('minute', ${t}::timestamp)`;
+			case "second": return D`DATE_TRUNC('second', ${t}::timestamp)`;
 			default: return t;
 		}
 	}
 	buildStringCondition(e, t, n) {
 		switch (t) {
-			case "contains": return O`${e} ILIKE ${`%${n}%`}`;
-			case "notContains": return O`${e} NOT ILIKE ${`%${n}%`}`;
-			case "startsWith": return O`${e} ILIKE ${`${n}%`}`;
-			case "endsWith": return O`${e} ILIKE ${`%${n}`}`;
-			case "like": return O`${e} LIKE ${n}`;
-			case "notLike": return O`${e} NOT LIKE ${n}`;
-			case "ilike": return O`${e} ILIKE ${n}`;
-			case "regex": return O`regexp_matches(${e}, ${n})`;
-			case "notRegex": return O`NOT regexp_matches(${e}, ${n})`;
+			case "contains": return D`${e} ILIKE ${`%${n}%`}`;
+			case "notContains": return D`${e} NOT ILIKE ${`%${n}%`}`;
+			case "startsWith": return D`${e} ILIKE ${`${n}%`}`;
+			case "endsWith": return D`${e} ILIKE ${`%${n}`}`;
+			case "like": return D`${e} LIKE ${n}`;
+			case "notLike": return D`${e} NOT LIKE ${n}`;
+			case "ilike": return D`${e} ILIKE ${n}`;
+			case "regex": return D`regexp_matches(${e}, ${n})`;
+			case "notRegex": return D`NOT regexp_matches(${e}, ${n})`;
 			default: throw Error(`Unsupported string operator: ${t}`);
 		}
 	}
 	castToType(e, t) {
 		switch (t) {
-			case "timestamp": return O`${e}::timestamp`;
-			case "decimal": return O`${e}::decimal`;
-			case "integer": return O`${e}::integer`;
+			case "timestamp": return D`${e}::timestamp`;
+			case "decimal": return D`${e}::decimal`;
+			case "integer": return D`${e}::integer`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	buildAvg(e) {
-		return O`COALESCE(AVG(${e}), 0)`;
+		return D`COALESCE(AVG(${e}), 0)`;
 	}
 	buildCaseWhen(e, t) {
-		let n = e.map((e) => O`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => O`${e} ${t}`);
-		return t === void 0 ? O`CASE ${n} END` : O`CASE ${n} ELSE ${t} END`;
+		let n = e.map((e) => D`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => D`${e} ${t}`);
+		return t === void 0 ? D`CASE ${n} END` : D`CASE ${n} ELSE ${t} END`;
 	}
 	buildBooleanLiteral(e) {
-		return e ? O`TRUE` : O`FALSE`;
+		return e ? D`TRUE` : D`FALSE`;
 	}
 	convertFilterValue(e) {
 		return e;
@@ -1037,35 +1037,35 @@ var V = class {
 	}
 	buildStddev(e, t = !1) {
 		let n = t ? "STDDEV_SAMP" : "STDDEV_POP";
-		return O`COALESCE(${O.raw(n)}(${e}), 0)`;
+		return D`COALESCE(${D.raw(n)}(${e}), 0)`;
 	}
 	buildVariance(e, t = !1) {
 		let n = t ? "VAR_SAMP" : "VAR_POP";
-		return O`COALESCE(${O.raw(n)}(${e}), 0)`;
+		return D`COALESCE(${D.raw(n)}(${e}), 0)`;
 	}
 	buildPercentile(e, t) {
-		return O`QUANTILE_CONT(${e}, ${t / 100})`;
+		return D`QUANTILE_CONT(${e}, ${t / 100})`;
 	}
 	buildWindowFunction(e, t, n, r, i) {
-		let a = n && n.length > 0 ? O`PARTITION BY ${O.join(n, O`, `)}` : O``, o = r && r.length > 0 ? O`ORDER BY ${O.join(r.map((e) => e.direction === "desc" ? O`${e.field} DESC` : O`${e.field} ASC`), O`, `)}` : O``, s = O``;
+		let a = n && n.length > 0 ? D`PARTITION BY ${D.join(n, D`, `)}` : D``, o = r && r.length > 0 ? D`ORDER BY ${D.join(r.map((e) => e.direction === "desc" ? D`${e.field} DESC` : D`${e.field} ASC`), D`, `)}` : D``, s = D``;
 		if (i?.frame) {
 			let { type: e, start: t, end: n } = i.frame, r = e.toUpperCase(), a = t === "unbounded" ? "UNBOUNDED PRECEDING" : typeof t == "number" ? `${t} PRECEDING` : "CURRENT ROW", o = n === "unbounded" ? "UNBOUNDED FOLLOWING" : n === "current" ? "CURRENT ROW" : typeof n == "number" ? `${n} FOLLOWING` : "CURRENT ROW";
-			s = O`${O.raw(r)} BETWEEN ${O.raw(a)} AND ${O.raw(o)}`;
+			s = D`${D.raw(r)} BETWEEN ${D.raw(a)} AND ${D.raw(o)}`;
 		}
 		let c = [];
 		n && n.length > 0 && c.push(a), r && r.length > 0 && c.push(o), i?.frame && c.push(s);
-		let l = O`OVER (${c.length > 0 ? O.join(c, O` `) : O``})`;
+		let l = D`OVER (${c.length > 0 ? D.join(c, D` `) : D``})`;
 		switch (e) {
-			case "lag": return O`LAG(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? O`` : O`, ${i.defaultValue}`}) ${l}`;
-			case "lead": return O`LEAD(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? O`` : O`, ${i.defaultValue}`}) ${l}`;
-			case "rank": return O`RANK() ${l}`;
-			case "denseRank": return O`DENSE_RANK() ${l}`;
-			case "rowNumber": return O`ROW_NUMBER() ${l}`;
-			case "ntile": return O`NTILE(${i?.nTile ?? 4}) ${l}`;
-			case "firstValue": return O`FIRST_VALUE(${t}) ${l}`;
-			case "lastValue": return O`LAST_VALUE(${t}) ${l}`;
-			case "movingAvg": return O`AVG(${t}) ${l}`;
-			case "movingSum": return O`SUM(${t}) ${l}`;
+			case "lag": return D`LAG(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? D`` : D`, ${i.defaultValue}`}) ${l}`;
+			case "lead": return D`LEAD(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? D`` : D`, ${i.defaultValue}`}) ${l}`;
+			case "rank": return D`RANK() ${l}`;
+			case "denseRank": return D`DENSE_RANK() ${l}`;
+			case "rowNumber": return D`ROW_NUMBER() ${l}`;
+			case "ntile": return D`NTILE(${i?.nTile ?? 4}) ${l}`;
+			case "firstValue": return D`FIRST_VALUE(${t}) ${l}`;
+			case "lastValue": return D`LAST_VALUE(${t}) ${l}`;
+			case "movingAvg": return D`AVG(${t}) ${l}`;
+			case "movingSum": return D`SUM(${t}) ${l}`;
 			default: throw Error(`Unsupported window function: ${e}`);
 		}
 	}
@@ -1078,71 +1078,71 @@ var V = 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 O`INTERVAL 0 SECOND`;
-		if (n.length === 1) return O`INTERVAL ${O.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 D`INTERVAL 0 SECOND`;
+		if (n.length === 1) return D`INTERVAL ${D.raw(n[0])}`;
 		let r = n.map((e) => `INTERVAL ${e}`);
-		return O`(${O.raw(r.join(" + "))})`;
+		return D`(${D.raw(r.join(" + "))})`;
 	}
 	buildTimeDifferenceSeconds(e, t) {
-		return O`EXTRACT(EPOCH FROM TIMESTAMP_DIFF(${e}, ${t}))`;
+		return D`EXTRACT(EPOCH FROM TIMESTAMP_DIFF(${e}, ${t}))`;
 	}
 	buildDateAddInterval(e, t) {
-		return O`(${e} + ${this.buildIntervalFromISO(t)})`;
+		return D`(${e} + ${this.buildIntervalFromISO(t)})`;
 	}
 	buildConditionalAggregation(e, t, n) {
 		let r = e.toUpperCase();
-		return e === "count" && !t ? O`${O.raw(r)}(CASE WHEN ${n} THEN 1 END)` : O`${O.raw(r)}(CASE WHEN ${n} THEN ${t} END)`;
+		return e === "count" && !t ? D`${D.raw(r)}(CASE WHEN ${n} THEN 1 END)` : D`${D.raw(r)}(CASE WHEN ${n} THEN ${t} END)`;
 	}
 	buildDateDiffPeriods(e, t, n) {
-		return O`DATE_DIFF('${O.raw(n)}', ${e}::TIMESTAMP, ${t}::TIMESTAMP)`;
+		return D`DATE_DIFF('${D.raw(n)}', ${e}::TIMESTAMP, ${t}::TIMESTAMP)`;
 	}
 	buildPeriodSeriesSubquery(e) {
-		return O`(SELECT number as period_number FROM numbers(${e + 1})) p`;
+		return D`(SELECT number as period_number FROM numbers(${e + 1})) p`;
 	}
 	buildTimeDimension(e, t) {
 		switch (e) {
-			case "year": return O`DATE_TRUNC(YEAR, ${t}::TIMESTAMP)`;
-			case "quarter": return O`DATE_TRUNC(QUARTER, ${t}::TIMESTAMP)`;
-			case "month": return O`DATE_TRUNC(MONTH, ${t}::TIMESTAMP)`;
-			case "week": return O`DATE_TRUNC(WEEK, ${t}::TIMESTAMP)`;
-			case "day": return O`DATE_TRUNC(DAY, ${t}::TIMESTAMP)::TIMESTAMP`;
-			case "hour": return O`DATE_TRUNC(HOUR, ${t}::TIMESTAMP)`;
-			case "minute": return O`DATE_TRUNC(MINUTE, ${t}::TIMESTAMP)`;
-			case "second": return O`DATE_TRUNC(SECOND, ${t}::TIMESTAMP)`;
+			case "year": return D`DATE_TRUNC(YEAR, ${t}::TIMESTAMP)`;
+			case "quarter": return D`DATE_TRUNC(QUARTER, ${t}::TIMESTAMP)`;
+			case "month": return D`DATE_TRUNC(MONTH, ${t}::TIMESTAMP)`;
+			case "week": return D`DATE_TRUNC(WEEK, ${t}::TIMESTAMP)`;
+			case "day": return D`DATE_TRUNC(DAY, ${t}::TIMESTAMP)::TIMESTAMP`;
+			case "hour": return D`DATE_TRUNC(HOUR, ${t}::TIMESTAMP)`;
+			case "minute": return D`DATE_TRUNC(MINUTE, ${t}::TIMESTAMP)`;
+			case "second": return D`DATE_TRUNC(SECOND, ${t}::TIMESTAMP)`;
 			default: return t;
 		}
 	}
 	buildStringCondition(e, t, n) {
 		switch (t) {
-			case "contains": return O`LOWER(${e}) LIKE LOWER(${`%${n}%`})`;
-			case "notContains": return O`LOWER(${e}) NOT LIKE LOWER(${`%${n}%`})`;
-			case "startsWith": return O`LOWER(${e}) LIKE LOWER(${`${n}%`})`;
-			case "endsWith": return O`LOWER(${e}) LIKE LOWER(${`%${n}`})`;
-			case "like": return O`${e} LIKE ${n}`;
-			case "notLike": return O`${e} NOT LIKE ${n}`;
-			case "ilike": return O`LOWER(${e}) LIKE LOWER(${n})`;
-			case "regex": return O`${e} REGEXP ${n}`;
-			case "notRegex": return O`NOT (${e} REGEXP ${n})`;
+			case "contains": return D`LOWER(${e}) LIKE LOWER(${`%${n}%`})`;
+			case "notContains": return D`LOWER(${e}) NOT LIKE LOWER(${`%${n}%`})`;
+			case "startsWith": return D`LOWER(${e}) LIKE LOWER(${`${n}%`})`;
+			case "endsWith": return D`LOWER(${e}) LIKE LOWER(${`%${n}`})`;
+			case "like": return D`${e} LIKE ${n}`;
+			case "notLike": return D`${e} NOT LIKE ${n}`;
+			case "ilike": return D`LOWER(${e}) LIKE LOWER(${n})`;
+			case "regex": return D`${e} REGEXP ${n}`;
+			case "notRegex": return D`NOT (${e} REGEXP ${n})`;
 			default: throw Error(`Unsupported string operator: ${t}`);
 		}
 	}
 	castToType(e, t) {
 		switch (t) {
-			case "timestamp": return O`${e}::TIMESTAMP`;
-			case "decimal": return O`${e}::DECIMAL`;
-			case "integer": return O`${e}::INTEGER`;
+			case "timestamp": return D`${e}::TIMESTAMP`;
+			case "decimal": return D`${e}::DECIMAL`;
+			case "integer": return D`${e}::INTEGER`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	buildAvg(e) {
-		return O`COALESCE(AVG(${e}), 0)`;
+		return D`COALESCE(AVG(${e}), 0)`;
 	}
 	buildCaseWhen(e, t) {
-		let n = e.map((e) => O`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => O`${e} ${t}`);
-		return t === void 0 ? O`CASE ${n} END` : O`CASE ${n} ELSE ${t} END`;
+		let n = e.map((e) => D`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => D`${e} ${t}`);
+		return t === void 0 ? D`CASE ${n} END` : D`CASE ${n} ELSE ${t} END`;
 	}
 	buildBooleanLiteral(e) {
-		return e ? O`TRUE` : O`FALSE`;
+		return e ? D`TRUE` : D`FALSE`;
 	}
 	convertFilterValue(e) {
 		return e;
@@ -1171,35 +1171,35 @@ var V = class {
 	}
 	buildStddev(e, t = !1) {
 		let n = t ? "STDDEV_SAMP" : "STDDEV_POP";
-		return O`COALESCE(${O.raw(n)}(${e}), 0)`;
+		return D`COALESCE(${D.raw(n)}(${e}), 0)`;
 	}
 	buildVariance(e, t = !1) {
 		let n = t ? "COVAR_SAMP" : "COVAR_POP";
-		return O`COALESCE(${O.raw(n)}(${e}, ${e}), 0)`;
+		return D`COALESCE(${D.raw(n)}(${e}, ${e}), 0)`;
 	}
 	buildPercentile(e, t) {
 		throw Error("Percentile functions are not yet supported for Databend");
 	}
 	buildWindowFunction(e, t, n, r, i) {
-		let a = n && n.length > 0 ? O`PARTITION BY ${O.join(n, O`, `)}` : O``, o = r && r.length > 0 ? O`ORDER BY ${O.join(r.map((e) => e.direction === "desc" ? O`${e.field} DESC` : O`${e.field} ASC`), O`, `)}` : O``, s = O``;
+		let a = n && n.length > 0 ? D`PARTITION BY ${D.join(n, D`, `)}` : D``, o = r && r.length > 0 ? D`ORDER BY ${D.join(r.map((e) => e.direction === "desc" ? D`${e.field} DESC` : D`${e.field} ASC`), D`, `)}` : D``, s = D``;
 		if (i?.frame) {
 			let { type: e, start: t, end: n } = i.frame, r = e.toUpperCase(), a = t === "unbounded" ? "UNBOUNDED PRECEDING" : typeof t == "number" ? `${t} PRECEDING` : "CURRENT ROW", o = n === "unbounded" ? "UNBOUNDED FOLLOWING" : n === "current" ? "CURRENT ROW" : typeof n == "number" ? `${n} FOLLOWING` : "CURRENT ROW";
-			s = O`${O.raw(r)} BETWEEN ${O.raw(a)} AND ${O.raw(o)}`;
+			s = D`${D.raw(r)} BETWEEN ${D.raw(a)} AND ${D.raw(o)}`;
 		}
 		let c = [];
 		n && n.length > 0 && c.push(a), r && r.length > 0 && c.push(o), i?.frame && c.push(s);
-		let l = O`OVER (${c.length > 0 ? O.join(c, O` `) : O``})`;
+		let l = D`OVER (${c.length > 0 ? D.join(c, D` `) : D``})`;
 		switch (e) {
-			case "lag": return O`LAG(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? O`` : O`, ${i.defaultValue}`}) ${l}`;
-			case "lead": return O`LEAD(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? O`` : O`, ${i.defaultValue}`}) ${l}`;
-			case "rank": return O`RANK() ${l}`;
-			case "denseRank": return O`DENSE_RANK() ${l}`;
-			case "rowNumber": return O`ROW_NUMBER() ${l}`;
-			case "ntile": return O`NTILE(${i?.nTile ?? 4}) ${l}`;
-			case "firstValue": return O`FIRST_VALUE(${t}) ${l}`;
-			case "lastValue": return O`LAST_VALUE(${t}) ${l}`;
-			case "movingAvg": return O`AVG(${t}) ${l}`;
-			case "movingSum": return O`SUM(${t}) ${l}`;
+			case "lag": return D`LAG(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? D`` : D`, ${i.defaultValue}`}) ${l}`;
+			case "lead": return D`LEAD(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? D`` : D`, ${i.defaultValue}`}) ${l}`;
+			case "rank": return D`RANK() ${l}`;
+			case "denseRank": return D`DENSE_RANK() ${l}`;
+			case "rowNumber": return D`ROW_NUMBER() ${l}`;
+			case "ntile": return D`NTILE(${i?.nTile ?? 4}) ${l}`;
+			case "firstValue": return D`FIRST_VALUE(${t}) ${l}`;
+			case "lastValue": return D`LAST_VALUE(${t}) ${l}`;
+			case "movingAvg": return D`AVG(${t}) ${l}`;
+			case "movingSum": return D`SUM(${t}) ${l}`;
 			default: throw Error(`Unsupported window function: ${e}`);
 		}
 	}
@@ -1211,70 +1211,70 @@ var V = class {
 		return !0;
 	}
 	buildIntervalFromISO(e) {
-		return O`${this.durationToSeconds(e)}`;
+		return D`${this.durationToSeconds(e)}`;
 	}
 	buildTimeDifferenceSeconds(e, t) {
-		return O`DATEDIFF('SECOND', ${t}, ${e})`;
+		return D`DATEDIFF('SECOND', ${t}, ${e})`;
 	}
 	buildDateAddInterval(e, t) {
 		let n = this.parseISODuration(t), r = e;
-		return n.years && (r = O`DATEADD('YEAR', ${n.years}, ${r})`), n.months && (r = O`DATEADD('MONTH', ${n.months}, ${r})`), n.days && (r = O`DATEADD('DAY', ${n.days}, ${r})`), n.hours && (r = O`DATEADD('HOUR', ${n.hours}, ${r})`), n.minutes && (r = O`DATEADD('MINUTE', ${n.minutes}, ${r})`), n.seconds && (r = O`DATEADD('SECOND', ${n.seconds}, ${r})`), r;
+		return n.years && (r = D`DATEADD('YEAR', ${n.years}, ${r})`), n.months && (r = D`DATEADD('MONTH', ${n.months}, ${r})`), n.days && (r = D`DATEADD('DAY', ${n.days}, ${r})`), n.hours && (r = D`DATEADD('HOUR', ${n.hours}, ${r})`), n.minutes && (r = D`DATEADD('MINUTE', ${n.minutes}, ${r})`), n.seconds && (r = D`DATEADD('SECOND', ${n.seconds}, ${r})`), r;
 	}
 	buildConditionalAggregation(e, t, n) {
 		let r = e.toUpperCase();
-		return e === "count" && !t ? O`${O.raw(r)}(CASE WHEN ${n} THEN 1 END)` : O`${O.raw(r)}(CASE WHEN ${n} THEN ${t} END)`;
+		return e === "count" && !t ? D`${D.raw(r)}(CASE WHEN ${n} THEN 1 END)` : D`${D.raw(r)}(CASE WHEN ${n} THEN ${t} END)`;
 	}
 	buildDateDiffPeriods(e, t, n) {
 		let r = n.toUpperCase();
-		return O`DATEDIFF('${O.raw(r)}', ${e}::TIMESTAMP, ${t}::TIMESTAMP)`;
+		return D`DATEDIFF('${D.raw(r)}', ${e}::TIMESTAMP, ${t}::TIMESTAMP)`;
 	}
 	buildPeriodSeriesSubquery(e) {
-		return O`(SELECT ROW_NUMBER() OVER (ORDER BY 1) - 1 AS period_number FROM TABLE(GENERATOR(ROWCOUNT => ${e + 1}))) p`;
+		return D`(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 O`DATE_TRUNC('YEAR', ${t}::TIMESTAMP)`;
-			case "quarter": return O`DATE_TRUNC('QUARTER', ${t}::TIMESTAMP)`;
-			case "month": return O`DATE_TRUNC('MONTH', ${t}::TIMESTAMP)`;
-			case "week": return O`DATE_TRUNC('WEEK', ${t}::TIMESTAMP)`;
-			case "day": return O`DATE_TRUNC('DAY', ${t}::TIMESTAMP)::TIMESTAMP`;
-			case "hour": return O`DATE_TRUNC('HOUR', ${t}::TIMESTAMP)`;
-			case "minute": return O`DATE_TRUNC('MINUTE', ${t}::TIMESTAMP)`;
-			case "second": return O`DATE_TRUNC('SECOND', ${t}::TIMESTAMP)`;
+			case "year": return D`DATE_TRUNC('YEAR', ${t}::TIMESTAMP)`;
+			case "quarter": return D`DATE_TRUNC('QUARTER', ${t}::TIMESTAMP)`;
+			case "month": return D`DATE_TRUNC('MONTH', ${t}::TIMESTAMP)`;
+			case "week": return D`DATE_TRUNC('WEEK', ${t}::TIMESTAMP)`;
+			case "day": return D`DATE_TRUNC('DAY', ${t}::TIMESTAMP)::TIMESTAMP`;
+			case "hour": return D`DATE_TRUNC('HOUR', ${t}::TIMESTAMP)`;
+			case "minute": return D`DATE_TRUNC('MINUTE', ${t}::TIMESTAMP)`;
+			case "second": return D`DATE_TRUNC('SECOND', ${t}::TIMESTAMP)`;
 			default: return t;
 		}
 	}
 	buildStringCondition(e, t, n) {
 		switch (t) {
-			case "contains": return O`${e} ILIKE ${`%${n}%`}`;
-			case "notContains": return O`${e} NOT ILIKE ${`%${n}%`}`;
-			case "startsWith": return O`${e} ILIKE ${`${n}%`}`;
-			case "endsWith": return O`${e} ILIKE ${`%${n}`}`;
-			case "like": return O`${e} LIKE ${n}`;
-			case "notLike": return O`${e} NOT LIKE ${n}`;
-			case "ilike": return O`${e} ILIKE ${n}`;
-			case "regex": return O`REGEXP_LIKE(${e}, ${n})`;
-			case "notRegex": return O`NOT REGEXP_LIKE(${e}, ${n})`;
+			case "contains": return D`${e} ILIKE ${`%${n}%`}`;
+			case "notContains": return D`${e} NOT ILIKE ${`%${n}%`}`;
+			case "startsWith": return D`${e} ILIKE ${`${n}%`}`;
+			case "endsWith": return D`${e} ILIKE ${`%${n}`}`;
+			case "like": return D`${e} LIKE ${n}`;
+			case "notLike": return D`${e} NOT LIKE ${n}`;
+			case "ilike": return D`${e} ILIKE ${n}`;
+			case "regex": return D`REGEXP_LIKE(${e}, ${n})`;
+			case "notRegex": return D`NOT REGEXP_LIKE(${e}, ${n})`;
 			default: throw Error(`Unsupported string operator: ${t}`);
 		}
 	}
 	castToType(e, t) {
 		switch (t) {
-			case "timestamp": return O`${e}::TIMESTAMP`;
-			case "decimal": return O`${e}::DECIMAL`;
-			case "integer": return O`${e}::INTEGER`;
+			case "timestamp": return D`${e}::TIMESTAMP`;
+			case "decimal": return D`${e}::DECIMAL`;
+			case "integer": return D`${e}::INTEGER`;
 			default: throw Error(`Unsupported cast type: ${t}`);
 		}
 	}
 	buildAvg(e) {
-		return O`COALESCE(AVG(${e}), 0)`;
+		return D`COALESCE(AVG(${e}), 0)`;
 	}
 	buildCaseWhen(e, t) {
-		let n = e.map((e) => O`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => O`${e} ${t}`);
-		return t === void 0 ? O`CASE ${n} END` : O`CASE ${n} ELSE ${t} END`;
+		let n = e.map((e) => D`WHEN ${e.when} THEN ${e.then}`).reduce((e, t) => D`${e} ${t}`);
+		return t === void 0 ? D`CASE ${n} END` : D`CASE ${n} ELSE ${t} END`;
 	}
 	buildBooleanLiteral(e) {
-		return e ? O`TRUE` : O`FALSE`;
+		return e ? D`TRUE` : D`FALSE`;
 	}
 	convertFilterValue(e) {
 		return e;
@@ -1303,36 +1303,36 @@ var V = class {
 	}
 	buildStddev(e, t = !1) {
 		let n = t ? "STDDEV_SAMP" : "STDDEV_POP";
-		return O`COALESCE(${O.raw(n)}(${e}), 0)`;
+		return D`COALESCE(${D.raw(n)}(${e}), 0)`;
 	}
 	buildVariance(e, t = !1) {
 		let n = t ? "VAR_SAMP" : "VAR_POP";
-		return O`COALESCE(${O.raw(n)}(${e}), 0)`;
+		return D`COALESCE(${D.raw(n)}(${e}), 0)`;
 	}
 	buildPercentile(e, t) {
 		let n = (t / 100).toString();
-		return O`PERCENTILE_CONT(${O.raw(n)}) WITHIN GROUP (ORDER BY ${e})`;
+		return D`PERCENTILE_CONT(${D.raw(n)}) WITHIN GROUP (ORDER BY ${e})`;
 	}
 	buildWindowFunction(e, t, n, r, i) {
-		let a = n && n.length > 0 ? O`PARTITION BY ${O.join(n, O`, `)}` : O``, o = r && r.length > 0 ? O`ORDER BY ${O.join(r.map((e) => e.direction === "desc" ? O`${e.field} DESC` : O`${e.field} ASC`), O`, `)}` : O``, s = O``;
+		let a = n && n.length > 0 ? D`PARTITION BY ${D.join(n, D`, `)}` : D``, o = r && r.length > 0 ? D`ORDER BY ${D.join(r.map((e) => e.direction === "desc" ? D`${e.field} DESC` : D`${e.field} ASC`), D`, `)}` : D``, s = D``;
 		if (i?.frame) {
 			let { type: e, start: t, end: n } = i.frame, r = e.toUpperCase(), a = t === "unbounded" ? "UNBOUNDED PRECEDING" : typeof t == "number" ? `${t} PRECEDING` : "CURRENT ROW", o = n === "unbounded" ? "UNBOUNDED FOLLOWING" : n === "current" ? "CURRENT ROW" : typeof n == "number" ? `${n} FOLLOWING` : "CURRENT ROW";
-			s = O`${O.raw(r)} BETWEEN ${O.raw(a)} AND ${O.raw(o)}`;
+			s = D`${D.raw(r)} BETWEEN ${D.raw(a)} AND ${D.raw(o)}`;
 		}
 		let c = [];
 		n && n.length > 0 && c.push(a), r && r.length > 0 && c.push(o), i?.frame && c.push(s);
-		let l = O`OVER (${c.length > 0 ? O.join(c, O` `) : O``})`;
+		let l = D`OVER (${c.length > 0 ? D.join(c, D` `) : D``})`;
 		switch (e) {
-			case "lag": return O`LAG(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? O`` : O`, ${i.defaultValue}`}) ${l}`;
-			case "lead": return O`LEAD(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? O`` : O`, ${i.defaultValue}`}) ${l}`;
-			case "rank": return O`RANK() ${l}`;
-			case "denseRank": return O`DENSE_RANK() ${l}`;
-			case "rowNumber": return O`ROW_NUMBER() ${l}`;
-			case "ntile": return O`NTILE(${i?.nTile ?? 4}) ${l}`;
-			case "firstValue": return O`FIRST_VALUE(${t}) ${l}`;
-			case "lastValue": return O`LAST_VALUE(${t}) ${l}`;
-			case "movingAvg": return O`AVG(${t}) ${l}`;
-			case "movingSum": return O`SUM(${t}) ${l}`;
+			case "lag": return D`LAG(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? D`` : D`, ${i.defaultValue}`}) ${l}`;
+			case "lead": return D`LEAD(${t}, ${i?.offset ?? 1}${i?.defaultValue === void 0 ? D`` : D`, ${i.defaultValue}`}) ${l}`;
+			case "rank": return D`RANK() ${l}`;
+			case "denseRank": return D`DENSE_RANK() ${l}`;
+			case "rowNumber": return D`ROW_NUMBER() ${l}`;
+			case "ntile": return D`NTILE(${i?.nTile ?? 4}) ${l}`;
+			case "firstValue": return D`FIRST_VALUE(${t}) ${l}`;
+			case "lastValue": return D`LAST_VALUE(${t}) ${l}`;
+			case "movingAvg": return D`AVG(${t}) ${l}`;
+			case "movingSum": return D`SUM(${t}) ${l}`;
 			default: throw Error(`Unsupported window function: ${e}`);
 		}
 	}
@@ -1467,7 +1467,7 @@ var Te = class extends H {
 	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");
-		let i = await this.db.execute(O`${O.raw(r)} ${O.raw(e.replace(/\$(\d+)/g, (e, n) => {
+		let i = await this.db.execute(D`${D.raw(r)} ${D.raw(e.replace(/\$(\d+)/g, (e, n) => {
 			let r = t[parseInt(n, 10) - 1];
 			return r === null ? "NULL" : typeof r == "number" ? String(r) : typeof r == "boolean" ? r ? "TRUE" : "FALSE" : r instanceof Date ? `'${r.toISOString()}'` : `'${String(r).replace(/'/g, "''")}'`;
 		}))}`), a = [];
@@ -1484,7 +1484,7 @@ var Te = class extends H {
 		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 = we(await this.db.execute(O`
+			let t = e.map((e) => `'${e.toLowerCase()}'`).join(","), n = we(await this.db.execute(D`
         SELECT
           t.relname as table_name,
           i.relname as index_name,
@@ -1498,7 +1498,7 @@ var Te = class extends H {
         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 (${O.raw(t)})
+          AND t.relname IN (${D.raw(t)})
         GROUP BY t.relname, i.relname, ix.indisunique, ix.indisprimary
         ORDER BY t.relname, i.relname
       `));
@@ -1602,7 +1602,7 @@ var ke = class extends H {
 		});
 		let a = n?.analyze ? "EXPLAIN ANALYZE" : "EXPLAIN";
 		if (!this.db.execute) throw Error("MySQL database instance must have an execute method");
-		let o = await this.db.execute(O.raw(`${a} ${r}`)), s = [];
+		let o = await this.db.execute(D.raw(`${a} ${r}`)), s = [];
 		if (Array.isArray(o)) for (let e of o) e && typeof e == "object" && s.push({
 			id: e.id || 1,
 			select_type: e.select_type || "SIMPLE",
@@ -1626,7 +1626,7 @@ var ke = class extends H {
 		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(O`
+			let t = e.map((e) => `'${e.toLowerCase()}'`).join(","), n = await this.db.execute(D`
         SELECT
           TABLE_NAME as table_name,
           INDEX_NAME as index_name,
@@ -1635,7 +1635,7 @@ var ke = class extends H {
           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 (${O.raw(t)})
+          AND LOWER(TABLE_NAME) IN (${D.raw(t)})
         GROUP BY TABLE_NAME, INDEX_NAME, NON_UNIQUE
         ORDER BY TABLE_NAME, INDEX_NAME
       `);
@@ -1755,7 +1755,7 @@ var Ne = class extends H {
 			return e === null ? "NULL" : typeof e == "number" ? String(e) : typeof e == "boolean" ? e ? "1" : "0" : e instanceof Date ? `'${e.toISOString()}'` : `'${String(e).replace(/'/g, "''")}'`;
 		});
 		let a = `EXPLAIN QUERY PLAN ${r}`, o;
-		if (this.db.all) o = this.db.all(O.raw(a));
+		if (this.db.all) o = this.db.all(D.raw(a));
 		else throw Error("SQLite database instance must have an all() method for EXPLAIN");
 		let s = [];
 		if (Array.isArray(o)) for (let e of o) e && typeof e == "object" && s.push({
@@ -1775,9 +1775,9 @@ var Ne = class extends H {
 		try {
 			let t = [];
 			for (let n of e) {
-				let e = this.db.all(O.raw(`SELECT name, "unique", origin FROM pragma_index_list('${n.toLowerCase()}')`));
+				let e = this.db.all(D.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(O.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(D.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);
@@ -1962,7 +1962,7 @@ var Be = class extends H {
 	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(O`${O.raw(r)} ${O.raw(e.replace(/\$(\d+)/g, (e, n) => {
+		let i = await this.db.execute(D`${D.raw(r)} ${D.raw(e.replace(/\$(\d+)/g, (e, n) => {
 			let r = t[parseInt(n, 10) - 1];
 			return r === null ? "NULL" : typeof r == "number" ? String(r) : typeof r == "boolean" ? r ? "TRUE" : "FALSE" : r instanceof Date ? `'${r.toISOString()}'` : `'${String(r).replace(/'/g, "''")}'`;
 		}))}`), a = [];
@@ -1981,7 +1981,7 @@ var Be = class extends H {
 		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(O`
+			let t = e.map((e) => `'${e.toLowerCase()}'`).join(","), n = await this.db.execute(D`
         SELECT
           table_name,
           index_name,
@@ -1989,7 +1989,7 @@ var Be = class extends H {
           is_unique,
           is_primary
         FROM duckdb_indexes()
-        WHERE LOWER(table_name) IN (${O.raw(t)})
+        WHERE LOWER(table_name) IN (${D.raw(t)})
         GROUP BY table_name, index_name, is_unique, is_primary
         ORDER BY table_name, index_name
       `);
@@ -2148,7 +2148,7 @@ var Ge = class extends H {
 	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(O`${O.raw(r)} ${O.raw(e.replace(/\$(\d+)/g, (e, n) => {
+		let i = await this.db.execute(D`${D.raw(r)} ${D.raw(e.replace(/\$(\d+)/g, (e, n) => {
 			let r = t[parseInt(n, 10) - 1];
 			return r === null ? "NULL" : typeof r == "number" ? String(r) : typeof r == "boolean" ? r ? "TRUE" : "FALSE" : r instanceof Date ? `'${r.toISOString()}'` : `'${String(r).replace(/'/g, "''")}'`;
 		}))}`), a = [];
@@ -2309,7 +2309,7 @@ var Xe = class extends H {
 	}
 	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(O`${O.raw("EXPLAIN")} ${O.raw(e.replace(/\?/g, () => {
+		let r = await this.db.execute(D`${D.raw("EXPLAIN")} ${D.raw(e.replace(/\?/g, () => {
 			let e = t.shift();
 			return e === null ? "NULL" : typeof e == "number" ? String(e) : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : e instanceof Date ? `'${e.toISOString()}'` : `'${String(e).replace(/'/g, "''")}'`;
 		}))}`), i = [];
@@ -2372,7 +2372,7 @@ function et(e, t) {
 	}
 }
 function tt(e) {
-	return e && typeof e == "object" ? O`${O`${e}`}` : e;
+	return e && typeof e == "object" ? D`${D`${e}`}` : e;
 }
 function nt(e) {
 	if (e === "__proto__" || e === "constructor" || e === "prototype") throw Error(`Unsafe property key: ${e}`);
@@ -2385,12 +2385,12 @@ function rt(e, t) {
 	if (e.relationship !== "belongsToMany" || !e.through) throw Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
 	let { table: n, sourceKey: r, targetKey: i, securitySql: a } = e.through, o = [];
 	for (let e of r) {
-		let t = e.as || N;
+		let t = e.as || M;
 		o.push(t(e.source, e.target));
 	}
 	let s = [];
 	for (let e of i) {
-		let t = e.as || N;
+		let t = e.as || M;
 		s.push(t(e.source, e.target));
 	}
 	let c;
@@ -2403,11 +2403,11 @@ function rt(e, t) {
 		junctionJoins: [{
 			joinType: l,
 			table: n,
-			condition: F(...o)
+			condition: P(...o)
 		}, {
 			joinType: l,
 			table: n,
-			condition: F(...s)
+			condition: P(...s)
 		}],
 		junctionSecurityConditions: c
 	};
@@ -2575,7 +2575,7 @@ var Y = class {
 	}
 	buildTimeDimensionExpression(e, t, n) {
 		let r = W(e, n);
-		return t ? this.databaseAdapter.buildTimeDimension(t, r) : r instanceof S ? r : O`${r}`;
+		return t ? this.databaseAdapter.buildTimeDimension(t, r) : r instanceof S ? r : D`${r}`;
 	}
 	buildDateRangeCondition(e, t) {
 		if (!t) return null;
@@ -2586,13 +2586,13 @@ var Y = class {
 				let e = typeof r == "number" ? /* @__PURE__ */ new Date(r * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(r), t = new Date(e);
 				t.setUTCHours(23, 59, 59, 999), r = this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(t.getTime() / 1e3) : t.getTime() : t.toISOString();
 			}
-			return F(L(e, n), R(e, r));
+			return P(I(e, n), L(e, r));
 		}
 		if (typeof t == "string") {
 			let n = this.parseRelativeDateRange(t);
 			if (n) {
 				let t, r;
-				return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (t = Math.floor(n.start.getTime() / 1e3), r = Math.floor(n.end.getTime() / 1e3)) : (t = n.start.getTime(), r = n.end.getTime()) : (t = n.start.toISOString(), r = n.end.toISOString()), F(L(e, t), R(e, r));
+				return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (t = Math.floor(n.start.getTime() / 1e3), r = Math.floor(n.end.getTime() / 1e3)) : (t = n.start.getTime(), r = n.end.getTime()) : (t = n.start.toISOString(), r = n.end.toISOString()), P(I(e, t), L(e, r));
 			}
 			let r = this.normalizeDate(t);
 			if (!r) return null;
@@ -2601,7 +2601,7 @@ var Y = class {
 			let o = new Date(i);
 			o.setUTCHours(23, 59, 59, 999);
 			let s, c;
-			return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (s = Math.floor(a.getTime() / 1e3), c = Math.floor(o.getTime() / 1e3)) : (s = a.getTime(), c = o.getTime()) : (s = a.toISOString(), c = o.toISOString()), F(L(e, s), R(e, c));
+			return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (s = Math.floor(a.getTime() / 1e3), c = Math.floor(o.getTime() / 1e3)) : (s = a.getTime(), c = o.getTime()) : (s = a.toISOString(), c = o.toISOString()), P(I(e, s), L(e, c));
 		}
 		return null;
 	}
@@ -2751,18 +2751,18 @@ var Y = class {
 		if (a.length === 0 && !["set", "notSet"].includes(t)) return t === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
 		let o = a[0];
 		switch (t) {
-			case "equals": return a.length > 1 ? r?.type === "time" ? ne(e, a.map((e) => this.dateTimeBuilder.normalizeDate(e) || e)) : ne(e, a) : a.length === 1 ? N(e, r?.type === "time" && this.dateTimeBuilder.normalizeDate(o) || o) : this.databaseAdapter.buildBooleanLiteral(!1);
-			case "notEquals": return a.length > 1 ? re(e, a) : a.length === 1 ? P(e, o) : null;
+			case "equals": return a.length > 1 ? r?.type === "time" ? re(e, a.map((e) => this.dateTimeBuilder.normalizeDate(e) || e)) : re(e, a) : a.length === 1 ? M(e, r?.type === "time" && this.dateTimeBuilder.normalizeDate(o) || o) : this.databaseAdapter.buildBooleanLiteral(!1);
+			case "notEquals": return a.length > 1 ? ie(e, a) : a.length === 1 ? N(e, o) : null;
 			case "contains": return this.databaseAdapter.buildStringCondition(e, "contains", o);
 			case "notContains": return this.databaseAdapter.buildStringCondition(e, "notContains", o);
 			case "startsWith": return this.databaseAdapter.buildStringCondition(e, "startsWith", o);
 			case "endsWith": return this.databaseAdapter.buildStringCondition(e, "endsWith", o);
-			case "gt": return ee(e, o);
-			case "gte": return L(e, o);
-			case "lt": return te(e, o);
-			case "lte": return R(e, o);
-			case "set": return ae(e);
-			case "notSet": return ie(e);
+			case "gt": return te(e, o);
+			case "gte": return I(e, o);
+			case "lt": return ne(e, o);
+			case "lte": return L(e, o);
+			case "set": return oe(e);
+			case "notSet": return ae(e);
 			case "inDateRange":
 				if (a.length >= 2) {
 					let t = this.dateTimeBuilder.normalizeDate(a[0]), r = this.dateTimeBuilder.normalizeDate(a[1]);
@@ -2772,43 +2772,43 @@ var Y = class {
 							let e = typeof r == "number" ? /* @__PURE__ */ new Date(r * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(r), t = new Date(e);
 							t.setUTCHours(23, 59, 59, 999), r = this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(t.getTime() / 1e3) : t.getTime() : t.toISOString();
 						}
-						return F(L(e, t), R(e, r));
+						return P(I(e, t), L(e, r));
 					}
 				}
 				return null;
 			case "beforeDate": {
 				let t = this.dateTimeBuilder.normalizeDate(o);
-				return t ? te(e, t) : null;
+				return t ? ne(e, t) : null;
 			}
 			case "afterDate": {
 				let t = this.dateTimeBuilder.normalizeDate(o);
-				return t ? ee(e, t) : null;
+				return t ? te(e, t) : null;
 			}
-			case "between": return a.length >= 2 ? F(L(e, a[0]), R(e, a[1])) : null;
-			case "notBetween": return a.length >= 2 ? I(te(e, a[0]), ee(e, a[1])) : null;
-			case "in": return a.length > 0 ? ne(e, a) : null;
-			case "notIn": return a.length > 0 ? re(e, a) : null;
+			case "between": return a.length >= 2 ? P(I(e, a[0]), L(e, a[1])) : null;
+			case "notBetween": return a.length >= 2 ? F(ne(e, a[0]), te(e, a[1])) : null;
+			case "in": return a.length > 0 ? re(e, a) : null;
+			case "notIn": return a.length > 0 ? ie(e, a) : null;
 			case "like": return this.databaseAdapter.buildStringCondition(e, "like", o);
 			case "notLike": return this.databaseAdapter.buildStringCondition(e, "notLike", o);
 			case "ilike": return this.databaseAdapter.buildStringCondition(e, "ilike", o);
 			case "regex": return this.databaseAdapter.buildStringCondition(e, "regex", o);
 			case "notRegex": return this.databaseAdapter.buildStringCondition(e, "notRegex", o);
-			case "isEmpty": return I(ie(e), N(e, ""));
-			case "isNotEmpty": return F(ae(e), P(e, ""));
-			case "arrayContains": return this.databaseAdapter.getEngineType() === "postgres" ? oe(e, a) : null;
-			case "arrayOverlaps": return this.databaseAdapter.getEngineType() === "postgres" ? ce(e, a) : null;
-			case "arrayContained": return this.databaseAdapter.getEngineType() === "postgres" ? se(e, a) : null;
+			case "isEmpty": return F(ae(e), M(e, ""));
+			case "isNotEmpty": return P(oe(e), N(e, ""));
+			case "arrayContains": return this.databaseAdapter.getEngineType() === "postgres" ? se(e, a) : null;
+			case "arrayOverlaps": return this.databaseAdapter.getEngineType() === "postgres" ? le(e, a) : null;
+			case "arrayContained": return this.databaseAdapter.getEngineType() === "postgres" ? ce(e, a) : null;
 			default: return null;
 		}
 	}
 	buildLogicalFilter(e, t, n) {
 		if ("and" in e && e.and) {
 			let r = e.and.map((e) => this.buildSingleFilter(e, t, n)).filter((e) => e !== null);
-			return r.length > 0 ? r.length === 1 ? r[0] : F(...r) : null;
+			return r.length > 0 ? r.length === 1 ? r[0] : P(...r) : null;
 		}
 		if ("or" in e && e.or) {
 			let r = e.or.map((e) => this.buildSingleFilter(e, t, n)).filter((e) => e !== null);
-			return r.length > 0 ? r.length === 1 ? r[0] : I(...r) : null;
+			return r.length > 0 ? r.length === 1 ? r[0] : F(...r) : null;
 		}
 		return null;
 	}
@@ -2956,7 +2956,7 @@ function pt(e, t) {
 		if (!r.get(c)) throw Error(`Cannot substitute {${t}}: cube '${c}' not found`);
 		let l = `${c}.${s}`, u = i.get(l);
 		if (!u) throw Error(`Cannot substitute {${t}}: measure '${l}' not resolved yet. Ensure measures are resolved in dependency order.`);
-		let d = O`${u()}`;
+		let d = D`${u()}`;
 		o.set(t, d);
 	}
 	let s = [], c = [], l = 0;
@@ -2968,10 +2968,10 @@ function pt(e, t) {
 			i && c.push(i), l = r + n.length;
 		}
 	}
-	if (s.push(e.substring(l)), c.length === 0) return O.raw(e);
+	if (s.push(e.substring(l)), c.length === 0) return D.raw(e);
 	let u = [];
 	for (let e = 0; e < s.length; e++) s[e] && u.push(new x(s[e])), e < c.length && u.push(c[e]);
-	return O.join(u, O.raw(""));
+	return D.join(u, D.raw(""));
 }
 function mt(e) {
 	if (e.length > 1e3) return [];
@@ -3089,26 +3089,26 @@ var Q = class e {
 			if (o && o.measures[i]) {
 				let t = o.measures[i];
 				if (n.measures.includes(e)) {
-					let r = O`${O.identifier(n.cteAlias)}.${O.identifier(i)}`, o;
+					let r = D`${D.identifier(n.cteAlias)}.${D.identifier(i)}`, o;
 					switch (t.type) {
 						case "count":
 						case "countDistinct":
 						case "sum":
-							o = z(r);
+							o = R(r);
 							break;
 						case "avg":
 							o = this.databaseAdapter.buildAvg(r);
 							break;
 						case "min":
-							o = pe(r);
+							o = B(r);
 							break;
 						case "max":
-							o = B(r);
+							o = z(r);
 							break;
 						case "number":
-							o = z(r);
+							o = R(r);
 							break;
-						default: o = z(r);
+						default: o = R(r);
 					}
 					a.set(e, () => o);
 				}
@@ -3126,16 +3126,16 @@ var Q = 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);
 			} else {
-				let e = O`${O.identifier(a.cteAlias)}.${O.identifier(t)}`;
+				let e = D`${D.identifier(a.cteAlias)}.${D.identifier(t)}`;
 				switch (n.type) {
 					case "count":
 					case "countDistinct":
-					case "sum": return z(e);
+					case "sum": return R(e);
 					case "avg": return this.databaseAdapter.buildAvg(e);
-					case "min": return pe(e);
-					case "max": return B(e);
-					case "number": return z(e);
-					default: return z(e);
+					case "min": return B(e);
+					case "max": return z(e);
+					case "number": return R(e);
+					default: return R(e);
 				}
 			}
 		}
@@ -3150,10 +3150,10 @@ var Q = class e {
 		if (t.filters && t.filters.length > 0) {
 			let e = t.filters.map((e) => {
 				let t = e(n);
-				return t ? O`(${t})` : void 0;
+				return t ? D`(${t})` : void 0;
 			}).filter(Boolean);
 			if (e.length > 0) {
-				let t = e.length === 1 ? e[0] : F(...e);
+				let t = e.length === 1 ? e[0] : P(...e);
 				i = this.databaseAdapter.buildCaseWhen([{
 					when: t,
 					then: i
@@ -3161,22 +3161,22 @@ var Q = class e {
 			}
 		}
 		switch (t.type) {
-			case "count": return de(i);
-			case "countDistinct": return fe(i);
-			case "sum": return z(i);
+			case "count": return fe(i);
+			case "countDistinct": return pe(i);
+			case "sum": return R(i);
 			case "avg": return this.databaseAdapter.buildAvg(i);
-			case "min": return pe(i);
-			case "max": return B(i);
+			case "min": return B(i);
+			case "max": return z(i);
 			case "number": return i;
 			case "stddev":
 			case "stddevSamp": {
 				let e = t.type === "stddevSamp" || t.statisticalConfig?.useSample, n = this.databaseAdapter.buildStddev(i, e);
-				return n === null ? (console.warn(`[drizzle-cube] ${t.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), O`MAX(NULL)`) : n;
+				return n === null ? (console.warn(`[drizzle-cube] ${t.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), D`MAX(NULL)`) : n;
 			}
 			case "variance":
 			case "varianceSamp": {
 				let e = t.type === "varianceSamp" || t.statisticalConfig?.useSample, n = this.databaseAdapter.buildVariance(i, e);
-				return n === null ? (console.warn(`[drizzle-cube] ${t.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), O`MAX(NULL)`) : n;
+				return n === null ? (console.warn(`[drizzle-cube] ${t.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), D`MAX(NULL)`) : n;
 			}
 			case "percentile":
 			case "median":
@@ -3196,7 +3196,7 @@ var Q = class e {
 					default: e = t.statisticalConfig?.percentile ?? 50;
 				}
 				let n = this.databaseAdapter.buildPercentile(i, e);
-				return n === null ? (console.warn(`[drizzle-cube] ${t.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), O`MAX(NULL)`) : n;
+				return n === null ? (console.warn(`[drizzle-cube] ${t.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), D`MAX(NULL)`) : n;
 			}
 			case "lag":
 			case "lead":
@@ -3242,9 +3242,9 @@ var Q = class e {
 					nTile: e.nTile,
 					frame: e.frame
 				});
-				return s === null ? (console.warn(`[drizzle-cube] ${t.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), O`NULL`) : s;
+				return s === null ? (console.warn(`[drizzle-cube] ${t.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), D`NULL`) : s;
 			}
-			default: return de(i);
+			default: return fe(i);
 		}
 	}
 	static WINDOW_FUNCTION_TYPES = [
@@ -3387,7 +3387,7 @@ var Q = class e {
 					let t = e.joinKeys.find((e) => e.targetColumn === o);
 					if (t && t.sourceColumnObj) i.push(t.sourceColumnObj);
 					else {
-						let t = O`${O.identifier(e.cteAlias)}.${O.identifier(o)}`;
+						let t = D`${D.identifier(e.cteAlias)}.${D.identifier(o)}`;
 						i.push(t);
 					}
 				} else {
@@ -3406,7 +3406,7 @@ var Q = class e {
 						let r = this.dateTimeBuilder.buildTimeDimensionExpression(t.sourceColumnObj, e.granularity, n);
 						i.push(r);
 					} else {
-						let e = O`${O.identifier(a.cteAlias)}.${O.identifier(o)}`;
+						let e = D`${D.identifier(a.cteAlias)}.${D.identifier(o)}`;
 						i.push(e);
 					}
 				} else {
@@ -3434,24 +3434,24 @@ var Q = class e {
 			let [t, a] = e.split("."), o = i.get(t);
 			if (o && o.dimensions && o.dimensions[a]) {
 				let t = o.dimensions[a];
-				r[e] = O`${W(t.sql, n)}`.as(e);
+				r[e] = D`${W(t.sql, n)}`.as(e);
 			}
 		}
 		if (t.measures) {
 			let e = this.buildResolvedMeasures(t.measures, i, n);
 			for (let n of t.measures) {
 				let t = e.get(n);
-				t && typeof t == "function" && (r[n] = O`${t()}`.as(n));
+				t && typeof t == "function" && (r[n] = D`${t()}`.as(n));
 			}
 		}
 		if (t.timeDimensions) for (let e of t.timeDimensions) {
 			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] = O`${i}`.as(e.dimension);
+				r[e.dimension] = D`${i}`.as(e.dimension);
 			}
 		}
-		return Object.keys(r).length === 0 && (r.count = de()), r;
+		return Object.keys(r).length === 0 && (r.count = fe()), r;
 	}
 	buildCalculatedMeasure(e, t, n, r, i) {
 		return this.measureBuilder.buildCalculatedMeasure(e, t, n, r, i);
@@ -3513,11 +3513,11 @@ var Q = class e {
 			let a = e;
 			if (a.and) {
 				let e = a.and.map((e) => this.processFilter(e, t, n, r, i)).filter((e) => e !== null);
-				return e.length > 0 ? F(...e) : null;
+				return e.length > 0 ? P(...e) : null;
 			}
 			if (a.or) {
 				let e = a.or.map((e) => this.processFilter(e, t, n, r, i)).filter((e) => e !== null);
-				return e.length > 0 ? I(...e) : null;
+				return e.length > 0 ? F(...e) : null;
 			}
 		}
 		let a = e, [o, s] = a.member.split("."), c = t.get(o);
@@ -3557,12 +3557,12 @@ var Q = 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" ? ue(O.identifier(t)) : le(O.identifier(t));
+			let e = i === "desc" ? de(D.identifier(t)) : ue(D.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(le(O.identifier(e.dimension)));
+			for (let e of r) t.has(e.dimension) || n.push(ue(D.identifier(e.dimension)));
 		}
 		return n;
 	}
@@ -3804,10 +3804,10 @@ var Q = class e {
 	buildJoinCondition(e, t, n) {
 		let r = [];
 		for (let i of e.on) {
-			let e = t ? O`${O.identifier(t)}.${O.identifier(i.source.name)}` : tt(i.source), a = n ? O`${O.identifier(n)}.${O.identifier(i.target.name)}` : tt(i.target), o = i.as || N;
+			let e = t ? D`${D.identifier(t)}.${D.identifier(i.source.name)}` : tt(i.source), a = n ? D`${D.identifier(n)}.${D.identifier(i.target.name)}` : tt(i.target), o = i.as || M;
 			r.push(o(e, a));
 		}
-		return F(...r);
+		return P(...r);
 	}
 	getReachableCubes(e) {
 		let t = new Set([e]), n = [e];
@@ -4425,19 +4425,19 @@ var Q = class e {
 			}
 		} else for (let t of e.joinKeys) if (t.targetColumnObj) {
 			c[t.targetColumn] = t.targetColumnObj;
-			for (let [e, n] of Object.entries(a.dimensions || {})) n.sql === t.targetColumnObj && e !== t.targetColumn && (c[e] = O`${t.targetColumnObj}`.as(e));
+			for (let [e, n] of Object.entries(a.dimensions || {})) n.sql === t.targetColumnObj && e !== t.targetColumn && (c[e] = D`${t.targetColumnObj}`.as(e));
 		}
 		if (e.downstreamJoinKeys) for (let t of e.downstreamJoinKeys) for (let e of t.joinKeys) e.sourceColumnObj && (c[e.sourceColumn] = e.sourceColumnObj);
 		let l = a.name, u = new Map([[l, a]]), d = this.queryBuilder.buildResolvedMeasures(e.measures, u, n);
 		for (let t of e.measures) {
 			let [, e] = t.split("."), n = d.get(t);
-			n && (c[e] = O`${n()}`.as(e));
+			n && (c[e] = D`${n()}`.as(e));
 		}
 		if (t.dimensions) for (let e of t.dimensions) {
 			let [t, r] = e.split(".");
 			if (t === l && a.dimensions && a.dimensions[r]) {
 				let e = a.dimensions[r];
-				c[r] = O`${this.queryBuilder.buildMeasureExpression({
+				c[r] = D`${this.queryBuilder.buildMeasureExpression({
 					sql: e.sql,
 					type: "number"
 				}, n)}`.as(r);
@@ -4447,7 +4447,7 @@ var Q = class e {
 			let [t, r] = e.dimension.split(".");
 			if (t === l && a.dimensions && a.dimensions[r]) {
 				let t = a.dimensions[r];
-				c[r] = O`${this.queryBuilder.buildTimeDimensionExpression(t.sql, e.granularity, n)}`.as(r);
+				c[r] = D`${this.queryBuilder.buildTimeDimensionExpression(t.sql, e.granularity, n)}`.as(r);
 			}
 		}
 		if (Object.keys(c).length === 0) return null;
@@ -4455,8 +4455,8 @@ var Q = class e {
 		if (s && e.intermediateJoins) {
 			let t = [...e.intermediateJoins].reverse();
 			for (let e of t) {
-				let t = e.cube.sql(n), r = [N(e.cteJoinColumn, e.joinDef.on[0]?.target)];
-				e.securityFilter && r.push(e.securityFilter), f = f.leftJoin(t.from, F(...r));
+				let t = e.cube.sql(n), r = [M(e.cteJoinColumn, e.joinDef.on[0]?.target)];
+				e.securityFilter && r.push(e.securityFilter), f = f.leftJoin(t.from, P(...r));
 			}
 		}
 		let p = r ? {
@@ -4494,7 +4494,7 @@ var Q = class e {
 		}
 		let g = [];
 		if (o.where && g.push(o.where), g.push(...m, ...h), g.length > 0) {
-			let e = g.length === 1 ? g[0] : F(...g);
+			let e = g.length === 1 ? g[0] : P(...g);
 			f = f.where(e);
 		}
 		let _ = [], v = /* @__PURE__ */ new Set(), y = (e) => {
@@ -4527,20 +4527,20 @@ var Q = class e {
 		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 = O`${O.identifier(t)}.${O.identifier(e.primaryJoinColumn.name)}`;
-			i.push(N(a, o));
+			let e = r.intermediateJoins[0], a = this.resolveCTEJoinSourceColumn(r.joinKeys[0], r, n), o = D`${D.identifier(t)}.${D.identifier(e.primaryJoinColumn.name)}`;
+			i.push(M(a, o));
 		} else for (let e of r.joinKeys) {
-			let a = this.resolveCTEJoinSourceColumn(e, r, n), o = O`${O.identifier(t)}.${O.identifier(e.targetColumn)}`;
-			i.push(N(a, o));
+			let a = this.resolveCTEJoinSourceColumn(e, r, n), o = D`${D.identifier(t)}.${D.identifier(e.targetColumn)}`;
+			i.push(M(a, o));
 		}
-		return i.length === 1 ? i[0] : F(...i);
+		return i.length === 1 ? i[0] : P(...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 || O.identifier(e.sourceColumn);
+		let r = e.sourceColumnObj || D.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 O`${O.identifier(r.cteAlias)}.${O.identifier(t)}`;
+			for (let [t, n] of Object.entries(r.cube.dimensions || {})) if (typeof n.sql != "function" && n.sql === e.sourceColumnObj) return D`${D.identifier(r.cteAlias)}.${D.identifier(t)}`;
 		}
 		return r;
 	}
@@ -4552,24 +4552,139 @@ var Q = class e {
 			i.push(...o);
 		}
 		if (i.length === 0) return null;
-		let a = i.length === 1 ? i[0] : F(...i), o = e.joinConditions;
+		let a = i.length === 1 ? i[0] : P(...i), o = e.joinConditions;
 		if (o.length === 1) {
 			let { source: e, target: n } = o[0];
-			return O`${n} IN ${t.db.select({ pk: e }).from(r.from).where(a)}`;
+			return D`${n} IN ${t.db.select({ pk: e }).from(r.from).where(a)}`;
 		} else {
-			let e = F(...o.map((e) => N(e.source, e.target)), a);
-			return O`EXISTS ${t.db.select({ one: O`1` }).from(r.from).where(e)}`;
+			let e = P(...o.map((e) => M(e.source, e.target)), a);
+			return D`EXISTS ${t.db.select({ one: D`1` }).from(r.from).where(e)}`;
 		}
 	}
 };
 //#endregion
+//#region src/shared/date-utils.ts
+function St(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);
+		e.setUTCHours(0, 0, 0, 0);
+		let n = new Date(t);
+		return n.setUTCHours(23, 59, 59, 999), {
+			start: e,
+			end: n
+		};
+	}
+	if (n === "yesterday") {
+		let e = new Date(t);
+		e.setUTCDate(a - 1), e.setUTCHours(0, 0, 0, 0);
+		let n = new Date(t);
+		return n.setUTCDate(a - 1), n.setUTCHours(23, 59, 59, 999), {
+			start: e,
+			end: n
+		};
+	}
+	if (n === "this week") {
+		let e = o === 0 ? -6 : 1 - o, n = new Date(t);
+		n.setUTCDate(a + e), n.setUTCHours(0, 0, 0, 0);
+		let r = new Date(n);
+		return r.setUTCDate(n.getUTCDate() + 6), r.setUTCHours(23, 59, 59, 999), {
+			start: n,
+			end: r
+		};
+	}
+	if (n === "this month") return {
+		start: new Date(Date.UTC(r, i, 1, 0, 0, 0, 0)),
+		end: new Date(Date.UTC(r, i + 1, 0, 23, 59, 59, 999))
+	};
+	if (n === "this quarter") {
+		let e = Math.floor(i / 3);
+		return {
+			start: new Date(Date.UTC(r, e * 3, 1, 0, 0, 0, 0)),
+			end: new Date(Date.UTC(r, e * 3 + 3, 0, 23, 59, 59, 999))
+		};
+	}
+	if (n === "this year") return {
+		start: new Date(Date.UTC(r, 0, 1, 0, 0, 0, 0)),
+		end: new Date(Date.UTC(r, 11, 31, 23, 59, 59, 999))
+	};
+	let s = n.match(/^last\s+(\d+)\s+days?$/);
+	if (s) {
+		let e = parseInt(s[1], 10), n = new Date(t);
+		n.setUTCDate(a - e + 1), n.setUTCHours(0, 0, 0, 0);
+		let r = new Date(t);
+		return r.setUTCHours(23, 59, 59, 999), {
+			start: n,
+			end: r
+		};
+	}
+	let c = n.match(/^last\s+(\d+)\s+weeks?$/);
+	if (c) {
+		let e = parseInt(c[1], 10) * 7, n = new Date(t);
+		n.setUTCDate(a - e + 1), n.setUTCHours(0, 0, 0, 0);
+		let r = new Date(t);
+		return r.setUTCHours(23, 59, 59, 999), {
+			start: n,
+			end: r
+		};
+	}
+	if (n === "last week") {
+		let e = o === 0 ? -13 : -6 - o, n = new Date(t);
+		n.setUTCDate(a + e), n.setUTCHours(0, 0, 0, 0);
+		let r = new Date(n);
+		return r.setUTCDate(n.getUTCDate() + 6), r.setUTCHours(23, 59, 59, 999), {
+			start: n,
+			end: r
+		};
+	}
+	if (n === "last month") return {
+		start: new Date(Date.UTC(r, i - 1, 1, 0, 0, 0, 0)),
+		end: new Date(Date.UTC(r, i, 0, 23, 59, 59, 999))
+	};
+	if (n === "last quarter") {
+		let e = Math.floor(i / 3), t = e === 0 ? 3 : e - 1, n = e === 0 ? r - 1 : r;
+		return {
+			start: new Date(Date.UTC(n, t * 3, 1, 0, 0, 0, 0)),
+			end: new Date(Date.UTC(n, t * 3 + 3, 0, 23, 59, 59, 999))
+		};
+	}
+	if (n === "last year") return {
+		start: new Date(Date.UTC(r - 1, 0, 1, 0, 0, 0, 0)),
+		end: new Date(Date.UTC(r - 1, 11, 31, 23, 59, 59, 999))
+	};
+	if (n === "last 12 months") {
+		let e = new Date(Date.UTC(r, i - 11, 1, 0, 0, 0, 0)), n = new Date(t);
+		return n.setUTCHours(23, 59, 59, 999), {
+			start: e,
+			end: n
+		};
+	}
+	let l = n.match(/^last\s+(\d+)\s+months?$/);
+	if (l) {
+		let e = parseInt(l[1], 10), n = new Date(Date.UTC(r, i - e + 1, 1, 0, 0, 0, 0)), a = new Date(t);
+		return a.setUTCHours(23, 59, 59, 999), {
+			start: n,
+			end: a
+		};
+	}
+	let u = n.match(/^last\s+(\d+)\s+years?$/);
+	if (u) {
+		let e = parseInt(u[1], 10), n = new Date(Date.UTC(r - e, 0, 1, 0, 0, 0, 0)), i = new Date(t);
+		return i.setUTCHours(23, 59, 59, 999), {
+			start: n,
+			end: i
+		};
+	}
+	return null;
+}
+//#endregion
 //#region src/server/gap-filler.ts
-function St(e, t, n) {
-	let r = [], i = Ct(new Date(e), n), a = Ct(new Date(t), n);
-	for (; i <= a && r.length < 1e4;) r.push(new Date(i)), i = wt(i, n);
+function Ct(e, t, n) {
+	let r = [], i = wt(new Date(e), n), a = wt(new Date(t), n);
+	for (; i <= a && r.length < 1e4;) r.push(new Date(i)), i = Tt(i, n);
 	return r;
 }
-function Ct(e, t) {
+function wt(e, t) {
 	let n = new Date(e);
 	switch (t) {
 		case "second":
@@ -4603,7 +4718,7 @@ function Ct(e, t) {
 	}
 	return n;
 }
-function wt(e, t) {
+function Tt(e, t) {
 	let n = new Date(e);
 	switch (t) {
 		case "second":
@@ -4633,7 +4748,7 @@ function wt(e, t) {
 	}
 	return n;
 }
-function Tt(e) {
+function Et(e) {
 	if (e instanceof Date) return e.toISOString();
 	if (typeof e == "string") {
 		let t = new Date(e);
@@ -4641,15 +4756,15 @@ function Tt(e) {
 	}
 	return String(e);
 }
-function Et(e, t) {
+function Dt(e, t) {
 	return t.length === 0 ? "__all__" : t.map((t) => String(e[t] ?? "")).join("|||");
 }
-function Dt(e, t) {
-	let { timeDimensionKey: n, granularity: r, dateRange: i, fillValue: a, measures: o, dimensions: s } = t, c = St(i[0], i[1], r);
+function Ot(e, t) {
+	let { timeDimensionKey: n, granularity: r, dateRange: i, fillValue: a, measures: o, dimensions: s } = t, c = Ct(i[0], i[1], r);
 	if (c.length === 0) return e;
 	let l = /* @__PURE__ */ new Map();
 	for (let t of e) {
-		let e = Et(t, s), r = Tt(t[n]);
+		let e = Dt(t, s), r = Et(t[n]);
 		l.has(e) || l.set(e, /* @__PURE__ */ new Map()), l.get(e).set(r, t);
 	}
 	l.size === 0 && s.length === 0 && l.set("__all__", /* @__PURE__ */ new Map());
@@ -4669,42 +4784,74 @@ function Dt(e, t) {
 	}
 	return u;
 }
-function Ot(e) {
+function kt(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 = new Date(e);
-	return isNaN(t.getTime()) ? null : [t, t];
+	let t = St(e);
+	if (t) return [t.start, t.end];
+	let n = new Date(e);
+	return isNaN(n.getTime()) ? null : [n, n];
 }
-function kt(e, t, n) {
+function At(e, t, n) {
 	if (!t.timeDimensions || t.timeDimensions.length === 0) return e;
 	let r = t.timeDimensions.filter((e) => {
-		let t = e.fillMissingDates !== !1, n = e.granularity && e.dateRange;
-		return t && n;
+		let n = e.fillMissingDates !== !1, r = !!e.granularity, i = e.dateRange || jt(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 t = Ot(e.dateRange);
-		if (!t) continue;
-		let r = {
+		let r = kt(e.dateRange) || Mt(e.dimension, t.filters);
+		if (!r) continue;
+		let a = {
 			timeDimensionKey: e.dimension,
 			granularity: e.granularity,
-			dateRange: t,
+			dateRange: r,
 			fillValue: i,
 			measures: n,
 			dimensions: o
 		};
-		s = Dt(s, r);
+		s = Ot(s, a);
 	}
 	return s;
 }
+function jt(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 = jt(e, n.and);
+			if (t) return t;
+		}
+		if ("or" in n && n.or) {
+			let t = jt(e, n.or);
+			if (t) return t;
+		}
+	}
+	return null;
+}
+function Mt(e, t) {
+	let n = jt(e, t);
+	if (!n) return null;
+	if (n.dateRange) {
+		let e = kt(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 = St(r[0]);
+		return e ? [e.start, e.end] : kt(r);
+	}
+	return r.length >= 2 ? kt(r) : null;
+}
 //#endregion
 //#region src/server/builders/comparison-query-builder.ts
-var At = class {
+var Nt = class {
 	dateTimeBuilder;
 	constructor(e) {
 		this.dateTimeBuilder = new Y(e);
@@ -4835,7 +4982,7 @@ var At = class {
 			return typeof i == "string" && typeof a == "string" ? new Date(i).getTime() - new Date(a).getTime() : 0;
 		});
 	}
-}, jt = class {
+}, Pt = class {
 	filterBuilder;
 	dateTimeBuilder;
 	constructor(e) {
@@ -5028,7 +5175,7 @@ var At = class {
 					a && i.push(a);
 				}
 			}
-			return i.length === 0 ? null : i.length === 1 ? i[0] : o ? F(...i) : O`(${O.join(i, O` OR `)})`;
+			return i.length === 0 ? null : i.length === 1 ? i[0] : o ? P(...i) : D`(${D.join(i, D` OR `)})`;
 		}
 		let o = e, [s, c] = o.member.split("."), l = o.dateRange !== void 0;
 		if (o.operator !== "set" && o.operator !== "notSet" && !l && (!o.values || o.values.length === 0 || o.values[0] === void 0 || o.values[0] === "")) return null;
@@ -5050,11 +5197,11 @@ var At = 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: O`${e.bindingKeyExpr}`.as("binding_key"),
-			step_time: O`MIN(${e.timeExpr})`.as("step_time")
+			binding_key: D`${e.bindingKeyExpr}`.as("binding_key"),
+			step_time: D`MIN(${e.timeExpr})`.as("step_time")
 		}).from(r.from);
 		if (a = this.addCrossJoinsToQuery(a, e, t, i), i.length > 0) {
-			let e = i.length === 1 ? i[0] : F(...i);
+			let e = i.length === 1 ? i[0] : P(...i);
 			a = a.where(e);
 		}
 		return a = a.groupBy(e.bindingKeyExpr), t.db.$with(n).as(a);
@@ -5062,18 +5209,18 @@ var At = class {
 	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 = O`${O.identifier(i)}.step_time`, c = O`${e.timeExpr} > ${s}`;
+		let s = D`${D.identifier(i)}.step_time`, c = D`${e.timeExpr} > ${s}`;
 		if (e.timeToConvert) {
 			let t = this.databaseAdapter.buildDateAddInterval(s, e.timeToConvert);
-			c = O`${c} AND ${e.timeExpr} <= ${t}`;
+			c = D`${c} AND ${e.timeExpr} <= ${t}`;
 		}
 		o.push(c);
 		let l = t.db.select({
-			binding_key: O`${e.bindingKeyExpr}`.as("binding_key"),
-			step_time: O`MIN(${e.timeExpr})`.as("step_time")
-		}).from(a.from).innerJoin(n, O`${e.bindingKeyExpr} = ${O.identifier(i)}.binding_key`);
+			binding_key: D`${e.bindingKeyExpr}`.as("binding_key"),
+			step_time: D`MIN(${e.timeExpr})`.as("step_time")
+		}).from(a.from).innerJoin(n, D`${e.bindingKeyExpr} = ${D.identifier(i)}.binding_key`);
 		if (l = this.addCrossJoinsToQuery(l, e, t, o), o.length > 0) {
-			let e = o.length === 1 ? o[0] : F(...o);
+			let e = o.length === 1 ? o[0] : P(...o);
 			l = l.where(e);
 		}
 		return l = l.groupBy(e.bindingKeyExpr), t.db.$with(r).as(l);
@@ -5082,41 +5229,41 @@ var At = class {
 		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(N(e.source, e.target));
-			let s = o.length === 1 ? o[0] : F(...o), c = i.cube.sql(n);
+			for (let e of a.on) e.as ? o.push(e.as(e.source, e.target)) : o.push(M(e.source, e.target));
+			let s = o.length === 1 ? o[0] : P(...o), c = i.cube.sql(n);
 			e = e.leftJoin(c.from, s), c.where && r.push(c.where);
 		}
 		return e;
 	}
 	buildFunnelResultsCTE(e, t, n, r) {
 		let i = {
-			binding_key: O`s0.binding_key`,
-			step_0_time: O`s0.step_time`
+			binding_key: D`s0.binding_key`,
+			step_0_time: D`s0.step_time`
 		};
-		for (let e = 1; e < t.length; e++) i[`step_${e}_time`] = O`s${O.raw(String(e))}.step_time`;
-		let a = O`${O.identifier("step_0")} s0`;
-		for (let e = 1; e < t.length; e++) a = O`${a}
-      LEFT JOIN ${O.identifier(`step_${e}`)} s${O.raw(String(e))} ON s0.binding_key = s${O.raw(String(e))}.binding_key`;
-		let o = Object.entries(i).map(([e, t]) => O`${t} AS ${O.identifier(e)}`), s = O`SELECT ${O.join(o, O`, `)} FROM ${a}`;
+		for (let e = 1; e < t.length; e++) i[`step_${e}_time`] = D`s${D.raw(String(e))}.step_time`;
+		let a = D`${D.identifier("step_0")} s0`;
+		for (let e = 1; e < t.length; e++) a = D`${a}
+      LEFT JOIN ${D.identifier(`step_${e}`)} s${D.raw(String(e))} ON s0.binding_key = s${D.raw(String(e))}.binding_key`;
+		let o = Object.entries(i).map(([e, t]) => D`${t} AS ${D.identifier(e)}`), s = D`SELECT ${D.join(o, D`, `)} FROM ${a}`;
 		return r.db.$with("funnel_joined").as(s);
 	}
 	buildAggregationCTE(e, t, n, r, i) {
 		let a = {};
-		a.step_0_count = O`COUNT(*)`.as("step_0_count");
-		for (let e = 1; e < n.length; e++) a[`step_${e}_count`] = O`COUNT(${O.identifier(`step_${e}_time`)})`.as(`step_${e}_count`);
+		a.step_0_count = D`COUNT(*)`.as("step_0_count");
+		for (let e = 1; e < n.length; e++) a[`step_${e}_count`] = D`COUNT(${D.identifier(`step_${e}_time`)})`.as(`step_${e}_count`);
 		if (r.includeTimeMetrics) for (let e = 1; e < n.length; e++) {
-			let t = O.identifier(`step_${e}_time`), n = O.identifier(`step_${e - 1}_time`), r = this.databaseAdapter.buildTimeDifferenceSeconds(O`${t}`, O`${n}`), i = O`${t} IS NOT NULL`;
+			let t = D.identifier(`step_${e}_time`), n = D.identifier(`step_${e - 1}_time`), r = this.databaseAdapter.buildTimeDifferenceSeconds(D`${t}`, D`${n}`), i = D`${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`] = O`(SELECT ${n} FROM ${O.identifier("funnel_joined")} WHERE ${t} IS NOT NULL)`.as(`step_${e}_median_seconds`));
+				n && (a[`step_${e}_median_seconds`] = D`(SELECT ${n} FROM ${D.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`] = O`(SELECT ${i} FROM ${O.identifier("funnel_joined")} WHERE ${t} IS NOT NULL)`.as(`step_${e}_p90_seconds`));
+				i && (a[`step_${e}_p90_seconds`] = D`(SELECT ${i} FROM ${D.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);
 	}
-}, Mt = class {
+}, Ft = class {
 	filterBuilder;
 	dateTimeBuilder;
 	databaseAdapter;
@@ -5283,7 +5430,7 @@ var At = class {
 				let r = this.buildFilterCondition(e, t, n);
 				r && i.push(r);
 			}
-			return i.length === 0 ? null : i.length === 1 ? i[0] : "and" in e ? F(...i) : O`(${O.join(i, O` OR `)})`;
+			return i.length === 0 ? null : i.length === 1 ? i[0] : "and" in e ? P(...i) : D`(${D.join(i, D` OR `)})`;
 		}
 		if ("type" in e && "filters" in e) {
 			let r = e, i = [];
@@ -5291,7 +5438,7 @@ var At = class {
 				let r = this.buildFilterCondition(e, t, n);
 				r && i.push(r);
 			}
-			return i.length === 0 ? null : i.length === 1 ? i[0] : r.type === "and" ? F(...i) : O`(${O.join(i, O` OR `)})`;
+			return i.length === 0 ? null : i.length === 1 ? i[0] : r.type === "and" ? P(...i) : D`(${D.join(i, D` OR `)})`;
 		}
 		let r = e, [, i] = r.member.split("."), a = t.dimensions?.[i];
 		if (!a) return null;
@@ -5302,13 +5449,13 @@ var At = class {
 		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: O`${i}`.as("binding_key"),
-			start_time: O`MIN(${a})`.as("start_time"),
-			event_type: O`${o}`.as("event_type"),
-			event_path: O`${o}`.as("event_path")
+			binding_key: D`${i}`.as("binding_key"),
+			start_time: D`MIN(${a})`.as("start_time"),
+			event_type: D`${o}`.as("event_type"),
+			event_path: D`${o}`.as("event_path")
 		}).from(r.from);
 		if (c.length > 0) {
-			let e = c.length === 1 ? c[0] : F(...c);
+			let e = c.length === 1 ? c[0] : P(...c);
 			l = l.where(e);
 		}
 		return l = l.groupBy(i, o), e.entityLimit && (l = l.limit(e.entityLimit)), n.db.$with("starting_entities").as(l);
@@ -5317,18 +5464,18 @@ var At = class {
 		let { cubeBase: r, bindingKeyExpr: i, timeExpr: a, eventExpr: o } = t, s = [], c = e.outputMode === "sunburst";
 		for (let t = 1; t <= e.stepsBefore; t++) {
 			let e = t === 1 ? "starting_entities" : `before_step_${t - 1}`, l = t === 1 ? "start_time" : "step_time", u = `before_step_${t}`, d = [];
-			r.where && d.push(r.where), d.push(O`${i} = ${O.identifier(e)}.binding_key`, O`${a} < ${O.identifier(e)}.${O.identifier(l)}`);
-			let f = d.length === 1 ? d[0] : F(...d), p = c ? O`${o} || ${"→"} || ${O.identifier(e)}.event_path` : O`${o}`, m = n.db.select({
-				binding_key: O`${i}`.as("binding_key"),
-				step_time: O`${a}`.as("step_time"),
-				event_type: O`${o}`.as("event_type"),
+			r.where && d.push(r.where), d.push(D`${i} = ${D.identifier(e)}.binding_key`, D`${a} < ${D.identifier(e)}.${D.identifier(l)}`);
+			let f = d.length === 1 ? d[0] : P(...d), p = c ? D`${o} || ${"→"} || ${D.identifier(e)}.event_path` : D`${o}`, m = n.db.select({
+				binding_key: D`${i}`.as("binding_key"),
+				step_time: D`${a}`.as("step_time"),
+				event_type: D`${o}`.as("event_type"),
 				event_path: p.as("event_path")
-			}).from(r.from).where(f).orderBy(O`${a} DESC`).limit(1), h = n.db.$with(u).as(n.db.select({
-				binding_key: O`e.binding_key`.as("binding_key"),
-				step_time: O`e.step_time`.as("step_time"),
-				event_type: O`e.event_type`.as("event_type"),
-				event_path: O`e.event_path`.as("event_path")
-			}).from(O`${O.identifier(e)}`).crossJoinLateral(m.as("e")));
+			}).from(r.from).where(f).orderBy(D`${a} DESC`).limit(1), h = n.db.$with(u).as(n.db.select({
+				binding_key: D`e.binding_key`.as("binding_key"),
+				step_time: D`e.step_time`.as("step_time"),
+				event_type: D`e.event_type`.as("event_type"),
+				event_path: D`e.event_path`.as("event_path")
+			}).from(D`${D.identifier(e)}`).crossJoinLateral(m.as("e")));
 			s.push(h);
 		}
 		return s;
@@ -5337,18 +5484,18 @@ var At = class {
 		let { cubeBase: r, bindingKeyExpr: i, timeExpr: a, eventExpr: o } = t, s = [], c = e.outputMode === "sunburst";
 		for (let t = 1; t <= e.stepsAfter; t++) {
 			let e = t === 1 ? "starting_entities" : `after_step_${t - 1}`, l = t === 1 ? "start_time" : "step_time", u = `after_step_${t}`, d = [];
-			r.where && d.push(r.where), d.push(O`${i} = ${O.identifier(e)}.binding_key`, O`${a} > ${O.identifier(e)}.${O.identifier(l)}`);
-			let f = d.length === 1 ? d[0] : F(...d), p = c ? O`${O.identifier(e)}.event_path || ${"→"} || ${o}` : O`${o}`, m = n.db.select({
-				binding_key: O`${i}`.as("binding_key"),
-				step_time: O`${a}`.as("step_time"),
-				event_type: O`${o}`.as("event_type"),
+			r.where && d.push(r.where), d.push(D`${i} = ${D.identifier(e)}.binding_key`, D`${a} > ${D.identifier(e)}.${D.identifier(l)}`);
+			let f = d.length === 1 ? d[0] : P(...d), p = c ? D`${D.identifier(e)}.event_path || ${"→"} || ${o}` : D`${o}`, m = n.db.select({
+				binding_key: D`${i}`.as("binding_key"),
+				step_time: D`${a}`.as("step_time"),
+				event_type: D`${o}`.as("event_type"),
 				event_path: p.as("event_path")
-			}).from(r.from).where(f).orderBy(O`${a} ASC`).limit(1), h = n.db.$with(u).as(n.db.select({
-				binding_key: O`e.binding_key`.as("binding_key"),
-				step_time: O`e.step_time`.as("step_time"),
-				event_type: O`e.event_type`.as("event_type"),
-				event_path: O`e.event_path`.as("event_path")
-			}).from(O`${O.identifier(e)}`).crossJoinLateral(m.as("e")));
+			}).from(r.from).where(f).orderBy(D`${a} ASC`).limit(1), h = n.db.$with(u).as(n.db.select({
+				binding_key: D`e.binding_key`.as("binding_key"),
+				step_time: D`e.step_time`.as("step_time"),
+				event_type: D`e.event_type`.as("event_type"),
+				event_path: D`e.event_path`.as("event_path")
+			}).from(D`${D.identifier(e)}`).crossJoinLateral(m.as("e")));
 			s.push(h);
 		}
 		return s;
@@ -5357,19 +5504,19 @@ var At = class {
 		let { cubeBase: r, bindingKeyExpr: i, timeExpr: a, eventExpr: o } = t, s = [], c = e.outputMode === "sunburst";
 		for (let t = 1; t <= e.stepsBefore; t++) {
 			let e = t === 1 ? "starting_entities" : `before_step_${t - 1}`, l = t === 1 ? "start_time" : "step_time", u = `before_step_${t}`, d = [];
-			r.where && d.push(r.where), d.push(O`${a} < ${O.identifier(e)}.${O.identifier(l)}`);
-			let f = d.length === 1 ? d[0] : F(...d), p = c ? O`${o} || ${"→"} || ${O.identifier(e)}.event_path` : O`${o}`, m = n.db.select({
-				binding_key: O`${i}`.as("binding_key"),
-				step_time: O`${a}`.as("step_time"),
-				event_type: O`${o}`.as("event_type"),
+			r.where && d.push(r.where), d.push(D`${a} < ${D.identifier(e)}.${D.identifier(l)}`);
+			let f = d.length === 1 ? d[0] : P(...d), p = c ? D`${o} || ${"→"} || ${D.identifier(e)}.event_path` : D`${o}`, m = n.db.select({
+				binding_key: D`${i}`.as("binding_key"),
+				step_time: D`${a}`.as("step_time"),
+				event_type: D`${o}`.as("event_type"),
 				event_path: p.as("event_path"),
-				rn: O`ROW_NUMBER() OVER (PARTITION BY ${i} ORDER BY ${a} DESC)`.as("rn")
-			}).from(r.from).innerJoin(O`${O.identifier(e)}`, O`${i} = ${O.identifier(e)}.binding_key`).where(f), h = n.db.select({
-				binding_key: O`binding_key`.as("binding_key"),
-				step_time: O`step_time`.as("step_time"),
-				event_type: O`event_type`.as("event_type"),
-				event_path: O`event_path`.as("event_path")
-			}).from(m.as("ranked")).where(O`rn = 1`);
+				rn: D`ROW_NUMBER() OVER (PARTITION BY ${i} ORDER BY ${a} DESC)`.as("rn")
+			}).from(r.from).innerJoin(D`${D.identifier(e)}`, D`${i} = ${D.identifier(e)}.binding_key`).where(f), h = n.db.select({
+				binding_key: D`binding_key`.as("binding_key"),
+				step_time: D`step_time`.as("step_time"),
+				event_type: D`event_type`.as("event_type"),
+				event_path: D`event_path`.as("event_path")
+			}).from(m.as("ranked")).where(D`rn = 1`);
 			s.push(n.db.$with(u).as(h));
 		}
 		return s;
@@ -5378,19 +5525,19 @@ var At = class {
 		let { cubeBase: r, bindingKeyExpr: i, timeExpr: a, eventExpr: o } = t, s = [], c = e.outputMode === "sunburst";
 		for (let t = 1; t <= e.stepsAfter; t++) {
 			let e = t === 1 ? "starting_entities" : `after_step_${t - 1}`, l = t === 1 ? "start_time" : "step_time", u = `after_step_${t}`, d = [];
-			r.where && d.push(r.where), d.push(O`${a} > ${O.identifier(e)}.${O.identifier(l)}`);
-			let f = d.length === 1 ? d[0] : F(...d), p = c ? O`${O.identifier(e)}.event_path || ${"→"} || ${o}` : O`${o}`, m = n.db.select({
-				binding_key: O`${i}`.as("binding_key"),
-				step_time: O`${a}`.as("step_time"),
-				event_type: O`${o}`.as("event_type"),
+			r.where && d.push(r.where), d.push(D`${a} > ${D.identifier(e)}.${D.identifier(l)}`);
+			let f = d.length === 1 ? d[0] : P(...d), p = c ? D`${D.identifier(e)}.event_path || ${"→"} || ${o}` : D`${o}`, m = n.db.select({
+				binding_key: D`${i}`.as("binding_key"),
+				step_time: D`${a}`.as("step_time"),
+				event_type: D`${o}`.as("event_type"),
 				event_path: p.as("event_path"),
-				rn: O`ROW_NUMBER() OVER (PARTITION BY ${i} ORDER BY ${a} ASC)`.as("rn")
-			}).from(r.from).innerJoin(O`${O.identifier(e)}`, O`${i} = ${O.identifier(e)}.binding_key`).where(f), h = n.db.select({
-				binding_key: O`binding_key`.as("binding_key"),
-				step_time: O`step_time`.as("step_time"),
-				event_type: O`event_type`.as("event_type"),
-				event_path: O`event_path`.as("event_path")
-			}).from(m.as("ranked")).where(O`rn = 1`);
+				rn: D`ROW_NUMBER() OVER (PARTITION BY ${i} ORDER BY ${a} ASC)`.as("rn")
+			}).from(r.from).innerJoin(D`${D.identifier(e)}`, D`${i} = ${D.identifier(e)}.binding_key`).where(f), h = n.db.select({
+				binding_key: D`binding_key`.as("binding_key"),
+				step_time: D`step_time`.as("step_time"),
+				event_type: D`event_type`.as("event_type"),
+				event_path: D`event_path`.as("event_path")
+			}).from(m.as("ranked")).where(D`rn = 1`);
 			s.push(n.db.$with(u).as(h));
 		}
 		return s;
@@ -5399,27 +5546,27 @@ var At = class {
 		let n = [], r = e.outputMode === "sunburst";
 		for (let t = e.stepsBefore; t >= 1; t--) {
 			let e = -t, i = `before_step_${t}`;
-			r ? n.push(O`
+			r ? n.push(D`
           SELECT
-            ${O.raw(`'before_${t}_'`)} || event_path AS node_id,
+            ${D.raw(`'before_${t}_'`)} || event_path AS node_id,
             event_type AS name,
-            ${O.raw(String(e))} AS layer,
+            ${D.raw(String(e))} AS layer,
             COUNT(*) AS value
-          FROM ${O.identifier(i)}
+          FROM ${D.identifier(i)}
           GROUP BY event_path, event_type
-        `) : n.push(O`
+        `) : n.push(D`
           SELECT
-            ${O.raw(`'before_${t}_'`)} || event_type AS node_id,
+            ${D.raw(`'before_${t}_'`)} || event_type AS node_id,
             event_type AS name,
-            ${O.raw(String(e))} AS layer,
+            ${D.raw(String(e))} AS layer,
             COUNT(*) AS value
-          FROM ${O.identifier(i)}
+          FROM ${D.identifier(i)}
           GROUP BY event_type
         `);
 		}
-		n.push(O`
+		n.push(D`
       SELECT
-        ${O.raw("'start_'")} || event_type AS node_id,
+        ${D.raw("'start_'")} || event_type AS node_id,
         event_type AS name,
         0 AS layer,
         COUNT(*) AS value
@@ -5428,82 +5575,82 @@ var At = class {
     `);
 		for (let t = 1; t <= e.stepsAfter; t++) {
 			let e = t, i = `after_step_${t}`;
-			r ? n.push(O`
+			r ? n.push(D`
           SELECT
-            ${O.raw(`'after_${t}_'`)} || event_path AS node_id,
+            ${D.raw(`'after_${t}_'`)} || event_path AS node_id,
             event_type AS name,
-            ${O.raw(String(e))} AS layer,
+            ${D.raw(String(e))} AS layer,
             COUNT(*) AS value
-          FROM ${O.identifier(i)}
+          FROM ${D.identifier(i)}
           GROUP BY event_path, event_type
-        `) : n.push(O`
+        `) : n.push(D`
           SELECT
-            ${O.raw(`'after_${t}_'`)} || event_type AS node_id,
+            ${D.raw(`'after_${t}_'`)} || event_type AS node_id,
             event_type AS name,
-            ${O.raw(String(e))} AS layer,
+            ${D.raw(String(e))} AS layer,
             COUNT(*) AS value
-          FROM ${O.identifier(i)}
+          FROM ${D.identifier(i)}
           GROUP BY event_type
         `);
 		}
-		let i = O.join(n, O` UNION ALL `), a = t.db.select({
-			node_id: O`node_id`.as("node_id"),
-			name: O`name`.as("name"),
-			layer: O`layer`.as("layer"),
-			value: O`value`.as("value")
-		}).from(O`(${i}) AS nodes_union`);
+		let i = D.join(n, D` UNION ALL `), a = t.db.select({
+			node_id: D`node_id`.as("node_id"),
+			name: D`name`.as("name"),
+			layer: D`layer`.as("layer"),
+			value: D`value`.as("value")
+		}).from(D`(${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--) {
 			let e = `before_step_${t}`, i = `before_step_${t - 1}`;
-			r ? n.push(O`
+			r ? n.push(D`
           SELECT
-            ${O.raw(`'before_${t}_'`)} || f.event_path AS source_id,
-            ${O.raw(`'before_${t - 1}_'`)} || t.event_path AS target_id,
+            ${D.raw(`'before_${t}_'`)} || f.event_path AS source_id,
+            ${D.raw(`'before_${t - 1}_'`)} || t.event_path AS target_id,
             COUNT(*) AS value
-          FROM ${O.identifier(e)} f
-          INNER JOIN ${O.identifier(i)} t ON f.binding_key = t.binding_key
+          FROM ${D.identifier(e)} f
+          INNER JOIN ${D.identifier(i)} t ON f.binding_key = t.binding_key
           GROUP BY f.event_path, t.event_path
-        `) : n.push(O`
+        `) : n.push(D`
           SELECT
-            ${O.raw(`'before_${t}_'`)} || f.event_type AS source_id,
-            ${O.raw(`'before_${t - 1}_'`)} || t.event_type AS target_id,
+            ${D.raw(`'before_${t}_'`)} || f.event_type AS source_id,
+            ${D.raw(`'before_${t - 1}_'`)} || t.event_type AS target_id,
             COUNT(*) AS value
-          FROM ${O.identifier(e)} f
-          INNER JOIN ${O.identifier(i)} t ON f.binding_key = t.binding_key
+          FROM ${D.identifier(e)} f
+          INNER JOIN ${D.identifier(i)} t ON f.binding_key = t.binding_key
           GROUP BY f.event_type, t.event_type
         `);
 		}
-		e.stepsBefore >= 1 && (r ? n.push(O`
+		e.stepsBefore >= 1 && (r ? n.push(D`
           SELECT
-            ${O.raw("'before_1_'")} || b.event_path AS source_id,
-            ${O.raw("'start_'")} || s.event_type AS target_id,
+            ${D.raw("'before_1_'")} || b.event_path AS source_id,
+            ${D.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(O`
+        `) : n.push(D`
           SELECT
-            ${O.raw("'before_1_'")} || b.event_type AS source_id,
-            ${O.raw("'start_'")} || s.event_type AS target_id,
+            ${D.raw("'before_1_'")} || b.event_type AS source_id,
+            ${D.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(O`
+        `)), e.stepsAfter >= 1 && (r ? n.push(D`
           SELECT
-            ${O.raw("'start_'")} || s.event_type AS source_id,
-            ${O.raw("'after_1_'")} || a.event_path AS target_id,
+            ${D.raw("'start_'")} || s.event_type AS source_id,
+            ${D.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(O`
+        `) : n.push(D`
           SELECT
-            ${O.raw("'start_'")} || s.event_type AS source_id,
-            ${O.raw("'after_1_'")} || a.event_type AS target_id,
+            ${D.raw("'start_'")} || s.event_type AS source_id,
+            ${D.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
@@ -5511,41 +5658,41 @@ var At = class {
         `));
 		for (let t = 1; t < e.stepsAfter; t++) {
 			let e = `after_step_${t}`, i = `after_step_${t + 1}`;
-			r ? n.push(O`
+			r ? n.push(D`
           SELECT
-            ${O.raw(`'after_${t}_'`)} || f.event_path AS source_id,
-            ${O.raw(`'after_${t + 1}_'`)} || t.event_path AS target_id,
+            ${D.raw(`'after_${t}_'`)} || f.event_path AS source_id,
+            ${D.raw(`'after_${t + 1}_'`)} || t.event_path AS target_id,
             COUNT(*) AS value
-          FROM ${O.identifier(e)} f
-          INNER JOIN ${O.identifier(i)} t ON f.binding_key = t.binding_key
+          FROM ${D.identifier(e)} f
+          INNER JOIN ${D.identifier(i)} t ON f.binding_key = t.binding_key
           GROUP BY f.event_path, t.event_path
-        `) : n.push(O`
+        `) : n.push(D`
           SELECT
-            ${O.raw(`'after_${t}_'`)} || f.event_type AS source_id,
-            ${O.raw(`'after_${t + 1}_'`)} || t.event_type AS target_id,
+            ${D.raw(`'after_${t}_'`)} || f.event_type AS source_id,
+            ${D.raw(`'after_${t + 1}_'`)} || t.event_type AS target_id,
             COUNT(*) AS value
-          FROM ${O.identifier(e)} f
-          INNER JOIN ${O.identifier(i)} t ON f.binding_key = t.binding_key
+          FROM ${D.identifier(e)} f
+          INNER JOIN ${D.identifier(i)} t ON f.binding_key = t.binding_key
           GROUP BY f.event_type, t.event_type
         `);
 		}
 		if (n.length === 0) {
 			let e = t.db.select({
-				source_id: O`NULL`.as("source_id"),
-				target_id: O`NULL`.as("target_id"),
-				value: O`0`.as("value")
-			}).from(O`(SELECT 1) AS empty`).where(O`1 = 0`);
+				source_id: D`NULL`.as("source_id"),
+				target_id: D`NULL`.as("target_id"),
+				value: D`0`.as("value")
+			}).from(D`(SELECT 1) AS empty`).where(D`1 = 0`);
 			return t.db.$with("links_agg").as(e);
 		}
-		let i = O.join(n, O` UNION ALL `), a = t.db.select({
-			source_id: O`source_id`.as("source_id"),
-			target_id: O`target_id`.as("target_id"),
-			value: O`value`.as("value")
-		}).from(O`(${i}) AS links_union`);
+		let i = D.join(n, D` UNION ALL `), a = t.db.select({
+			source_id: D`source_id`.as("source_id"),
+			target_id: D`target_id`.as("target_id"),
+			value: D`value`.as("value")
+		}).from(D`(${i}) AS links_union`);
 		return t.db.$with("links_agg").as(a);
 	}
 	buildFinalResultCTE(e) {
-		let t = O`
+		let t = D`
       SELECT
         'node' AS record_type,
         node_id AS id,
@@ -5567,40 +5714,40 @@ var At = class {
       FROM links_agg
       WHERE source_id IS NOT NULL
     `, n = e.db.select({
-			record_type: O`record_type`.as("record_type"),
-			id: O`id`.as("id"),
-			name: O`name`.as("name"),
-			layer: O`layer`.as("layer"),
-			value: O`value`.as("value"),
-			source_id: O`source_id`.as("source_id"),
-			target_id: O`target_id`.as("target_id")
-		}).from(O`(${t}) AS final_union`);
+			record_type: D`record_type`.as("record_type"),
+			id: D`id`.as("id"),
+			name: D`name`.as("name"),
+			layer: D`layer`.as("layer"),
+			value: D`value`.as("value"),
+			source_id: D`source_id`.as("source_id"),
+			target_id: D`target_id`.as("target_id")
+		}).from(D`(${t}) AS final_union`);
 		return e.db.$with("final_result").as(n);
 	}
 };
 //#endregion
 //#region src/server/types/retention.ts
-function Nt(e) {
+function It(e) {
 	return Array.isArray(e);
 }
-function Pt(e) {
+function Lt(e) {
 	return typeof e == "object" && !!e && "cube" in e;
 }
-function Ft(e) {
-	if (Pt(e)) return e.cube;
+function Rt(e) {
+	if (Lt(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 It(e) {
-	if (Pt(e)) return e.dimension;
+function zt(e) {
+	if (Lt(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 Lt = class {
+var Bt = class {
 	filterBuilder;
 	dateTimeBuilder;
 	constructor(e) {
@@ -5612,12 +5759,12 @@ var Lt = class {
 	validateConfig(e, t) {
 		let n = [];
 		try {
-			let r = Ft(e.timeDimension), i = It(e.timeDimension), a = t.get(r);
+			let r = Rt(e.timeDimension), i = zt(e.timeDimension), a = t.get(r);
 			a ? a.dimensions?.[i] || n.push(`Time dimension not found: ${i} in cube ${r}`) : n.push(`Cube not found: ${r}`);
 		} catch {
 			n.push(`Invalid time dimension format: ${e.timeDimension}`);
 		}
-		if (Nt(e.bindingKey)) for (let r of e.bindingKey) {
+		if (It(e.bindingKey)) for (let r of e.bindingKey) {
 			let e = t.get(r.cube);
 			if (!e) n.push(`Binding key mapping cube not found: ${r.cube}`);
 			else {
@@ -5669,20 +5816,20 @@ var Lt = class {
 	}
 	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: O`rc.period_number`.as("period"),
-			cohort_size: O`cs.cohort_size`.as("cohort_size"),
-			retained_users: O`rc.retained_users`.as("retained_users"),
-			retention_rate: O`CAST(rc.retained_users AS NUMERIC) / NULLIF(cs.cohort_size, 0)`.as("retention_rate")
+			period: D`rc.period_number`.as("period"),
+			cohort_size: D`cs.cohort_size`.as("cohort_size"),
+			retained_users: D`rc.retained_users`.as("retained_users"),
+			retention_rate: D`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}`] = O.raw(`rc.breakdown_${e}`).as(`breakdown_${e}`);
-		let d = n.db.with(a, o, s, c).select(u).from(O`retention_counts rc`);
+		for (let e = 0; e < r.breakdowns.length; e++) u[`breakdown_${e}`] = D.raw(`rc.breakdown_${e}`).as(`breakdown_${e}`);
+		let d = n.db.with(a, o, s, c).select(u).from(D`retention_counts rc`);
 		if (l) {
-			let e = r.breakdowns.map((e, t) => O`COALESCE(CAST(rc.breakdown_${O.raw(String(t))} AS TEXT), '') = COALESCE(CAST(cs.breakdown_${O.raw(String(t))} AS TEXT), '')`), t = e.length === 1 ? e[0] : O.join(e, O` AND `);
-			d = d.innerJoin(O`cohort_sizes cs`, t);
-		} else d = d.innerJoin(O`cohort_sizes cs`, O`1 = 1`);
+			let e = r.breakdowns.map((e, t) => D`COALESCE(CAST(rc.breakdown_${D.raw(String(t))} AS TEXT), '') = COALESCE(CAST(cs.breakdown_${D.raw(String(t))} AS TEXT), '')`), t = e.length === 1 ? e[0] : D.join(e, D` AND `);
+			d = d.innerJoin(D`cohort_sizes cs`, t);
+		} else d = d.innerJoin(D`cohort_sizes cs`, D`1 = 1`);
 		let f = [];
-		for (let e = 0; e < r.breakdowns.length; e++) f.push(O.raw(`rc.breakdown_${e}`));
-		return f.push(O`rc.period_number`), d = d.orderBy(...f), d;
+		for (let e = 0; e < r.breakdowns.length; e++) f.push(D.raw(`rc.breakdown_${e}`));
+		return f.push(D`rc.period_number`), d = d.orderBy(...f), d;
 	}
 	transformResult(e, t) {
 		let n = t.breakdownDimensions || [], r = Math.min(n.length, 100), i = r > 0;
@@ -5705,7 +5852,7 @@ var Lt = class {
 		});
 	}
 	resolveConfig(e, t, n) {
-		let r = Ft(e.timeDimension), i = It(e.timeDimension), a = t.get(r);
+		let r = Rt(e.timeDimension), i = zt(e.timeDimension), a = t.get(r);
 		if (!a) throw Error(`Cube not found: ${r}`);
 		let o = a.dimensions?.[i];
 		if (!o) throw Error(`Time dimension not found: ${i}`);
@@ -5730,7 +5877,7 @@ var Lt = class {
 		};
 	}
 	resolveBindingKey(e, t, n, r) {
-		if (Nt(e)) {
+		if (It(e)) {
 			let i = e.find((e) => e.cube === t.name);
 			if (!i) throw Error(`No binding key mapping found for cube: ${t.name}`);
 			let a = this.extractDimensionName(i.dimension), o = n.get(i.cube);
@@ -5761,7 +5908,7 @@ var Lt = class {
 				let i = this.buildSingleFilterCondition(e, t, n, r);
 				i && a.push(i);
 			}
-			return a.length === 0 ? null : a.length === 1 ? a[0] : o ? F(...a) : O`(${O.join(a, O` OR `)})`;
+			return a.length === 0 ? null : a.length === 1 ? a[0] : o ? P(...a) : D`(${D.join(a, D` OR `)})`;
 		}
 		let i = e, [a, o] = i.member.split("."), s = n.get(a);
 		if (!s) return null;
@@ -5777,16 +5924,16 @@ var Lt = class {
 			i.push(n);
 		}
 		let a = this.databaseAdapter.buildTimeDimension(e.granularity, t.timeExpr), o = {
-			binding_key: O`${t.bindingKeyExpr}`.as("binding_key"),
-			cohort_entry: O`MIN(${a})`.as("cohort_entry")
+			binding_key: D`${t.bindingKeyExpr}`.as("binding_key"),
+			cohort_entry: D`MIN(${a})`.as("cohort_entry")
 		};
 		for (let e = 0; e < t.breakdowns.length; e++) {
 			let { expr: n } = t.breakdowns[e];
-			o[`breakdown_${e}`] = O`MIN(${n})`.as(`breakdown_${e}`);
+			o[`breakdown_${e}`] = D`MIN(${n})`.as(`breakdown_${e}`);
 		}
 		let s = n.db.select(o).from(r.from);
 		if (i.length > 0) {
-			let e = i.length === 1 ? i[0] : F(...i);
+			let e = i.length === 1 ? i[0] : P(...i);
 			s = s.where(e);
 		}
 		let c = [t.bindingKeyExpr];
@@ -5798,36 +5945,36 @@ var Lt = class {
 		return n.db.$with("cohort_base").as(s);
 	}
 	buildDateRangeCondition(e, t) {
-		return O`${e} >= ${t.start}::date AND ${e} < (${t.end}::date + interval '1 day')`;
+		return D`${e} >= ${t.start}::date AND ${e} < (${t.end}::date + interval '1 day')`;
 	}
 	buildDateRangeHavingCondition(e, t) {
-		return O`MIN(${e}) >= ${t.start}::date AND MIN(${e}) < (${t.end}::date + interval '1 day')`;
+		return D`MIN(${e}) >= ${t.start}::date AND MIN(${e}) < (${t.end}::date + interval '1 day')`;
 	}
 	buildActivityPeriodsCTE(e, t, n) {
 		let r = t.cube.sql(n), i = [];
-		r.where && i.push(r.where), i.push(...t.activityFilterConditions), i.push(O`${t.timeExpr} >= cohort_base.cohort_entry`);
-		let a = this.databaseAdapter.buildTimeDimension(e.granularity, t.timeExpr), o = this.buildPeriodNumberExpression(O`cohort_base.cohort_entry`, a, e.granularity), s = {
-			binding_key: O`cohort_base.binding_key`.as("binding_key"),
+		r.where && i.push(r.where), i.push(...t.activityFilterConditions), i.push(D`${t.timeExpr} >= cohort_base.cohort_entry`);
+		let a = this.databaseAdapter.buildTimeDimension(e.granularity, t.timeExpr), o = this.buildPeriodNumberExpression(D`cohort_base.cohort_entry`, a, e.granularity), s = {
+			binding_key: D`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}`] = O.raw(`cohort_base.breakdown_${e}`).as(`breakdown_${e}`);
-		let c = n.db.select(s).from(r.from).innerJoin(O`cohort_base`, O`${t.bindingKeyExpr} = cohort_base.binding_key`);
+		for (let e = 0; e < t.breakdowns.length; e++) s[`breakdown_${e}`] = D.raw(`cohort_base.breakdown_${e}`).as(`breakdown_${e}`);
+		let c = n.db.select(s).from(r.from).innerJoin(D`cohort_base`, D`${t.bindingKeyExpr} = cohort_base.binding_key`);
 		if (i.length > 0) {
-			let e = i.length === 1 ? i[0] : F(...i);
+			let e = i.length === 1 ? i[0] : P(...i);
 			c = c.where(e);
 		}
-		let l = [O`cohort_base.binding_key`, o];
-		for (let e = 0; e < t.breakdowns.length; e++) l.push(O.raw(`cohort_base.breakdown_${e}`));
+		let l = [D`cohort_base.binding_key`, o];
+		for (let e = 0; e < t.breakdowns.length; e++) l.push(D.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: O`COUNT(*)`.as("cohort_size") }, r = [];
-			for (let t = 0; t < n; t++) e[`breakdown_${t}`] = O.raw(`breakdown_${t}`).as(`breakdown_${t}`), r.push(O.raw(`breakdown_${t}`));
-			let i = t.db.select(e).from(O`cohort_base`).groupBy(...r);
+			let e = { cohort_size: D`COUNT(*)`.as("cohort_size") }, r = [];
+			for (let t = 0; t < n; t++) e[`breakdown_${t}`] = D.raw(`breakdown_${t}`).as(`breakdown_${t}`), r.push(D.raw(`breakdown_${t}`));
+			let i = t.db.select(e).from(D`cohort_base`).groupBy(...r);
 			return t.db.$with("cohort_sizes").as(i);
 		}
-		let r = t.db.select({ cohort_size: O`COUNT(*)`.as("cohort_size") }).from(O`cohort_base`);
+		let r = t.db.select({ cohort_size: D`COUNT(*)`.as("cohort_size") }).from(D`cohort_base`);
 		return t.db.$with("cohort_sizes").as(r);
 	}
 	buildRetentionCountsCTE(e, t, n) {
@@ -5835,32 +5982,32 @@ var Lt = class {
 		if (e.retentionType === "rolling") r = this.buildRollingRetentionCountsQuery(e, t, n);
 		else {
 			let i = {
-				period_number: O`period_number`.as("period_number"),
-				retained_users: O`COUNT(DISTINCT binding_key)`.as("retained_users")
-			}, a = [O`period_number`];
-			for (let e = 0; e < n; e++) i[`breakdown_${e}`] = O.raw(`breakdown_${e}`).as(`breakdown_${e}`), a.push(O.raw(`breakdown_${e}`));
+				period_number: D`period_number`.as("period_number"),
+				retained_users: D`COUNT(DISTINCT binding_key)`.as("retained_users")
+			}, a = [D`period_number`];
+			for (let e = 0; e < n; e++) i[`breakdown_${e}`] = D.raw(`breakdown_${e}`).as(`breakdown_${e}`), a.push(D.raw(`breakdown_${e}`));
 			let o = Math.min(e.periods, 52);
-			r = t.db.select(i).from(O`activity_periods`).where(O`period_number >= 0 AND period_number <= ${o}`).groupBy(...a);
+			r = t.db.select(i).from(D`activity_periods`).where(D`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 = O`(
+		let i = r.length > 0 ? `, ${r.join(", ")}` : "", a = D`(
       SELECT
         binding_key,
-        ${O.raw(r.map((e) => `${e}`).join(", ") + (r.length > 0 ? "," : ""))}
+        ${D.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 <= ${e.periods}
-      GROUP BY binding_key${O.raw(i)}
+      GROUP BY binding_key${D.raw(i)}
     )`, o = this.databaseAdapter.buildPeriodSeriesSubquery(e.periods), s = {
-			period_number: O`p.period_number`.as("period_number"),
-			retained_users: O`COUNT(DISTINCT CASE WHEN ump.max_period >= p.period_number THEN ump.binding_key END)`.as("retained_users")
-		}, c = [O`p.period_number`];
-		for (let e = 0; e < n; e++) s[`breakdown_${e}`] = O.raw(`ump.breakdown_${e}`).as(`breakdown_${e}`), c.push(O.raw(`ump.breakdown_${e}`));
-		return t.db.select(s).from(O`${a} ump`).innerJoin(o, O`TRUE`).groupBy(...c);
+			period_number: D`p.period_number`.as("period_number"),
+			retained_users: D`COUNT(DISTINCT CASE WHEN ump.max_period >= p.period_number THEN ump.binding_key END)`.as("retained_users")
+		}, c = [D`p.period_number`];
+		for (let e = 0; e < n; e++) s[`breakdown_${e}`] = D.raw(`ump.breakdown_${e}`).as(`breakdown_${e}`), c.push(D.raw(`ump.breakdown_${e}`));
+		return t.db.select(s).from(D`${a} ump`).innerJoin(o, D`TRUE`).groupBy(...c);
 	}
 	buildPeriodNumberExpression(e, t, n) {
 		return this.databaseAdapter.buildDateDiffPeriods(e, t, n);
@@ -5869,7 +6016,7 @@ var Lt = class {
 		let t = e.split(".");
 		return t.length > 1 ? t[1] : t[0];
 	}
-}, Rt = class {
+}, Vt = class {
 	constructor(e) {
 		this.queryPlanner = e;
 	}
@@ -6304,7 +6451,7 @@ var Lt = class {
 			timeDimensions: []
 		};
 	}
-}, zt = class {
+}, Ht = class {
 	name = "identity";
 	optimise(e) {
 		return e;
@@ -6312,7 +6459,7 @@ var Lt = class {
 };
 //#endregion
 //#region src/server/physical-plan/processors/cte-processor.ts
-function Bt(e, t, n, r) {
+function Ut(e, t, n, r) {
 	let i = /* @__PURE__ */ new Map();
 	if (e.preAggregationCTEs && e.preAggregationCTEs.length > 0) {
 		for (let t of e.preAggregationCTEs) if (t.propagatingFilters && t.propagatingFilters.length > 0) for (let e of t.propagatingFilters) {
@@ -6322,7 +6469,7 @@ function Bt(e, t, n, r) {
 				i.set(t, s);
 			}
 			let a = i.get(t);
-			a && a.length > 0 && (e.preBuiltFilterSQL = a.length === 1 ? a[0] : F(...a));
+			a && a.length > 0 && (e.preBuiltFilterSQL = a.length === 1 ? a[0] : P(...a));
 		}
 	}
 	let a = [], o = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map();
@@ -6342,7 +6489,7 @@ function Bt(e, t, n, r) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/window-processor.ts
-function Vt(e, t, n, r, i, a) {
+function Wt(e, t, n, r, i, a) {
 	if (n.measures) for (let o of n.measures) {
 		let [s, c] = o.split("."), l = i.get(s);
 		if (!l?.measures?.[c]) continue;
@@ -6353,16 +6500,16 @@ function Vt(e, t, n, r, i, a) {
 		let [f, p] = d.split("."), m = i.get(f);
 		if (!m?.measures?.[p]) continue;
 		let h = m.measures[p], g = t.preAggregationCTEs?.find((e) => e.cube?.name === f && e.measures?.includes(d)), _;
-		_ = g ? O`sum(${O`${O.identifier(g.cteAlias)}.${O.identifier(p)}`})` : a.queryBuilder.buildMeasureExpression(h, r, m), e[d] || (e[d] = O`${_}`.as(d));
-		let v = Ht(u, _, n, r, l, t, a);
-		v && (e[o] = O`${v}`.as(o));
+		_ = g ? D`sum(${D`${D.identifier(g.cteAlias)}.${D.identifier(p)}`})` : a.queryBuilder.buildMeasureExpression(h, r, m), e[d] || (e[d] = D`${_}`.as(d));
+		let v = Gt(u, _, n, r, l, t, a);
+		v && (e[o] = D`${v}`.as(o));
 	}
 }
-function Ht(e, t, n, r, i, a, o) {
+function Gt(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 ? O`${O.identifier(n.cteAlias)}.${O.identifier(t)}` : null;
+		return n && n.cteAlias ? D`${D.identifier(n.cteAlias)}.${D.identifier(t)}` : null;
 	}, l;
 	if (s.orderBy && s.orderBy.length > 0) l = s.orderBy.map((e) => {
 		let a = e.field.includes(".") ? e.field.split(".")[1] : e.field;
@@ -6420,15 +6567,15 @@ function Ht(e, t, n, r, i, a, o) {
 	});
 	if (!d) return null;
 	switch (s.operation || Q.getDefaultWindowOperation(e.type)) {
-		case "difference": return O`${t} - ${d}`;
-		case "ratio": return O`${t} / NULLIF(${d}, 0)`;
-		case "percentChange": return O`((${t} - ${d}) / NULLIF(${d}, 0)) * 100`;
+		case "difference": return D`${t} - ${d}`;
+		case "ratio": return D`${t} / NULLIF(${d}, 0)`;
+		case "percentChange": return D`((${t} - ${d}) / NULLIF(${d}, 0)) * 100`;
 		default: return d;
 	}
 }
 //#endregion
 //#region src/server/physical-plan/processors/selection-processor.ts
-function Ut(e, t, n, r, i) {
+function Kt(e, t, n, r, i) {
 	let a = { ...i.queryBuilder.buildSelections(e.joinCubes.length > 0 ? r : e.primaryCube, t, n) };
 	if (e.preAggregationCTEs) for (let o of e.preAggregationCTEs) {
 		let e = o.cube.name;
@@ -6436,32 +6583,32 @@ function Ut(e, t, n, r, i) {
 			if (!a[s]) continue;
 			let [, c] = s.split("."), l = r.get(e);
 			if (!l?.measures?.[c]) continue;
-			let u = l.measures[c], d = O`${O.identifier(o.cteAlias)}.${O.identifier(c)}`, f;
+			let u = l.measures[c], d = D`${D.identifier(o.cteAlias)}.${D.identifier(c)}`, f;
 			if (u.type === "calculated" && u.calculatedSql) f = i.queryBuilder.buildCTECalculatedMeasure(u, l, o, r, n);
 			else {
-				let e = o.cteReason === "fanOutPrevention", n = Wt(o, t, r), a = e || n;
+				let e = o.cteReason === "fanOutPrevention", n = qt(o, t, r), a = e || n;
 				switch (u.type) {
 					case "count":
 					case "countDistinct":
 					case "sum":
-						f = a ? B(d) : z(d);
+						f = a ? z(d) : R(d);
 						break;
 					case "avg":
-						f = a ? B(d) : i.databaseAdapter.buildAvg(d);
+						f = a ? z(d) : i.databaseAdapter.buildAvg(d);
 						break;
 					case "min":
-						f = pe(d);
+						f = B(d);
 						break;
 					case "max":
-						f = B(d);
+						f = z(d);
 						break;
 					case "number":
-						f = B(d);
+						f = z(d);
 						break;
-					default: f = a ? B(d) : z(d);
+					default: f = a ? z(d) : R(d);
 				}
 			}
-			a[s] = O`${f}`.as(s);
+			a[s] = D`${f}`.as(s);
 		}
 		for (let t in a) {
 			let [n, i] = t.split(".");
@@ -6473,15 +6620,15 @@ function Ut(e, t, n, r, i) {
 				let e = s.dimensions[i].sql;
 				u = o.joinKeys.find((t) => t.targetColumnObj === e);
 			}
-			(u || l && s?.dimensions?.[i]) && (a[t] = O`${O.identifier(o.cteAlias)}.${O.identifier(i)}`.as(t));
+			(u || l && s?.dimensions?.[i]) && (a[t] = D`${D.identifier(o.cteAlias)}.${D.identifier(i)}`.as(t));
 		}
 	}
-	return Vt(a, e, t, n, r, i), a;
+	return Wt(a, e, t, n, r, i), a;
 }
-function Wt(e, t, n) {
-	return e.cteReason !== "hasMany" || e.downstreamJoinKeys && e.downstreamJoinKeys.length > 0 || e.intermediateJoins && e.intermediateJoins.length > 0 || !(t.dimensions && t.dimensions.length > 0 || t.timeDimensions && t.timeDimensions.length > 0) || t.dimensions?.some((t) => t.startsWith(`${e.cube.name}.`)) || t.timeDimensions?.some((t) => t.dimension.startsWith(`${e.cube.name}.`)) ? !1 : e.joinKeys.length > 0 && e.joinKeys.every((e) => !!e.sourceColumnObj && Gt(e.sourceColumnObj, t, n));
+function qt(e, t, n) {
+	return e.cteReason !== "hasMany" || e.downstreamJoinKeys && e.downstreamJoinKeys.length > 0 || e.intermediateJoins && e.intermediateJoins.length > 0 || !(t.dimensions && t.dimensions.length > 0 || t.timeDimensions && t.timeDimensions.length > 0) || t.dimensions?.some((t) => t.startsWith(`${e.cube.name}.`)) || t.timeDimensions?.some((t) => t.dimension.startsWith(`${e.cube.name}.`)) ? !1 : e.joinKeys.length > 0 && e.joinKeys.every((e) => !!e.sourceColumnObj && Jt(e.sourceColumnObj, t, n));
 }
-function Gt(e, t, n) {
+function Jt(e, t, n) {
 	if (t.dimensions) for (let r of t.dimensions) {
 		let [t, i] = r.split(".");
 		if (n.get(t)?.dimensions?.[i]?.sql === e) return !0;
@@ -6495,7 +6642,7 @@ function Gt(e, t, n) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/joins-processor.ts
-function Kt(e, t, n, r, i, a) {
+function Yt(e, t, n, r, i, a) {
 	let o = [], s = t.db.select(r).from(n.from);
 	if (i.ctes.length > 0 && (s = t.db.with(...i.ctes).select(r).from(n.from)), n.joins) for (let e of n.joins) switch (e.type || "left") {
 		case "left":
@@ -6526,10 +6673,10 @@ function Kt(e, t, n, r, i, a) {
 				if (t && t.joinKeys.length > 0) {
 					let e = [];
 					for (let n of t.joinKeys) {
-						let t = O`${O.identifier(c)}.${O.identifier(n.sourceColumn)}`, r = n.targetColumnObj;
-						r && e.push(N(r, t));
+						let t = D`${D.identifier(c)}.${D.identifier(n.sourceColumn)}`, r = n.targetColumnObj;
+						r && e.push(M(r, t));
 					}
-					e.length > 0 && (a = F(...e));
+					e.length > 0 && (a = P(...e));
 				}
 			}
 			let l = [];
@@ -6556,19 +6703,19 @@ function Kt(e, t, n, r, i, a) {
 			} catch {}
 		}
 		let d, f, p;
-		if (u) d = O`${O.identifier(u)}`, f = a.cteBuilder.buildCTEJoinCondition(n, u, e), p = void 0;
+		if (u) d = D`${D.identifier(u)}`, f = a.cteBuilder.buildCTEJoinCondition(n, u, e), p = void 0;
 		else {
 			let e = i.downstreamCubeMap.get(n.cube.name), r = n.cube.sql(t);
 			if (d = r.from, p = r.where, e && !n.junctionTable) {
 				let t = [];
 				for (let n of e.joinKeys) {
-					let r = O`${O.identifier(e.cteAlias)}.${O.identifier(n.sourceColumn)}`, i = n.targetColumnObj || O.identifier(n.targetColumn);
-					t.push(N(r, i));
+					let r = D`${D.identifier(e.cteAlias)}.${D.identifier(n.sourceColumn)}`, i = n.targetColumnObj || D.identifier(n.targetColumn);
+					t.push(M(r, i));
 				}
-				f = t.length === 1 ? t[0] : F(...t);
+				f = t.length === 1 ? t[0] : P(...t);
 			} else f = n.joinCondition;
 		}
-		let m = n.joinType || "left", h = m !== "inner" && p ? F(f, p) : f;
+		let m = n.joinType || "left", h = m !== "inner" && p ? P(f, p) : f;
 		try {
 			switch (m) {
 				case "left":
@@ -6595,7 +6742,7 @@ function Kt(e, t, n, r, i, a) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/predicates-processor.ts
-function qt(e, t, n, r, i, a, o, s) {
+function Xt(e, t, n, r, i, a, o, s) {
 	let c = [...o.allWhereConditions];
 	if (i.where && c.push(i.where), e.joinCubes && e.joinCubes.length > 0) for (let t of e.joinCubes) {
 		let e = t.cube.name;
@@ -6607,14 +6754,14 @@ function qt(e, t, n, r, i, a, o, s) {
 	l.length > 0 && c.push(...l);
 	let u = o.drizzleQuery;
 	if (c.length > 0) {
-		let e = c.length === 1 ? c[0] : F(...c);
+		let e = c.length === 1 ? c[0] : P(...c);
 		u = u.where(e);
 	}
 	let d = s.queryBuilder.buildGroupByFields(e.joinCubes.length > 0 ? r : e.primaryCube, t, n, e);
 	if (d.length > 0 && (u = u.groupBy(...d)), !t.ungrouped) {
 		let i = s.queryBuilder.buildHavingConditions(e.joinCubes.length > 0 ? r : e.primaryCube, t, n, e);
 		if (i.length > 0) {
-			let e = i.length === 1 ? i[0] : F(...i);
+			let e = i.length === 1 ? i[0] : P(...i);
 			u = u.having(e);
 		}
 	}
@@ -6623,14 +6770,14 @@ function qt(e, t, n, r, i, a, o, s) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/shared.ts
-function Jt(e) {
+function Zt(e) {
 	let t = /* @__PURE__ */ new Map();
 	if (t.set(e.primaryCube.name, e.primaryCube), e.joinCubes) for (let n of e.joinCubes) t.set(n.cube.name, n.cube);
 	return t;
 }
 //#endregion
 //#region src/server/physical-plan/drizzle-plan-builder.ts
-var Yt = class {
+var Qt = class {
 	constructor(e, t, n) {
 		this.queryBuilder = e, this.cteBuilder = t, this.databaseAdapter = n;
 	}
@@ -6770,13 +6917,13 @@ var Yt = class {
 		if (i) return i;
 		let a = this.tryBuildKeysDeduplicationQuery(e, t, n, r);
 		if (a) return a;
-		let o = Bt(e, t, n, r), s = e.primaryCube.sql(n), c = e.joinCubes.length > 0 ? Jt(e) : new Map([[e.primaryCube.name, e.primaryCube]]);
-		return qt(e, t, n, c, s, o, Kt(e, n, s, Ut(e, t, n, c, r), o, r), r);
+		let o = Ut(e, t, n, r), s = e.primaryCube.sql(n), c = e.joinCubes.length > 0 ? Zt(e) : new Map([[e.primaryCube.name, e.primaryCube]]);
+		return Xt(e, t, n, c, s, o, Yt(e, n, s, Kt(e, t, n, c, r), o, r), r);
 	}
 	tryBuildKeysDeduplicationQuery(e, t, n, r) {
 		let i = e.keysDeduplication;
 		if (!i?.multipliedCubeName || !t.measures?.length) return null;
-		let a = e.joinCubes.length > 0 ? Jt(e) : new Map([[e.primaryCube.name, e.primaryCube]]), o = a.get(i.multipliedCubeName);
+		let a = e.joinCubes.length > 0 ? Zt(e) : new Map([[e.primaryCube.name, e.primaryCube]]), o = a.get(i.multipliedCubeName);
 		if (!o || !this.canExecuteKeysDeduplication(t, o, i.multipliedCubeName)) return null;
 		let s = i.primaryKeyDimensions.length > 0 ? i.primaryKeyDimensions : this.getPrimaryKeyDimensions(o);
 		if (s.length === 0) return null;
@@ -6785,20 +6932,20 @@ var Yt = class {
 			let [t, r] = e.split("."), i = a.get(t), o = i?.dimensions?.[r];
 			if (!i || !o) return null;
 			let s = W(o.sql, n);
-			u[e] = O`${s}`.as(e), d.push(s);
+			u[e] = D`${s}`.as(e), d.push(s);
 		}
 		if (t.timeDimensions) for (let e of t.timeDimensions) {
 			let [t, i] = e.dimension.split("."), o = a.get(t), s = o?.dimensions?.[i];
 			if (!o || !s) return null;
 			let c = r.queryBuilder.buildTimeDimensionExpression(s.sql, e.granularity, n);
-			u[e.dimension] = O`${c}`.as(e.dimension), d.push(c);
+			u[e.dimension] = D`${c}`.as(e.dimension), d.push(c);
 		}
 		let f = [];
 		for (let e of s) {
 			let t = o.dimensions?.[e];
 			if (!t) return null;
 			let r = W(t.sql, n), i = `__pk__${e}`;
-			u[i] = O`${r}`.as(i), d.push(r), f.push(i);
+			u[i] = D`${r}`.as(i), d.push(r), f.push(i);
 		}
 		let p = i.regularMeasures ?? [], m = new Set(p), h = t.measures.filter((e) => !m.has(e));
 		if (p.length > 0) {
@@ -6807,7 +6954,7 @@ var Yt = class {
 				let n = e.get(t);
 				if (!n) return null;
 				let r = `__reg__${t.replace(".", "__")}`;
-				u[r] = O`${n()}`.as(r);
+				u[r] = D`${n()}`.as(r);
 			}
 		}
 		let g = e.primaryCube.sql(n), _ = [];
@@ -6822,29 +6969,29 @@ var Yt = class {
 			let e = t.cube.sql(n);
 			v = this.applyJoinByType(v, t.joinType ?? "left", e.from, t.joinCondition), e.where && _.push(e.where);
 		}
-		_.push(...r.queryBuilder.buildWhereConditions(a, t, n)), _.length > 0 && (v = v.where(_.length === 1 ? _[0] : F(..._))), d.length > 0 && (v = v.groupBy(...d));
+		_.push(...r.queryBuilder.buildWhereConditions(a, t, n)), _.length > 0 && (v = v.where(_.length === 1 ? _[0] : P(..._))), d.length > 0 && (v = v.groupBy(...d));
 		let y = n.db.$with(c).as(v), b = o.sql(n), x = {}, S = [];
 		for (let e of s) {
 			let t = o.dimensions?.[e];
 			if (!t) return null;
 			let r = W(t.sql, n);
-			x[e] = O`${r}`.as(e), S.push(r);
+			x[e] = D`${r}`.as(e), S.push(r);
 		}
 		let C = /* @__PURE__ */ new Set();
 		for (let e of h) {
 			let [, t] = e.split(".");
 			o.measures?.[t]?.type === "avg" && C.add(t);
 		}
-		let w = h.filter((e) => {
+		let ee = h.filter((e) => {
 			let [, t] = e.split(".");
 			return !C.has(t);
 		});
-		if (w.length > 0) {
-			let e = r.queryBuilder.buildResolvedMeasures(w, new Map([[o.name, o]]), n);
-			for (let t of w) {
+		if (ee.length > 0) {
+			let e = r.queryBuilder.buildResolvedMeasures(ee, new Map([[o.name, o]]), n);
+			for (let t of ee) {
 				let [, n] = t.split("."), r = e.get(t);
 				if (!r || typeof r != "function") return null;
-				x[n] = O`${r()}`.as(n);
+				x[n] = D`${r()}`.as(n);
 			}
 		}
 		for (let e of h) {
@@ -6853,27 +7000,27 @@ var Yt = class {
 			let r = o.measures?.[t];
 			if (!r?.sql) return null;
 			let i = W(r.sql, n), a = `__avg_sum__${t}`, s = `__avg_count__${t}`;
-			x[a] = O`sum(${i})`.as(a), x[s] = O`count(${i})`.as(s);
+			x[a] = D`sum(${i})`.as(a), x[s] = D`count(${i})`.as(s);
 		}
-		let T = n.db.select(x).from(b.from), E = [];
-		b.where && E.push(b.where), E.push(...r.queryBuilder.buildWhereConditions(o, t, n)), E.length > 0 && (T = T.where(E.length === 1 ? E[0] : F(...E))), S.length > 0 && (T = T.groupBy(...S));
-		let D = n.db.$with(l).as(T), k = {};
-		for (let e of t.dimensions ?? []) k[e] = O`${O.identifier(c)}.${O.identifier(e)}`.as(e);
-		for (let e of t.timeDimensions ?? []) k[e.dimension] = O`${O.identifier(c)}.${O.identifier(e.dimension)}`.as(e.dimension);
+		let w = n.db.select(x).from(b.from), T = [];
+		b.where && T.push(b.where), T.push(...r.queryBuilder.buildWhereConditions(o, t, n)), T.length > 0 && (w = w.where(T.length === 1 ? T[0] : P(...T))), S.length > 0 && (w = w.groupBy(...S));
+		let E = n.db.$with(l).as(w), O = {};
+		for (let e of t.dimensions ?? []) O[e] = D`${D.identifier(c)}.${D.identifier(e)}`.as(e);
+		for (let e of t.timeDimensions ?? []) O[e.dimension] = D`${D.identifier(c)}.${D.identifier(e.dimension)}`.as(e.dimension);
 		for (let e of h) {
 			let [, t] = e.split("."), n = o.measures?.[t];
-			k[e] = this.buildKeysOuterAggregation(n?.type ?? "sum", l, t, e);
+			O[e] = this.buildKeysOuterAggregation(n?.type ?? "sum", l, t, e);
 		}
 		for (let e of p) {
 			let [t, n] = e.split("."), r = a.get(t)?.measures?.[n], i = `__reg__${e.replace(".", "__")}`;
-			k[e] = this.buildKeysOuterAggregation(r?.type ?? "sum", c, i, e);
+			O[e] = this.buildKeysOuterAggregation(r?.type ?? "sum", c, i, e);
 		}
-		let A = n.db.with(y, D).select(k).from(O`${O.identifier(c)}`), j = f.map((e, t) => N(O`${O.identifier(c)}.${O.identifier(e)}`, O`${O.identifier(l)}.${O.identifier(s[t])}`)), M = j.length === 1 ? j[0] : F(...j);
-		A = A.leftJoin(O`${O.identifier(l)}`, M);
-		let P = [...(t.dimensions ?? []).map((e) => O`${O.identifier(c)}.${O.identifier(e)}`), ...(t.timeDimensions ?? []).map((e) => O`${O.identifier(c)}.${O.identifier(e.dimension)}`)];
-		P.length > 0 && (A = A.groupBy(...P));
-		let I = r.queryBuilder.buildOrderBy(t, Object.keys(k));
-		return I.length > 0 && (A = A.orderBy(...I)), A = r.queryBuilder.applyLimitAndOffset(A, t), A;
+		let k = n.db.with(y, E).select(O).from(D`${D.identifier(c)}`), A = f.map((e, t) => M(D`${D.identifier(c)}.${D.identifier(e)}`, D`${D.identifier(l)}.${D.identifier(s[t])}`)), j = A.length === 1 ? A[0] : P(...A);
+		k = k.leftJoin(D`${D.identifier(l)}`, j);
+		let N = [...(t.dimensions ?? []).map((e) => D`${D.identifier(c)}.${D.identifier(e)}`), ...(t.timeDimensions ?? []).map((e) => D`${D.identifier(c)}.${D.identifier(e.dimension)}`)];
+		N.length > 0 && (k = k.groupBy(...N));
+		let F = r.queryBuilder.buildOrderBy(t, Object.keys(O));
+		return F.length > 0 && (k = k.orderBy(...F)), k = r.queryBuilder.applyLimitAndOffset(k, t), k;
 	}
 	tryBuildMultiFactMergeQuery(e, t, n, r) {
 		let i = e.multiFactMerge;
@@ -6884,37 +7031,37 @@ var Yt = class {
 		});
 		if (s) return this.buildMultiFactUnionKeysFallbackQuery(t, n, r, i, l, o);
 		let u = i.groups[0].alias, d = i.groups.map((e) => e.alias), f = {};
-		if (o.length > 0) for (let e of o) f[e] = O`${this.coalesceQualifiedColumn(d, e)}`.as(e);
-		for (let e of i.groups) for (let t of e.measures) f[t] = O`coalesce(${O`${O.identifier(e.alias)}.${O.identifier(t)}`}, 0)`.as(t);
-		let p = n.db.with(...l).select(f).from(O`${O.identifier(u)}`), m = /* @__PURE__ */ new Map();
-		for (let e of o) m.set(e, O`${O.identifier(u)}.${O.identifier(e)}`);
+		if (o.length > 0) for (let e of o) f[e] = D`${this.coalesceQualifiedColumn(d, e)}`.as(e);
+		for (let e of i.groups) for (let t of e.measures) f[t] = D`coalesce(${D`${D.identifier(e.alias)}.${D.identifier(t)}`}, 0)`.as(t);
+		let p = n.db.with(...l).select(f).from(D`${D.identifier(u)}`), m = /* @__PURE__ */ new Map();
+		for (let e of o) m.set(e, D`${D.identifier(u)}.${D.identifier(e)}`);
 		for (let e = 1; e < i.groups.length; e++) {
 			let t = i.groups[e].alias, n;
-			if (o.length === 0) n = O`1 = 1`;
+			if (o.length === 0) n = D`1 = 1`;
 			else {
-				let e = o.map((e) => N(m.get(e), O`${O.identifier(t)}.${O.identifier(e)}`));
-				n = e.length === 1 ? e[0] : F(...e);
+				let e = o.map((e) => M(m.get(e), D`${D.identifier(t)}.${D.identifier(e)}`));
+				n = e.length === 1 ? e[0] : P(...e);
 			}
-			if (p = this.applyJoinByType(p, c, O`${O.identifier(t)}`, n), o.length > 0 && c === "full") for (let e of o) m.set(e, O`coalesce(${m.get(e)}, ${O`${O.identifier(t)}.${O.identifier(e)}`})`);
+			if (p = this.applyJoinByType(p, c, D`${D.identifier(t)}`, n), o.length > 0 && c === "full") for (let e of o) m.set(e, D`coalesce(${m.get(e)}, ${D`${D.identifier(t)}.${D.identifier(e)}`})`);
 		}
 		let h = r.queryBuilder.buildOrderBy(t, Object.keys(f));
 		return h.length > 0 && (p = p.orderBy(...h)), r.queryBuilder.applyLimitAndOffset(p, t);
 	}
 	buildMultiFactUnionKeysFallbackQuery(e, t, n, r, i, a) {
-		let o = "mf_all_keys", s = r.groups.map((e) => O`select ${this.buildSharedKeySelection(e.alias, a)} from ${O.identifier(e.alias)}`), c = O`${O.join(s, O` union `)}`, l = t.db.$with(o).as(c), u = {};
-		for (let e of a) u[e] = O`${O.identifier(o)}.${O.identifier(e)}`.as(e);
-		for (let e of r.groups) for (let t of e.measures) u[t] = O`coalesce(${O`${O.identifier(e.alias)}.${O.identifier(t)}`}, 0)`.as(t);
-		let d = t.db.with(...i, l).select(u).from(O`${O.identifier(o)}`);
+		let o = "mf_all_keys", s = r.groups.map((e) => D`select ${this.buildSharedKeySelection(e.alias, a)} from ${D.identifier(e.alias)}`), c = D`${D.join(s, D` union `)}`, l = t.db.$with(o).as(c), u = {};
+		for (let e of a) u[e] = D`${D.identifier(o)}.${D.identifier(e)}`.as(e);
+		for (let e of r.groups) for (let t of e.measures) u[t] = D`coalesce(${D`${D.identifier(e.alias)}.${D.identifier(t)}`}, 0)`.as(t);
+		let d = t.db.with(...i, l).select(u).from(D`${D.identifier(o)}`);
 		for (let e of r.groups) {
-			let t = a.map((t) => N(O`${O.identifier(o)}.${O.identifier(t)}`, O`${O.identifier(e.alias)}.${O.identifier(t)}`)), n = t.length === 1 ? t[0] : F(...t);
-			d = d.leftJoin(O`${O.identifier(e.alias)}`, n);
+			let t = a.map((t) => M(D`${D.identifier(o)}.${D.identifier(t)}`, D`${D.identifier(e.alias)}.${D.identifier(t)}`)), n = t.length === 1 ? t[0] : P(...t);
+			d = d.leftJoin(D`${D.identifier(e.alias)}`, n);
 		}
 		let f = n.queryBuilder.buildOrderBy(e, Object.keys(u));
 		return f.length > 0 && (d = d.orderBy(...f)), n.queryBuilder.applyLimitAndOffset(d, e);
 	}
 	buildSharedKeySelection(e, t) {
-		let n = t.map((t) => O`${O.identifier(e)}.${O.identifier(t)} as ${O.identifier(t)}`);
-		return O.join(n, O`, `);
+		let n = t.map((t) => D`${D.identifier(e)}.${D.identifier(t)} as ${D.identifier(t)}`);
+		return D.join(n, D`, `);
 	}
 	selectRuntimeMergeStrategy(e, t) {
 		return !t || e === "innerJoin" ? "inner" : e === "leftJoin" ? "left" : this.supportsFullOuterJoin() ? "full" : "left";
@@ -6924,9 +7071,9 @@ var Yt = class {
 		return e === "postgres" || e === "duckdb";
 	}
 	coalesceQualifiedColumn(e, t) {
-		if (e.length === 1) return O`${O.identifier(e[0])}.${O.identifier(t)}`;
-		let n = e.map((e) => O`${O.identifier(e)}.${O.identifier(t)}`), r = n[0];
-		for (let e = 1; e < n.length; e++) r = O`coalesce(${r}, ${n[e]})`;
+		if (e.length === 1) return D`${D.identifier(e[0])}.${D.identifier(t)}`;
+		let n = e.map((e) => D`${D.identifier(e)}.${D.identifier(t)}`), r = n[0];
+		for (let e = 1; e < n.length; e++) r = D`coalesce(${r}, ${n[e]})`;
 		return r;
 	}
 	canExecuteKeysDeduplication(e, t, n) {
@@ -6972,10 +7119,10 @@ var Yt = class {
 	}
 	buildKeysOuterAggregation(e, t, n, r) {
 		switch (e) {
-			case "min": return O`min(${O`${O.identifier(t)}.${O.identifier(n)}`})`.as(r);
-			case "max": return O`max(${O`${O.identifier(t)}.${O.identifier(n)}`})`.as(r);
-			case "avg": return O`sum(${O`${O.identifier(t)}.${O.identifier(`__avg_sum__${n}`)}`}) / nullif(sum(${O`${O.identifier(t)}.${O.identifier(`__avg_count__${n}`)}`}), 0)`.as(r);
-			default: return O`coalesce(sum(${O`${O.identifier(t)}.${O.identifier(n)}`}), 0)`.as(r);
+			case "min": return D`min(${D`${D.identifier(t)}.${D.identifier(n)}`})`.as(r);
+			case "max": return D`max(${D`${D.identifier(t)}.${D.identifier(n)}`})`.as(r);
+			case "avg": return D`sum(${D`${D.identifier(t)}.${D.identifier(`__avg_sum__${n}`)}`}) / nullif(sum(${D`${D.identifier(t)}.${D.identifier(`__avg_count__${n}`)}`}), 0)`.as(r);
+			default: return D`coalesce(sum(${D`${D.identifier(t)}.${D.identifier(n)}`}), 0)`.as(r);
 		}
 	}
 	applyJoinByType(e, t, n, r) {
@@ -6995,7 +7142,7 @@ function $(e, t) {
 		console.log(`\n[DC_DEBUG] ${e}`), console.log(n), r.length > 0 && console.log("params:", r), console.log();
 	} catch {}
 }
-var Xt = class {
+var $t = class {
 	queryBuilder;
 	drizzlePlanBuilder;
 	databaseAdapter;
@@ -7011,7 +7158,7 @@ var Xt = class {
 		if (this.dbExecutor = e, this.databaseAdapter = e.databaseAdapter, !this.databaseAdapter) throw Error("DatabaseExecutor must have a databaseAdapter property");
 		this.queryBuilder = new vt(this.databaseAdapter);
 		let r = new bt(), i = new xt(this.queryBuilder);
-		this.drizzlePlanBuilder = new Yt(this.queryBuilder, i, this.databaseAdapter), this.comparisonQueryBuilder = new At(this.databaseAdapter), this.funnelQueryBuilder = new jt(this.databaseAdapter), this.flowQueryBuilder = new Mt(this.databaseAdapter), this.retentionQueryBuilder = new Lt(this.databaseAdapter), this.logicalPlanBuilder = new Rt(r), this.planOptimiser = new zt(), this.cacheConfig = t, this.rlsSetup = n;
+		this.drizzlePlanBuilder = new Qt(this.queryBuilder, i, this.databaseAdapter), this.comparisonQueryBuilder = new Nt(this.databaseAdapter), this.funnelQueryBuilder = new Pt(this.databaseAdapter), this.flowQueryBuilder = new Ft(this.databaseAdapter), this.retentionQueryBuilder = new Bt(this.databaseAdapter), this.logicalPlanBuilder = new Vt(r), this.planOptimiser = new Ht(), this.cacheConfig = t, this.rlsSetup = n;
 	}
 	async withRLSContext(e, t) {
 		if (!this.rlsSetup) return t();
@@ -7215,7 +7362,7 @@ var Xt = class {
 		$("query", s);
 		let c = this.queryBuilder.collectNumericFields(e, t), l = await this.dbExecutor.execute(s, c);
 		return {
-			data: kt(Array.isArray(l) ? l.map((e) => {
+			data: At(Array.isArray(l) ? l.map((e) => {
 				let n = { ...e };
 				if (t.timeDimensions) {
 					for (let e of t.timeDimensions) if (e.dimension in n) {
@@ -7342,7 +7489,7 @@ var Xt = class {
 	}
 	validateQueryForMode(e, t, n) {
 		let r = () => {
-			let e = $t(t, n);
+			let e = nn(t, n);
 			if (!e.isValid) throw Error(`Query validation failed: ${e.errors.join(", ")}`);
 		};
 		({
@@ -7379,7 +7526,7 @@ var Xt = class {
 		let c = this.drizzlePlanBuilder.build(s, t, a);
 		$("query", c);
 		let l = this.queryBuilder.collectNumericFields(e, t), u = await this.dbExecutor.execute(c, l), d = {
-			data: kt(Array.isArray(u) ? u.map((e) => {
+			data: At(Array.isArray(u) ? u.map((e) => {
 				let n = { ...e };
 				if (t.timeDimensions) {
 					for (let e of t.timeDimensions) if (e.dimension in n) {
@@ -7498,7 +7645,7 @@ var Xt = class {
 			}
 		}
 	}
-}, Zt = class t {
+}, en = class t {
 	cubes = /* @__PURE__ */ new Map();
 	metadataCache;
 	cacheConfig;
@@ -7526,7 +7673,7 @@ var Xt = class {
 		return Qe(this.db, this.schema, this.engineType);
 	}
 	createQueryExecutor(e = !1) {
-		return new Xt(this.createDbExecutor(), e ? this.cacheConfig : void 0, this.rlsSetup);
+		return new $t(this.createDbExecutor(), e ? this.cacheConfig : void 0, this.rlsSetup);
 	}
 	formatSqlResult(t) {
 		let n = this.getEngineType() ?? "postgres";
@@ -7720,18 +7867,18 @@ var Xt = class {
 		return Array.from(this.cubes.keys());
 	}
 	validateQuery(e) {
-		return $t(this.cubes, e);
+		return nn(this.cubes, e);
 	}
 	analyzeQuery(e, t) {
 		return this.createQueryExecutor(!0).analyzeQuery(this.cubes, e, t);
 	}
 };
-function Qt(e) {
+function tn(e) {
 	let t = [];
 	return e.timeDimensions?.some((e) => e.compareDateRange && e.compareDateRange.length >= 2) && t.push("comparison"), e.funnel !== void 0 && e.funnel.steps?.length >= 2 && t.push("funnel"), e.flow !== void 0 && e.flow.startingStep !== void 0 && e.flow.eventDimension !== void 0 && t.push("flow"), e.retention !== void 0 && e.retention.timeDimension != null && e.retention.bindingKey != null && t.push("retention"), t.length === 0 ? [] : t;
 }
-function $t(e, t) {
-	let n = [], r = Qt(t);
+function nn(e, t) {
+	let n = [], r = tn(t);
 	if (r.length > 1) return n.push(`Query contains multiple query modes: ${r.join(", ")}`), {
 		isValid: !1,
 		errors: n
@@ -7752,7 +7899,7 @@ function $t(e, t) {
 			}
 		},
 		retention: () => {
-			let r = t.retention, i = tn(r.timeDimension);
+			let r = t.retention, i = an(r.timeDimension);
 			i && !e.has(i) && n.push(`Retention cube not found: ${i}`);
 			let a = r.bindingKey;
 			if (typeof a == "string") {
@@ -7818,7 +7965,7 @@ function $t(e, t) {
 		}
 		o.dimensions[i] || n.push(`TimeDimension '${i}' not found on cube '${t}' (must be a dimension with time type)`);
 	}
-	if (t.filters) for (let r of t.filters) en(r, e, n, a);
+	if (t.filters) for (let r of t.filters) rn(r, e, n, a);
 	if (a.size === 0 && n.push("Query must reference at least one cube through measures, dimensions, or filters"), t.ungrouped) {
 		t.dimensions && t.dimensions.length > 0 || t.timeDimensions && t.timeDimensions.length > 0 || n.push("Ungrouped queries require at least one dimension or time dimension"), t.funnel && n.push("Ungrouped queries are incompatible with funnel analysis"), t.flow && n.push("Ungrouped queries are incompatible with flow analysis"), t.retention && n.push("Ungrouped queries are incompatible with retention analysis"), t.timeDimensions?.some((e) => e.compareDateRange && e.compareDateRange.length > 0) && n.push("Ungrouped queries are incompatible with compareDateRange"), t.timeDimensions?.some((e) => e.fillMissingDates === !0) && n.push("Ungrouped queries are incompatible with fillMissingDates");
 		let r = new Set([
@@ -7873,10 +8020,10 @@ function $t(e, t) {
 		errors: n
 	};
 }
-function en(e, t, n, r) {
+function rn(e, t, n, r) {
 	if ("and" in e || "or" in e) {
 		let i = e.and || e.or || [];
-		for (let e of i) en(e, t, n, r);
+		for (let e of i) rn(e, t, n, r);
 		return;
 	}
 	if (!("member" in e)) {
@@ -7899,7 +8046,7 @@ function en(e, t, n, r) {
 		n.push(`Filter field '${a}' not found on cube '${i}' (must be a dimension or measure)${e}`);
 	}
 }
-function tn(e) {
+function an(e) {
 	if (typeof e == "string") {
 		let [t] = e.split(".");
 		return t || null;
@@ -7907,4 +8054,4 @@ function tn(e) {
 	return e.cube;
 }
 //#endregion
-export { Zt as t };
+export { en as t };