drizzle-cube 0.6.3 → 0.6.4

package/dist/adapters/{compiler-LKTN9PTt.js → compiler-lG6eNsoI.js}

@@ -6317,7 +6317,88 @@ var ti = {
 	buildPeriodNumberExpression(e, t, n) {
 		return this.databaseAdapter.buildDateDiffPeriods(e, t, n);
 	}
-}, ri = class {
+};
+//#endregion
+//#region src/server/logical-plan/schema-builder.ts
+function Q(e) {
+	return {
+		name: e.name,
+		cube: e
+	};
+}
+function ri(e, t) {
+	return e.measures ? e.measures.map((e) => {
+		let [n, i] = e.split("."), a = t.get(n);
+		if (!a) throw Error(r("server.errors.cubeNotFoundForMeasure", {
+			cubeName: n,
+			measure: e
+		}));
+		return {
+			name: e,
+			cube: Q(a),
+			localName: i
+		};
+	}) : [];
+}
+function ii(e, t) {
+	return e.dimensions ? e.dimensions.map((e) => {
+		let [n, i] = e.split("."), a = t.get(n);
+		if (!a) throw Error(r("server.errors.cubeNotFoundForDimension", {
+			cubeName: n,
+			dimension: e
+		}));
+		return {
+			name: e,
+			cube: Q(a),
+			localName: i
+		};
+	}) : [];
+}
+function ai(e, t) {
+	return e.timeDimensions ? e.timeDimensions.map((e) => {
+		let [n, i] = e.dimension.split("."), a = t.get(n);
+		if (!a) throw Error(r("server.errors.cubeNotFoundForTimeDimension", {
+			cubeName: n,
+			timeDimension: e.dimension
+		}));
+		return {
+			name: e.dimension,
+			cube: Q(a),
+			localName: i,
+			granularity: e.granularity,
+			dateRange: e.dateRange,
+			fillMissingDates: e.fillMissingDates,
+			compareDateRange: e.compareDateRange
+		};
+	}) : [];
+}
+function oi(e, t) {
+	return {
+		measures: ri(e, t),
+		dimensions: ii(e, t),
+		timeDimensions: ai(e, t)
+	};
+}
+function si(e, t) {
+	return {
+		measures: e.measures.map((e) => {
+			let [n, r] = e.split(".");
+			return {
+				name: e,
+				cube: {
+					name: n,
+					cube: t.get(n)
+				},
+				localName: r
+			};
+		}),
+		dimensions: [],
+		timeDimensions: []
+	};
+}
+//#endregion
+//#region src/server/logical-plan/logical-plan-builder.ts
+var ci = class {
 	queryPlanner;
 	constructor(e) {
 		this.queryPlanner = e;
@@ -6417,7 +6498,7 @@ var ti = {
 			source: o,
 			strategy: "multiFactMerge",
 			classification: {
-				regular: this.buildMeasureRefs(i, r),
+				regular: ri(i, r),
 				multiplied: [],
 				deduplicationSafe: []
 			}
@@ -6434,11 +6515,11 @@ var ti = {
 		};
 	}
 	buildSimpleSourceFromPhases(e, t, n, r, i) {
-		let a = this.buildMeasureRefs(i, r), o = this.buildDimensionRefs(i, r), s = this.buildTimeDimensionRefs(i, r), c = this.toCubeRef(e), l = t, u = n.map((e) => {
-			let t = this.toCubeRef(e.cube);
+		let a = Q(e), o = t, s = n.map((e) => {
+			let t = Q(e.cube);
 			return {
 				type: "ctePreAggregate",
-				schema: this.buildCTESchema(e, r),
+				schema: si(e, r),
 				cube: t,
 				alias: e.alias,
 				cteAlias: e.cteAlias,
@@ -6453,14 +6534,10 @@ var ti = {
 		});
 		return {
 			type: "simpleSource",
-			schema: {
-				measures: a,
-				dimensions: o,
-				timeDimensions: s
-			},
-			primaryCube: c,
-			joins: l,
-			ctes: u
+			schema: oi(i, r),
+			primaryCube: a,
+			joins: o,
+			ctes: s
 		};
 	}
 	tryBuildMultiFactMergeSource(e, t, n) {
@@ -6485,8 +6562,8 @@ var ti = {
 		if (r.has(a) || !t.get(a)) return null;
 		let o = Array.from(r);
 		if (!o.every((e) => this.hasDirectJoinToSharedDimension(t.get(e), a, t))) return null;
-		let s = this.buildDimensionRefs(e, t), c = this.buildTimeDimensionRefs(e, t), l = {
-			measures: this.buildMeasureRefs(e, t),
+		let s = ii(e, t), c = ai(e, t), l = {
+			measures: ri(e, t),
 			dimensions: s,
 			timeDimensions: c
 		}, u = [];
@@ -6647,20 +6724,16 @@ var ti = {
 		return Array.from(t.values());
 	}
 	buildQueryNode(e, t, n, r) {
-		let i = this.buildMeasureRefs(t, n), a = this.buildDimensionRefs(t, n), o = this.buildTimeDimensionRefs(t, n), s = this.buildOrderByRefs(t), c = t.filters ?? [];
+		let i = oi(t, n), { measures: a, dimensions: o, timeDimensions: s } = i, c = this.buildOrderByRefs(t);
 		return {
 			type: "query",
-			schema: {
-				measures: i,
-				dimensions: a,
-				timeDimensions: o
-			},
+			schema: i,
 			source: e,
-			dimensions: a,
-			measures: i,
-			filters: c,
-			timeDimensions: o,
-			orderBy: s,
+			dimensions: o,
+			measures: a,
+			filters: t.filters ?? [],
+			timeDimensions: s,
+			orderBy: c,
 			limit: t.limit,
 			offset: t.offset,
 			ungrouped: t.ungrouped,
@@ -6681,82 +6754,13 @@ var ti = {
 			cteType: e.cteType
 		}));
 	}
-	buildMeasureRefs(e, t) {
-		return e.measures ? e.measures.map((e) => {
-			let [n, i] = e.split("."), a = t.get(n);
-			if (!a) throw Error(r("server.errors.cubeNotFoundForMeasure", {
-				cubeName: n,
-				measure: e
-			}));
-			return {
-				name: e,
-				cube: this.toCubeRef(a),
-				localName: i
-			};
-		}) : [];
-	}
-	buildDimensionRefs(e, t) {
-		return e.dimensions ? e.dimensions.map((e) => {
-			let [n, i] = e.split("."), a = t.get(n);
-			if (!a) throw Error(r("server.errors.cubeNotFoundForDimension", {
-				cubeName: n,
-				dimension: e
-			}));
-			return {
-				name: e,
-				cube: this.toCubeRef(a),
-				localName: i
-			};
-		}) : [];
-	}
-	buildTimeDimensionRefs(e, t) {
-		return e.timeDimensions ? e.timeDimensions.map((e) => {
-			let [n, i] = e.dimension.split("."), a = t.get(n);
-			if (!a) throw Error(r("server.errors.cubeNotFoundForTimeDimension", {
-				cubeName: n,
-				timeDimension: e.dimension
-			}));
-			return {
-				name: e.dimension,
-				cube: this.toCubeRef(a),
-				localName: i,
-				granularity: e.granularity,
-				dateRange: e.dateRange,
-				fillMissingDates: e.fillMissingDates,
-				compareDateRange: e.compareDateRange
-			};
-		}) : [];
-	}
 	buildOrderByRefs(e) {
 		return e.order ? Object.entries(e.order).map(([e, t]) => ({
 			name: e,
 			direction: t
 		})) : [];
 	}
-	toCubeRef(e) {
-		return {
-			name: e.name,
-			cube: e
-		};
-	}
-	buildCTESchema(e, t) {
-		return {
-			measures: e.measures.map((e) => {
-				let [n, r] = e.split(".");
-				return {
-					name: e,
-					cube: {
-						name: n,
-						cube: t.get(n)
-					},
-					localName: r
-				};
-			}),
-			dimensions: [],
-			timeDimensions: []
-		};
-	}
-}, ii = class {
+}, li = class {
 	name = "identity";
 	optimise(e) {
 		return e;
@@ -6764,11 +6768,11 @@ var ti = {
 };
 //#endregion
 //#region src/server/physical-plan/processors/cte-processor.ts
-function ai(e, t, n, r) {
-	let i = oi(e, n, r), a = [], o = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map();
+function ui(e, t, n, r) {
+	let i = di(e, n, r), a = [], o = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map();
 	if (e.preAggregationCTEs && e.preAggregationCTEs.length > 0) for (let c of e.preAggregationCTEs) {
 		let l = r.cteBuilder.buildPreAggregationCTE(c, t, n, e, i);
-		l && (a.push(l), o.set(c.cube.name, c.cteAlias), si(c, s));
+		l && (a.push(l), o.set(c.cube.name, c.cteAlias), fi(c, s));
 	}
 	return {
 		preBuiltFilterMap: i,
@@ -6777,7 +6781,7 @@ function ai(e, t, n, r) {
 		downstreamCubeMap: s
 	};
 }
-function oi(e, t, n) {
+function di(e, t, n) {
 	let r = /* @__PURE__ */ new Map();
 	if (!e.preAggregationCTEs || e.preAggregationCTEs.length === 0) return r;
 	for (let i of e.preAggregationCTEs) if (!(!i.propagatingFilters || i.propagatingFilters.length === 0)) for (let e of i.propagatingFilters) {
@@ -6791,7 +6795,7 @@ function oi(e, t, n) {
 	}
 	return r;
 }
-function si(e, t) {
+function fi(e, t) {
 	if (e.downstreamJoinKeys) for (let n of e.downstreamJoinKeys) t.set(n.targetCubeName, {
 		cteAlias: e.cteAlias,
 		joinKeys: n.joinKeys
@@ -6799,7 +6803,7 @@ function si(e, t) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/window-processor.ts
-function ci(e, t, n, r, i, a) {
+function pi(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;
@@ -6811,11 +6815,11 @@ function ci(e, t, n, r, i, a) {
 		if (!m?.measures?.[p]) continue;
 		let h = m.measures[p], g = t.preAggregationCTEs?.find((e) => e.cube?.name === f && e.measures?.includes(d)), _;
 		_ = g ? T`sum(${T`${T.identifier(g.cteAlias)}.${T.identifier(p)}`})` : a.queryBuilder.buildMeasureExpression(h, r, m), e[d] || (e[d] = T`${_}`.as(d));
-		let v = li(u, _, n, r, l, t, a);
+		let v = mi(u, _, n, r, l, t, a);
 		v && (e[o] = T`${v}`.as(o));
 	}
 }
-function li(e, t, n, r, i, a, o) {
+function mi(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);
@@ -6885,23 +6889,23 @@ function li(e, t, n, r, i, a, o) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/selection-processor.ts
-function ui(e, t, n, r, i) {
+function hi(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) di(a, o, t, n, r, i), pi(a, o, r);
-	return ci(a, e, t, n, r, i), a;
+	if (e.preAggregationCTEs) for (let o of e.preAggregationCTEs) gi(a, o, t, n, r, i), vi(a, o, r);
+	return pi(a, e, t, n, r, i), a;
 }
-function di(e, t, n, r, i, a) {
+function gi(e, t, n, r, i, a) {
 	let o = t.cube.name;
 	for (let s of t.measures) {
 		if (!e[s]) continue;
 		let [, c] = s.split("."), l = i.get(o);
 		if (!l?.measures?.[c]) continue;
 		let u = l.measures[c], d = T`${T.identifier(t.cteAlias)}.${T.identifier(c)}`, f;
-		f = u.type === "calculated" && u.calculatedSql ? a.queryBuilder.buildCTECalculatedMeasure(u, l, t, i, r) : fi(u, d, t, n, i, a), e[s] = T`${f}`.as(s);
+		f = u.type === "calculated" && u.calculatedSql ? a.queryBuilder.buildCTECalculatedMeasure(u, l, t, i, r) : _i(u, d, t, n, i, a), e[s] = T`${f}`.as(s);
 	}
 }
-function fi(e, t, n, r, i, a) {
-	let o = n.cteReason === "fanOutPrevention", s = mi(n, r, i), c = o || s;
+function _i(e, t, n, r, i, a) {
+	let o = n.cteReason === "fanOutPrevention", s = yi(n, r, i), c = o || s;
 	switch (e.type) {
 		case "count":
 		case "countDistinct":
@@ -6913,7 +6917,7 @@ function fi(e, t, n, r, i, a) {
 		default: return c ? M(t) : j(t);
 	}
 }
-function pi(e, t, n) {
+function vi(e, t, n) {
 	let r = t.cube.name;
 	for (let i in e) {
 		let [a, o] = i.split(".");
@@ -6928,10 +6932,10 @@ function pi(e, t, n) {
 		(u || l && s?.dimensions?.[o]) && (e[i] = T`${T.identifier(t.cteAlias)}.${T.identifier(o)}`.as(i));
 	}
 }
-function mi(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 && hi(e.sourceColumnObj, t, n));
+function yi(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 && bi(e.sourceColumnObj, t, n));
 }
-function hi(e, t, n) {
+function bi(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;
@@ -6945,7 +6949,7 @@ function hi(e, t, n) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/shared.ts
-function Q(e, t, n, r) {
+function $(e, t, n, r) {
 	switch (t) {
 		case "inner": return e.innerJoin(n, r);
 		case "right": return e.rightJoin(n, r);
@@ -6953,20 +6957,20 @@ function Q(e, t, n, r) {
 		default: return e.leftJoin(n, r);
 	}
 }
-function gi(e) {
+function xi(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/processors/joins-processor.ts
-function _i(e, t, n, r, i, a) {
-	let o = [], s = vi(t, n, r, i);
-	s = yi(s, n.joins);
-	let c = /* @__PURE__ */ new Set(), l = bi(e);
+function Si(e, t, n, r, i, a) {
+	let o = [], s = Ci(t, n, r, i);
+	s = wi(s, n.joins);
+	let c = /* @__PURE__ */ new Set(), l = Ti(e);
 	if (e.joinCubes && e.joinCubes.length > 0) for (let n of e.joinCubes) {
 		let r = n.cube.name;
-		l.has(r) && !i.cteAliasMap.has(r) || (s = xi(s, n, e, i, t, o), s = wi(s, n, e, i, t, a, c));
+		l.has(r) && !i.cteAliasMap.has(r) || (s = Ei(s, n, e, i, t, o), s = ki(s, n, e, i, t, a, c));
 	}
 	return {
 		drizzleQuery: s,
@@ -6975,38 +6979,38 @@ function _i(e, t, n, r, i, a) {
 		absorbedIntermediateCubes: l
 	};
 }
-function vi(e, t, n, r) {
+function Ci(e, t, n, r) {
 	return r.ctes.length > 0 ? e.db.with(...r.ctes).select(n).from(t.from) : e.db.select(n).from(t.from);
 }
-function yi(e, t) {
+function wi(e, t) {
 	if (!t) return e;
 	let n = e;
-	for (let e of t) n = Q(n, e.type ?? "left", e.table, e.on);
+	for (let e of t) n = $(n, e.type ?? "left", e.table, e.on);
 	return n;
 }
-function bi(e) {
+function Ti(e) {
 	let t = /* @__PURE__ */ new Set();
 	if (e.preAggregationCTEs) {
 		for (let n of e.preAggregationCTEs) if (n.intermediateJoins && n.intermediateJoins.length > 0) for (let e of n.intermediateJoins) t.add(e.cube.name);
 	}
 	return t;
 }
-function xi(e, t, n, r, i, a) {
+function Ei(e, t, n, r, i, a) {
 	let o = t.junctionTable;
 	if (!o) return e;
-	let s = Si(o, t, n, r), c = [];
+	let s = Di(o, t, n, r), c = [];
 	if (o.securitySql) {
 		let e = o.securitySql(i.securityContext);
 		Array.isArray(e) ? c.push(...e) : c.push(e);
 	}
 	try {
-		let t = Q(e, o.joinType ?? "left", o.table, s);
+		let t = $(e, o.joinType ?? "left", o.table, s);
 		return c.length > 0 && a.push(...c), t;
 	} catch {
 		return e;
 	}
 }
-function Si(e, t, n, r) {
+function Di(e, t, n, r) {
 	let i = e.joinCondition, a = e.sourceCubeName ? r.cteAliasMap.get(e.sourceCubeName) : void 0;
 	if (!a) return i;
 	let o = (n.preAggregationCTEs?.find((t) => t.cube.name === e.sourceCubeName))?.downstreamJoinKeys?.find((e) => e.targetCubeName === t.cube.name);
@@ -7020,7 +7024,7 @@ function Si(e, t, n, r) {
 	}
 	return i;
 }
-function Ci(e, t, n, r, i, a) {
+function Oi(e, t, n, r, i, a) {
 	if (t) return {
 		joinTarget: T`${T.identifier(t)}`,
 		joinCondition: a.cteBuilder.buildCTEJoinCondition(e, t, r),
@@ -7043,26 +7047,26 @@ function Ci(e, t, n, r, i, a) {
 		joinCubeBase: s
 	};
 }
-function wi(e, t, n, r, i, a, o) {
-	let { joinTarget: s, joinCondition: c, securityCondition: l, joinCubeBase: u } = Ci(t, r.cteAliasMap.get(t.cube.name), r, n, i, a), d = t.joinType || "left", f = d !== "inner" && l ? k(c, l) : c;
+function ki(e, t, n, r, i, a, o) {
+	let { joinTarget: s, joinCondition: c, securityCondition: l, joinCubeBase: u } = Oi(t, r.cteAliasMap.get(t.cube.name), r, n, i, a), d = t.joinType || "left", f = d !== "inner" && l ? k(c, l) : c;
 	try {
 		let n;
-		return d === "inner" ? n = e.innerJoin(s, c) : (n = Q(e, d, s, f), l && o.add(t.cube.name)), yi(n, u?.joins);
+		return d === "inner" ? n = e.innerJoin(s, c) : (n = $(e, d, s, f), l && o.add(t.cube.name)), wi(n, u?.joins);
 	} catch {
 		return e;
 	}
 }
 //#endregion
 //#region src/server/physical-plan/processors/predicates-processor.ts
-function Ti(e, t, n, r, i, a, o, s) {
-	let c = Ei(e, t, n, r, i, a, o, s), l = o.drizzleQuery;
+function Ai(e, t, n, r, i, a, o, s) {
+	let c = ji(e, t, n, r, i, a, o, s), l = o.drizzleQuery;
 	if (c.length > 0) {
 		let e = c.length === 1 ? c[0] : k(...c);
 		l = l.where(e);
 	}
-	return Di(l, e, t, n, r, s);
+	return Mi(l, e, t, n, r, s);
 }
-function Ei(e, t, n, r, i, a, o, s) {
+function ji(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;
@@ -7073,7 +7077,7 @@ function Ei(e, t, n, r, i, a, o, s) {
 	let l = s.queryBuilder.buildWhereConditions(e.joinCubes.length > 0 ? r : e.primaryCube, t, n, e, a.preBuiltFilterMap);
 	return l.length > 0 && c.push(...l), c;
 }
-function Di(e, t, n, r, i, a) {
+function Mi(e, t, n, r, i, a) {
 	let o = t.joinCubes.length > 0 ? i : t.primaryCube, s = e, c = a.queryBuilder.buildGroupByFields(o, n, r, t);
 	if (c.length > 0 && (s = s.groupBy(...c)), !n.ungrouped) {
 		let e = a.queryBuilder.buildHavingConditions(o, n, r, t);
@@ -7087,17 +7091,17 @@ function Di(e, t, n, r, i, a) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/keys-dedup-processor.ts
-function Oi(e, t, n, r) {
+function Ni(e, t, n, r) {
 	let i = e.keysDeduplication;
 	if (!i?.multipliedCubeName || !t.measures?.length) return null;
-	let a = e.joinCubes.length > 0 ? gi(e) : new Map([[e.primaryCube.name, e.primaryCube]]), o = a.get(i.multipliedCubeName);
-	if (!o || !Li(t, o, i.multipliedCubeName)) return null;
-	let s = i.primaryKeyDimensions.length > 0 ? i.primaryKeyDimensions : zi(o);
+	let a = e.joinCubes.length > 0 ? xi(e) : new Map([[e.primaryCube.name, e.primaryCube]]), o = a.get(i.multipliedCubeName);
+	if (!o || !Hi(t, o, i.multipliedCubeName)) return null;
+	let s = i.primaryKeyDimensions.length > 0 ? i.primaryKeyDimensions : Wi(o);
 	if (s.length === 0) return null;
-	let c = `${i.multipliedCubeName.toLowerCase()}_keys`, l = `${i.multipliedCubeName.toLowerCase()}_pk_agg`, u = i.regularMeasures ?? [], d = ki(t, n, r, a, o, s, u);
+	let c = `${i.multipliedCubeName.toLowerCase()}_keys`, l = `${i.multipliedCubeName.toLowerCase()}_pk_agg`, u = i.regularMeasures ?? [], d = Pi(t, n, r, a, o, s, u);
 	if (!d) return null;
-	let f = Ai(e, t, n, r, a, c, d.keysSelections, d.keyGroupBy), p = Ni(t, n, r, o, s, d.multipliedMeasures, l);
-	return p ? Ii(t, n, r, a, o, {
+	let f = Fi(e, t, n, r, a, c, d.keysSelections, d.keyGroupBy), p = Ri(t, n, r, o, s, d.multipliedMeasures, l);
+	return p ? Vi(t, n, r, a, o, {
 		keysAlias: c,
 		aggAlias: l,
 		keysCte: f,
@@ -7108,7 +7112,7 @@ function Oi(e, t, n, r) {
 		regularMeasureNames: u
 	}) : null;
 }
-function ki(e, t, n, r, i, a, o) {
+function Pi(e, t, n, r, i, a, o) {
 	let s = {}, c = [];
 	if (e.dimensions) for (let n of e.dimensions) {
 		let [e, i] = n.split("."), a = r.get(e), o = a?.dimensions?.[i];
@@ -7146,35 +7150,35 @@ function ki(e, t, n, r, i, a, o) {
 		multipliedMeasures: d
 	};
 }
-function Ai(e, t, n, r, i, a, o, s) {
+function Fi(e, t, n, r, i, a, o, s) {
 	let c = e.primaryCube.sql(n), l = [];
 	c.where && l.push(c.where);
 	let u = n.db.select(o).from(c.from);
-	if (c.joins) for (let e of c.joins) u = Q(u, e.type ?? "left", e.table, e.on);
-	for (let t of e.joinCubes) u = ji(u, t, n, l);
-	return l.push(...r.queryBuilder.buildWhereConditions(i, t, n)), u = Fi(u, l), s.length > 0 && (u = u.groupBy(...s)), n.db.$with(a).as(u);
+	if (c.joins) for (let e of c.joins) u = $(u, e.type ?? "left", e.table, e.on);
+	for (let t of e.joinCubes) u = Ii(u, t, n, l);
+	return l.push(...r.queryBuilder.buildWhereConditions(i, t, n)), u = Bi(u, l), s.length > 0 && (u = u.groupBy(...s)), n.db.$with(a).as(u);
 }
-function ji(e, t, n, r) {
+function Ii(e, t, n, r) {
 	let i = e;
-	t.junctionTable && (i = Q(i, t.junctionTable.joinType ?? "left", t.junctionTable.table, t.junctionTable.joinCondition), Mi(t.junctionTable.securitySql, n, r));
+	t.junctionTable && (i = $(i, t.junctionTable.joinType ?? "left", t.junctionTable.table, t.junctionTable.joinCondition), Li(t.junctionTable.securitySql, n, r));
 	let a = t.cube.sql(n);
-	if (i = Q(i, t.joinType ?? "left", a.from, t.joinCondition), a.joins) for (let e of a.joins) i = Q(i, e.type ?? "left", e.table, e.on);
+	if (i = $(i, t.joinType ?? "left", a.from, t.joinCondition), a.joins) for (let e of a.joins) i = $(i, e.type ?? "left", e.table, e.on);
 	return a.where && r.push(a.where), i;
 }
-function Mi(e, t, n) {
+function Li(e, t, n) {
 	if (!e) return;
 	let r = e(t.securityContext);
 	Array.isArray(r) ? n.push(...r) : n.push(r);
 }
-function Ni(e, t, n, r, i, a, o) {
-	let s = r.sql(t), c = Pi(t, n, r, i, a);
+function Ri(e, t, n, r, i, a, o) {
+	let s = r.sql(t), c = zi(t, n, r, i, a);
 	if (!c) return null;
 	let l = t.db.select(c.aggSelections).from(s.from);
-	if (s.joins) for (let e of s.joins) l = Q(l, e.type ?? "left", e.table, e.on);
+	if (s.joins) for (let e of s.joins) l = $(l, e.type ?? "left", e.table, e.on);
 	let u = [];
-	return s.where && u.push(s.where), u.push(...n.queryBuilder.buildWhereConditions(r, e, t)), l = Fi(l, u), c.aggGroupBy.length > 0 && (l = l.groupBy(...c.aggGroupBy)), t.db.$with(o).as(l);
+	return s.where && u.push(s.where), u.push(...n.queryBuilder.buildWhereConditions(r, e, t)), l = Bi(l, u), c.aggGroupBy.length > 0 && (l = l.groupBy(...c.aggGroupBy)), t.db.$with(o).as(l);
 }
-function Pi(e, t, n, r, i) {
+function zi(e, t, n, r, i) {
 	let a = {}, o = [];
 	for (let t of r) {
 		let r = n.dimensions?.[t];
@@ -7212,20 +7216,20 @@ function Pi(e, t, n, r, i) {
 		aggGroupBy: o
 	};
 }
-function Fi(e, t) {
+function Bi(e, t) {
 	return t.length === 0 ? e : e.where(t.length === 1 ? t[0] : k(...t));
 }
-function Ii(e, t, n, r, i, a) {
+function Vi(e, t, n, r, i, a) {
 	let { keysAlias: o, aggAlias: s, keysCte: c, aggCte: l, pkDimensions: u, pkAliases: d, multipliedMeasures: f, regularMeasureNames: p } = a, m = {};
 	for (let t of e.dimensions ?? []) m[t] = T`${T.identifier(o)}.${T.identifier(t)}`.as(t);
 	for (let t of e.timeDimensions ?? []) m[t.dimension] = T`${T.identifier(o)}.${T.identifier(t.dimension)}`.as(t.dimension);
 	for (let e of f) {
 		let [, t] = e.split("."), n = i.measures?.[t];
-		m[e] = Bi(n?.type ?? "sum", s, t, e);
+		m[e] = Gi(n?.type ?? "sum", s, t, e);
 	}
 	for (let e of p) {
 		let [t, n] = e.split("."), i = r.get(t)?.measures?.[n], a = `__reg__${e.replace(".", "__")}`;
-		m[e] = Bi(i?.type ?? "sum", o, a, e);
+		m[e] = Gi(i?.type ?? "sum", o, a, e);
 	}
 	let h = t.db.with(c, l).select(m).from(T`${T.identifier(o)}`), g = d.map((e, t) => O(T`${T.identifier(o)}.${T.identifier(e)}`, T`${T.identifier(s)}.${T.identifier(u[t])}`)), _ = g.length === 1 ? g[0] : k(...g);
 	h = h.leftJoin(T`${T.identifier(s)}`, _);
@@ -7234,7 +7238,7 @@ function Ii(e, t, n, r, i, a) {
 	let y = n.queryBuilder.buildOrderBy(e, Object.keys(m));
 	return y.length > 0 && (h = h.orderBy(...y)), n.queryBuilder.applyLimitAndOffset(h, e);
 }
-function Li(e, t, n) {
+function Hi(e, t, n) {
 	if (!e.measures?.length) return !1;
 	for (let r of e.measures) {
 		let [e, i] = r.split(".");
@@ -7249,9 +7253,9 @@ function Li(e, t, n) {
 			"avg"
 		].includes(a.type)) return !1;
 	}
-	return !Ri(e, t, n);
+	return !Ui(e, t, n);
 }
-function Ri(e, t, n) {
+function Ui(e, t, n) {
 	let r = (e) => {
 		if (!e) return !1;
 		for (let i of e) {
@@ -7272,10 +7276,10 @@ function Ri(e, t, n) {
 	};
 	return r(e.filters);
 }
-function zi(e) {
+function Wi(e) {
 	return Object.entries(e.dimensions ?? {}).filter(([, e]) => !!e.primaryKey).map(([e]) => e);
 }
-function Bi(e, t, n, r) {
+function Gi(e, t, n, r) {
 	switch (e) {
 		case "min": return T`min(${T`${T.identifier(t)}.${T.identifier(n)}`})`.as(r);
 		case "max": return T`max(${T`${T.identifier(t)}.${T.identifier(n)}`})`.as(r);
@@ -7285,38 +7289,38 @@ function Bi(e, t, n, r) {
 }
 //#endregion
 //#region src/server/physical-plan/processors/multi-fact-processor.ts
-function Vi(e, t, n, r, i) {
+function Ki(e, t, n, r, i) {
 	let a = e.multiFactMerge;
 	if (!a || a.groups.length < 2) return null;
-	let o = [...t.dimensions ?? [], ...(t.timeDimensions ?? []).map((e) => e.dimension)], s = Array.from(new Set(o)), c = s.length > 0, l = Ji(r), u = c && a.mergeStrategy === "fullJoin" && !l, d = a.groups.map((e) => {
+	let o = [...t.dimensions ?? [], ...(t.timeDimensions ?? []).map((e) => e.dimension)], s = Array.from(new Set(o)), c = s.length > 0, l = $i(r), u = c && a.mergeStrategy === "fullJoin" && !l, d = a.groups.map((e) => {
 		let t = i(e.queryPlan, e.query, n);
 		return n.db.$with(e.alias).as(t);
 	});
-	return u ? Gi(t, n, r, a, d, s) : Wi(t, n, r, a, d, s, qi(a.mergeStrategy, c, l));
+	return u ? Xi(t, n, r, a, d, s) : Yi(t, n, r, a, d, s, Qi(a.mergeStrategy, c, l));
 }
-function Hi(e, t, n) {
+function qi(e, t, n) {
 	let r = {};
-	for (let e of t) r[e] = T`${Yi(n, e)}`.as(e);
+	for (let e of t) r[e] = T`${ea(n, e)}`.as(e);
 	for (let t of e.groups) for (let e of t.measures) r[e] = T`coalesce(${T`${T.identifier(t.alias)}.${T.identifier(e)}`}, 0)`.as(e);
 	return r;
 }
-function Ui(e, t, n) {
+function Ji(e, t, n) {
 	if (t.length === 0) return T`1 = 1`;
 	let r = t.map((t) => O(n.get(t), T`${T.identifier(e)}.${T.identifier(t)}`));
 	return r.length === 1 ? r[0] : k(...r);
 }
-function Wi(e, t, n, r, i, a, o) {
-	let s = r.groups[0].alias, c = Hi(r, a, r.groups.map((e) => e.alias)), l = t.db.with(...i).select(c).from(T`${T.identifier(s)}`), u = /* @__PURE__ */ new Map();
+function Yi(e, t, n, r, i, a, o) {
+	let s = r.groups[0].alias, c = qi(r, a, r.groups.map((e) => e.alias)), l = t.db.with(...i).select(c).from(T`${T.identifier(s)}`), u = /* @__PURE__ */ new Map();
 	for (let e of a) u.set(e, T`${T.identifier(s)}.${T.identifier(e)}`);
 	for (let e = 1; e < r.groups.length; e++) {
-		let t = r.groups[e].alias, n = Ui(t, a, u);
-		if (l = Q(l, o, T`${T.identifier(t)}`, n), a.length > 0 && o === "full") for (let e of a) u.set(e, T`coalesce(${u.get(e)}, ${T`${T.identifier(t)}.${T.identifier(e)}`})`);
+		let t = r.groups[e].alias, n = Ji(t, a, u);
+		if (l = $(l, o, T`${T.identifier(t)}`, n), a.length > 0 && o === "full") for (let e of a) u.set(e, T`coalesce(${u.get(e)}, ${T`${T.identifier(t)}.${T.identifier(e)}`})`);
 	}
 	let d = n.queryBuilder.buildOrderBy(e, Object.keys(c));
 	return d.length > 0 && (l = l.orderBy(...d)), n.queryBuilder.applyLimitAndOffset(l, e);
 }
-function Gi(e, t, n, r, i, a) {
-	let o = "mf_all_keys", s = r.groups.map((e) => T`select ${Ki(e.alias, a)} from ${T.identifier(e.alias)}`), c = T`${T.join(s, T` union `)}`, l = t.db.$with(o).as(c), u = {};
+function Xi(e, t, n, r, i, a) {
+	let o = "mf_all_keys", s = r.groups.map((e) => T`select ${Zi(e.alias, a)} from ${T.identifier(e.alias)}`), c = T`${T.join(s, T` union `)}`, l = t.db.$with(o).as(c), u = {};
 	for (let e of a) u[e] = T`${T.identifier(o)}.${T.identifier(e)}`.as(e);
 	for (let e of r.groups) for (let t of e.measures) u[t] = T`coalesce(${T`${T.identifier(e.alias)}.${T.identifier(t)}`}, 0)`.as(t);
 	let d = t.db.with(...i, l).select(u).from(T`${T.identifier(o)}`);
@@ -7327,18 +7331,18 @@ function Gi(e, t, n, r, i, a) {
 	let f = n.queryBuilder.buildOrderBy(e, Object.keys(u));
 	return f.length > 0 && (d = d.orderBy(...f)), n.queryBuilder.applyLimitAndOffset(d, e);
 }
-function Ki(e, t) {
+function Zi(e, t) {
 	let n = t.map((t) => T`${T.identifier(e)}.${T.identifier(t)} as ${T.identifier(t)}`);
 	return T.join(n, T`, `);
 }
-function qi(e, t, n) {
+function Qi(e, t, n) {
 	return !t || e === "innerJoin" ? "inner" : e === "leftJoin" ? "left" : n ? "full" : "left";
 }
-function Ji(e) {
+function $i(e) {
 	let t = e.databaseAdapter.getEngineType();
 	return t === "postgres" || t === "duckdb";
 }
-function Yi(e, t) {
+function ea(e, t) {
 	if (e.length === 1) return T`${T.identifier(e[0])}.${T.identifier(t)}`;
 	let n = e.map((e) => T`${T.identifier(e)}.${T.identifier(t)}`), r = n[0];
 	for (let e = 1; e < n.length; e++) r = T`coalesce(${r}, ${n[e]})`;
@@ -7346,7 +7350,7 @@ function Yi(e, t) {
 }
 //#endregion
 //#region src/server/physical-plan/drizzle-plan-builder.ts
-var Xi = class {
+var ta = class {
 	queryBuilder;
 	cteBuilder;
 	databaseAdapter;
@@ -7507,23 +7511,23 @@ var Xi = class {
 			queryBuilder: this.queryBuilder,
 			cteBuilder: this.cteBuilder,
 			databaseAdapter: this.databaseAdapter
-		}, i = Vi(e, t, n, r, (e, t, n) => this.build(e, t, n));
+		}, i = Ki(e, t, n, r, (e, t, n) => this.build(e, t, n));
 		if (i) return i;
-		let a = Oi(e, t, n, r);
+		let a = Ni(e, t, n, r);
 		if (a) return a;
-		let o = ai(e, t, n, r), s = e.primaryCube.sql(n), c = e.joinCubes.length > 0 ? gi(e) : new Map([[e.primaryCube.name, e.primaryCube]]);
-		return Ti(e, t, n, c, s, o, _i(e, n, s, ui(e, t, n, c, r), o, r), r);
+		let o = ui(e, t, n, r), s = e.primaryCube.sql(n), c = e.joinCubes.length > 0 ? xi(e) : new Map([[e.primaryCube.name, e.primaryCube]]);
+		return Ai(e, t, n, c, s, o, Si(e, n, s, hi(e, t, n, c, r), o, r), r);
 	}
 };
 //#endregion
 //#region src/server/executor.ts
-function $(e, t) {
+function na(e, t) {
 	if (!(typeof process > "u" || !process.env?.DC_DEBUG)) try {
 		let { sql: n, params: r } = t.toSQL();
 		console.log(`\n[DC_DEBUG] ${e}`), console.log(n), r.length > 0 && console.log("params:", r), console.log();
 	} catch {}
 }
-var Zi = class {
+var ra = class {
 	dbExecutor;
 	queryBuilder;
 	drizzlePlanBuilder;
@@ -7542,7 +7546,7 @@ var Zi = class {
 		if (this.dbExecutor = e, this.databaseAdapter = e.databaseAdapter, !this.databaseAdapter) throw Error(r("server.errors.dbAdapterRequired"));
 		this.queryBuilder = new Fn(this.databaseAdapter);
 		let a = new Xn(), o = new Qn(this.queryBuilder);
-		this.drizzlePlanBuilder = new Xi(this.queryBuilder, o, this.databaseAdapter), this.comparisonQueryBuilder = new Jr(this.databaseAdapter), this.funnelQueryBuilder = new Yr(this.databaseAdapter), this.flowQueryBuilder = new Xr(this.databaseAdapter), this.retentionQueryBuilder = new ni(this.databaseAdapter), this.logicalPlanBuilder = new ri(a), this.planOptimiser = i ?? new ii(), this.rlsSetup = n, this.modeRouter = new Rr({
+		this.drizzlePlanBuilder = new ta(this.queryBuilder, o, this.databaseAdapter), this.comparisonQueryBuilder = new Jr(this.databaseAdapter), this.funnelQueryBuilder = new Yr(this.databaseAdapter), this.flowQueryBuilder = new Xr(this.databaseAdapter), this.retentionQueryBuilder = new ni(this.databaseAdapter), this.logicalPlanBuilder = new ci(a), this.planOptimiser = i ?? new li(), this.rlsSetup = n, this.modeRouter = new Rr({
 			comparison: this.comparisonQueryBuilder,
 			funnel: this.funnelQueryBuilder,
 			flow: this.flowQueryBuilder,
@@ -7622,7 +7626,7 @@ var Zi = class {
 			schema: this.dbExecutor.schema,
 			securityContext: n
 		}, a = this.funnelQueryBuilder.buildFunnelQuery(r, e, i);
-		$("funnel query", a);
+		na("funnel query", a);
 		let o = await a, s = this.funnelQueryBuilder.transformResult(o, r), c = {
 			measures: {},
 			dimensions: {},
@@ -7647,7 +7651,7 @@ var Zi = class {
 			schema: this.dbExecutor.schema,
 			securityContext: n
 		}, a = this.flowQueryBuilder.buildFlowQuery(r, e, i);
-		$("flow query", a);
+		na("flow query", a);
 		let o = await a, s = this.flowQueryBuilder.transformResult(o), c = {
 			measures: {},
 			dimensions: {},
@@ -7670,7 +7674,7 @@ var Zi = class {
 			schema: this.dbExecutor.schema,
 			securityContext: n
 		}, a = this.retentionQueryBuilder.buildRetentionQuery(r, e, i);
-		$("retention query", a);
+		na("retention query", a);
 		let o = await a, s = this.retentionQueryBuilder.transformResult(o, r), c = {
 			measures: {},
 			dimensions: {},
@@ -7694,7 +7698,7 @@ var Zi = class {
 		let { optimisedPlan: o } = this.buildRegularQueryArtifacts(e, t, a), s = this.drizzlePlanBuilder.derivePhysicalPlanContext(o), c = this.drizzlePlanBuilder.toSemanticQuery(o);
 		this.validateSecurityContext(s, a);
 		let l = this.drizzlePlanBuilder.build(s, c, a);
-		$("query", l);
+		na("query", l);
 		let u = this.queryBuilder.collectNumericFields(e, t), d = {
 			data: yr(await this.dbExecutor.execute(l, u), t, this.databaseAdapter),
 			annotation: $n(s, t),
@@ -7827,7 +7831,7 @@ var Zi = class {
 		let r = this.buildComparisonExecutionPlan(t).periodQueries[0];
 		return this.generateUnifiedSQL(e, r, n);
 	}
-}, Qi = [
+}, ia = [
 	"year",
 	"quarter",
 	"month",
@@ -7835,14 +7839,14 @@ var Zi = class {
 	"day",
 	"hour"
 ];
-function $i(e, t) {
+function aa(e, t) {
 	return t.includes(".") ? t : `${e}.${t}`;
 }
-function ea(e) {
+function oa(e) {
 	let t = Object.keys(e.measures), n = Array(t.length);
 	for (let r = 0; r < t.length; r++) {
 		let i = t[r], a = e.measures[i], o;
-		a.drillMembers && a.drillMembers.length > 0 && (o = a.drillMembers.map((t) => $i(e.name, t))), n[r] = {
+		a.drillMembers && a.drillMembers.length > 0 && (o = a.drillMembers.map((t) => aa(e.name, t))), n[r] = {
 			name: `${e.name}.${i}`,
 			title: a.title || i,
 			shortTitle: a.title || i,
@@ -7855,10 +7859,10 @@ function ea(e) {
 	}
 	return n;
 }
-function ta(e) {
+function sa(e) {
 	let t = Object.keys(e.dimensions), n = Array(t.length);
 	for (let r = 0; r < t.length; r++) {
-		let i = t[r], a = e.dimensions[i], o = a.type === "time" ? a.granularities || Qi : void 0;
+		let i = t[r], a = e.dimensions[i], o = a.type === "time" ? a.granularities || ia : void 0;
 		n[r] = {
 			name: `${e.name}.${i}`,
 			title: a.title || i,
@@ -7872,7 +7876,7 @@ function ta(e) {
 	}
 	return n;
 }
-function na(e, t, n) {
+function ca(e, t, n) {
 	let r = [];
 	if (!e.joins) return r;
 	for (let [, i] of Object.entries(e.joins)) {
@@ -7888,20 +7892,20 @@ function na(e, t, n) {
 	}
 	return r;
 }
-function ra(e) {
+function la(e) {
 	let t = [];
 	if (!e.hierarchies) return t;
 	for (let [, n] of Object.entries(e.hierarchies)) t.push({
 		name: n.name,
 		title: n.title || n.name,
 		cubeName: e.name,
-		levels: n.levels.map((t) => $i(e.name, t))
+		levels: n.levels.map((t) => aa(e.name, t))
 	});
 	return t;
 }
 //#endregion
 //#region src/server/compiler.ts
-var ia = class {
+var ua = class {
 	cubes = /* @__PURE__ */ new Map();
 	metadataCache;
 	cacheConfig;
@@ -7930,7 +7934,7 @@ var ia = class {
 		return Mt(this.db, this.schema, this.engineType);
 	}
 	createQueryExecutor(e = !1) {
-		return new Zi(this.createDbExecutor(), e ? this.cacheConfig : void 0, this.rlsSetup, this.planOptimiser);
+		return new ra(this.createDbExecutor(), e ? this.cacheConfig : void 0, this.rlsSetup, this.planOptimiser);
 	}
 	formatSqlResult(e) {
 		let t = this.getEngineType() ?? "postgres";
@@ -8025,7 +8029,7 @@ var ia = class {
 		return "unknown_column";
 	}
 	generateCubeMetadata(e) {
-		let t = ea(e), n = ta(e), r = na(e, this.cubes, (e) => this.getColumnName(e)), i = ra(e);
+		let t = oa(e), n = sa(e), r = ca(e, this.cubes, (e) => this.getColumnName(e)), i = la(e);
 		return {
 			name: e.name,
 			title: e.title || e.name,
@@ -8092,4 +8096,4 @@ var ia = class {
 	}
 };
 //#endregion
-export { ia as t };
+export { ua as t };