drizzle-cube 0.3.28 → 0.3.31

package/dist/server/index.js

@@ -1,4 +1,4 @@
-import { sql as o, eq as X, and as y, SQL as yE, gte as ae, lte as oe, arrayContained as bE, arrayOverlaps as FE, arrayContains as BE, isNotNull as Ct, ne as lt, or as Ce, isNull as ut, notInArray as Lt, inArray as Ge, lt as ye, gt as be, StringChunk as HE, sum as J, max as Z, min as le, count as rt, countDistinct as YE, desc as VE, asc as _t } from "drizzle-orm";
+import { sql as o, eq as K, and as G, SQL as yE, gte as ae, lte as oe, arrayContained as bE, arrayOverlaps as FE, arrayContains as BE, isNotNull as Ct, ne as lt, or as Ce, isNull as ut, notInArray as Lt, inArray as Ge, lt as ye, gt as be, StringChunk as HE, sum as Q, max as Z, min as le, count as rt, countDistinct as YE, desc as VE, asc as _t } from "drizzle-orm";
 class Ue {
   /**
    * Default implementation returns template unchanged
@@ -2007,7 +2007,7 @@ function Dt(n, e, t) {
     return ct(n, e);
   throw new Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
-function Q(n) {
+function X(n) {
   return typeof n == "function" ? n() : n;
 }
 function Tt(n, e) {
@@ -2054,12 +2054,12 @@ function Ts(n, e) {
     throw new Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
   const { table: t, sourceKey: E, targetKey: s, securitySql: i } = n.through, r = [];
   for (const R of E) {
-    const S = R.as || X;
+    const S = R.as || K;
     r.push(S(R.source, R.target));
   }
   const T = [];
   for (const R of s) {
-    const S = R.as || X;
+    const S = R.as || K;
     T.push(S(R.source, R.target));
   }
   let A;
@@ -2073,13 +2073,13 @@ function Ts(n, e) {
       {
         joinType: a,
         table: t,
-        condition: y(...r)
+        condition: G(...r)
       },
       {
         joinType: a,
         table: t,
         // This will be replaced with target cube table in query planner
-        condition: y(...T)
+        condition: G(...T)
       }
     ],
     junctionSecurityConditions: A
@@ -2174,7 +2174,7 @@ function os(n) {
   return {
     measures: n.measures ? [...n.measures].sort() : void 0,
     dimensions: n.dimensions ? [...n.dimensions].sort() : void 0,
-    filters: n.filters ? K(n.filters) : void 0,
+    filters: n.filters ? x(n.filters) : void 0,
     timeDimensions: n.timeDimensions ? Is(n.timeDimensions) : void 0,
     limit: n.limit,
     offset: n.offset,
@@ -2196,7 +2196,7 @@ function As(n) {
     steps: n.steps.map((e) => {
       const t = {
         name: e.name,
-        filter: e.filter ? Array.isArray(e.filter) ? K(e.filter) : K([e.filter])[0] : void 0,
+        filter: e.filter ? Array.isArray(e.filter) ? x(e.filter) : x([e.filter])[0] : void 0,
         timeToConvert: e.timeToConvert
       };
       return "cube" in e && e.cube && (t.cube = e.cube), t;
@@ -2213,7 +2213,7 @@ function Rs(n) {
     // Normalize starting step - sort filters for consistent hashing
     startingStep: {
       name: n.startingStep.name,
-      filter: n.startingStep.filter ? Array.isArray(n.startingStep.filter) ? K(n.startingStep.filter) : K([n.startingStep.filter])[0] : void 0
+      filter: n.startingStep.filter ? Array.isArray(n.startingStep.filter) ? x(n.startingStep.filter) : x([n.startingStep.filter])[0] : void 0
     },
     // CRITICAL: Include step counts in cache key
     stepsBefore: n.stepsBefore,
@@ -2235,18 +2235,18 @@ function Ss(n) {
     periods: n.periods,
     retentionType: n.retentionType,
     // Normalize filters for consistent hashing
-    cohortFilters: n.cohortFilters ? Array.isArray(n.cohortFilters) ? K(n.cohortFilters) : K([n.cohortFilters])[0] : void 0,
-    activityFilters: n.activityFilters ? Array.isArray(n.activityFilters) ? K(n.activityFilters) : K([n.activityFilters])[0] : void 0,
+    cohortFilters: n.cohortFilters ? Array.isArray(n.cohortFilters) ? x(n.cohortFilters) : x([n.cohortFilters])[0] : void 0,
+    activityFilters: n.activityFilters ? Array.isArray(n.activityFilters) ? x(n.activityFilters) : x([n.activityFilters])[0] : void 0,
     // Include breakdown dimensions for cache key
     breakdownDimensions: n.breakdownDimensions
   };
 }
-function K(n) {
+function x(n) {
   return [...n].map((e) => {
     if ("and" in e && e.and)
-      return { and: K(e.and) };
+      return { and: x(e.and) };
     if ("or" in e && e.or)
-      return { or: K(e.or) };
+      return { or: x(e.or) };
     const t = e;
     return {
       ...t,
@@ -2304,7 +2304,7 @@ class Ne {
         const i = typeof s == "number" ? new Date(s * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(s), r = new Date(i);
         r.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? s = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(r.getTime() / 1e3) : r.getTime() : s = r.toISOString();
       }
-      return y(
+      return G(
         ae(e, E),
         oe(e, s)
       );
@@ -2313,7 +2313,7 @@ class Ne {
       const E = this.parseRelativeDateRange(t);
       if (E) {
         let R, S;
-        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (R = Math.floor(E.start.getTime() / 1e3), S = Math.floor(E.end.getTime() / 1e3)) : (R = E.start.getTime(), S = E.end.getTime()) : (R = E.start.toISOString(), S = E.end.toISOString()), y(
+        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (R = Math.floor(E.start.getTime() / 1e3), S = Math.floor(E.end.getTime() / 1e3)) : (R = E.start.getTime(), S = E.end.getTime()) : (R = E.start.toISOString(), S = E.end.toISOString()), G(
           ae(e, R),
           oe(e, S)
         );
@@ -2325,7 +2325,7 @@ class Ne {
       const T = new Date(i);
       T.setUTCHours(23, 59, 59, 999);
       let A, a;
-      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (A = Math.floor(r.getTime() / 1e3), a = Math.floor(T.getTime() / 1e3)) : (A = r.getTime(), a = T.getTime()) : (A = r.toISOString(), a = T.toISOString()), y(
+      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (A = Math.floor(r.getTime() / 1e3), a = Math.floor(T.getTime() / 1e3)) : (A = r.getTime(), a = T.getTime()) : (A = r.toISOString(), a = T.toISOString()), G(
         ae(e, A),
         oe(e, a)
       );
@@ -2476,7 +2476,7 @@ class he {
           return Ge(e, r);
         } else if (r.length === 1) {
           const A = s?.type === "time" && this.dateTimeBuilder.normalizeDate(T) || T;
-          return X(e, A);
+          return K(e, A);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
@@ -2511,7 +2511,7 @@ class he {
               const S = typeof a == "number" ? new Date(a * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(a), I = new Date(S);
               I.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? a = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(I.getTime() / 1e3) : I.getTime() : a = I.toISOString();
             }
-            return y(
+            return G(
               ae(e, A),
               oe(e, a)
             );
@@ -2527,7 +2527,7 @@ class he {
         return A ? be(e, A) : null;
       }
       case "between":
-        return r.length >= 2 ? y(
+        return r.length >= 2 ? G(
           ae(e, r[0]),
           oe(e, r[1])
         ) : null;
@@ -2553,10 +2553,10 @@ class he {
       case "isEmpty":
         return Ce(
           ut(e),
-          X(e, "")
+          K(e, "")
         );
       case "isNotEmpty":
-        return y(
+        return G(
           Ct(e),
           lt(e, "")
         );
@@ -2579,7 +2579,7 @@ class he {
   buildLogicalFilter(e, t, E) {
     if ("and" in e && e.and) {
       const s = e.and.map((i) => this.buildSingleFilter(i, t, E)).filter((i) => i !== null);
-      return s.length > 0 ? s.length === 1 ? s[0] : y(...s) : null;
+      return s.length > 0 ? s.length === 1 ? s[0] : G(...s) : null;
     }
     if ("or" in e && e.or) {
       const s = e.or.map((i) => this.buildSingleFilter(i, t, E)).filter((i) => i !== null);
@@ -3030,7 +3030,7 @@ class H {
             case "count":
             case "countDistinct":
             case "sum":
-              O = J(N);
+              O = Q(N);
               break;
             case "avg":
               O = this.databaseAdapter.buildAvg(N);
@@ -3042,10 +3042,10 @@ class H {
               O = Z(N);
               break;
             case "number":
-              O = J(N);
+              O = Q(N);
               break;
             default:
-              O = J(N);
+              O = Q(N);
           }
           r.set(A, () => O);
         }
@@ -3087,7 +3087,7 @@ class H {
             case "count":
             case "countDistinct":
             case "sum":
-              return J(T);
+              return Q(T);
             case "avg":
               return this.databaseAdapter.buildAvg(T);
             case "min":
@@ -3095,9 +3095,9 @@ class H {
             case "max":
               return Z(T);
             case "number":
-              return J(T);
+              return Q(T);
             default:
-              return J(T);
+              return Q(T);
           }
         }
     }
@@ -3131,7 +3131,7 @@ class H {
         return T ? o`(${T})` : void 0;
       }).filter(Boolean);
       if (i.length > 0) {
-        const r = i.length === 1 ? i[0] : y(...i);
+        const r = i.length === 1 ? i[0] : G(...i);
         s = this.databaseAdapter.buildCaseWhen([
           { when: r, then: s }
         ]);
@@ -3143,7 +3143,7 @@ class H {
       case "countDistinct":
         return YE(s);
       case "sum":
-        return J(s);
+        return Q(s);
       case "avg":
         return this.databaseAdapter.buildAvg(s);
       case "min":
@@ -3662,7 +3662,7 @@ class ls {
       const N = e;
       if (N.and) {
         const O = N.and.map((C) => this.processFilter(C, t, E, s, i)).filter((C) => C !== null);
-        return O.length > 0 ? y(...O) : null;
+        return O.length > 0 ? G(...O) : null;
       }
       if (N.or) {
         const O = N.or.map((C) => this.processFilter(C, t, E, s, i)).filter((C) => C !== null);
@@ -3835,7 +3835,7 @@ class ue {
       const { cube: A, path: a } = r.shift(), R = this.cubes.get(A);
       if (R?.joins)
         for (const [, S] of Object.entries(R.joins)) {
-          const N = Q(S.targetCube).name;
+          const N = X(S.targetCube).name;
           if (T.has(N))
             continue;
           const O = [
@@ -3915,7 +3915,7 @@ class ue {
       const R = this.cubes.get(T);
       if (R?.joins)
         for (const [, S] of Object.entries(R.joins)) {
-          const N = Q(S.targetCube).name;
+          const N = X(S.targetCube).name;
           if (a.has(N))
             continue;
           const O = [
@@ -3963,10 +3963,10 @@ class ue {
   buildJoinCondition(e, t, E) {
     const s = [];
     for (const i of e.on) {
-      const r = t ? o`${o.identifier(t)}.${o.identifier(i.source.name)}` : at(i.source), T = E ? o`${o.identifier(E)}.${o.identifier(i.target.name)}` : at(i.target), A = i.as || X;
+      const r = t ? o`${o.identifier(t)}.${o.identifier(i.source.name)}` : at(i.source), T = E ? o`${o.identifier(E)}.${o.identifier(i.target.name)}` : at(i.target), A = i.as || K;
       s.push(A(r, T));
     }
-    return y(...s);
+    return G(...s);
   }
   /**
    * Get all reachable cubes from a starting cube
@@ -3981,7 +3981,7 @@ class ue {
       const s = E.shift(), i = this.cubes.get(s);
       if (i?.joins)
         for (const [, r] of Object.entries(i.joins)) {
-          const A = Q(r.targetCube).name;
+          const A = X(r.targetCube).name;
           t.has(A) || (t.add(A), E.push(A));
         }
     }
@@ -4247,7 +4247,7 @@ class CE {
       if (!N)
         continue;
       const O = s.measures.filter(
-        (h) => h.startsWith(R.name + ".")
+        (f) => f.startsWith(R.name + ".")
       ), C = this.extractMeasuresFromFilters(s, R), u = [.../* @__PURE__ */ new Set([...O, ...C])];
       if (u.length === 0)
         continue;
@@ -4256,19 +4256,19 @@ class CE {
       if (l?.hasIntermediateHasMany && l.intermediateJoins.length > 0)
         _ = l.correctJoinKeys, U = l.intermediateJoins;
       else {
-        const h = I ? this.findJoinInfoToCube(e, t.name) : this.findJoinInfoForCube(e, t, R.name);
-        if (!h)
+        const f = I ? this.findJoinInfoToCube(e, t.name) : this.findJoinInfoForCube(e, t, R.name);
+        if (!f)
           continue;
-        _ = I ? h.joinDef.on.map((G) => ({
-          sourceColumn: G.target.name,
-          targetColumn: G.source.name,
-          sourceColumnObj: G.target,
-          targetColumnObj: G.source
-        })) : h.joinDef.on.map((G) => ({
-          sourceColumn: G.source.name,
-          targetColumn: G.target.name,
-          sourceColumnObj: G.source,
-          targetColumnObj: G.target
+        _ = I || "reversed" in f && f.reversed ? f.joinDef.on.map((y) => ({
+          sourceColumn: y.target.name,
+          targetColumn: y.source.name,
+          sourceColumnObj: y.target,
+          targetColumnObj: y.source
+        })) : f.joinDef.on.map((y) => ({
+          sourceColumn: y.source.name,
+          targetColumn: y.target.name,
+          sourceColumnObj: y.source,
+          targetColumnObj: y.target
         })), U = void 0;
       }
       const D = this.findPropagatingFilters(s, R, e), m = /* @__PURE__ */ new Map([[R.name, R]]), { aggregateMeasures: P, requiredBaseMeasures: M } = H.categorizeForPostAggregation(
@@ -4276,13 +4276,13 @@ class CE {
         m
       ), g = [.../* @__PURE__ */ new Set([
         ...P,
-        ...Array.from(M).filter((h) => h.startsWith(R.name + "."))
+        ...Array.from(M).filter((f) => f.startsWith(R.name + "."))
       ])];
       if (g.length > 0) {
-        const h = this.expandCalculatedMeasureDependencies(
+        const f = this.expandCalculatedMeasureDependencies(
           R,
           g
-        ), G = this.findDownstreamJoinKeys(
+        ), F = this.findDownstreamJoinKeys(
           R,
           s,
           e
@@ -4292,9 +4292,9 @@ class CE {
           alias: S,
           cteAlias: `${R.name.toLowerCase()}_agg`,
           joinKeys: _,
-          measures: h,
+          measures: f,
           propagatingFilters: D.length > 0 ? D : void 0,
-          downstreamJoinKeys: G.length > 0 ? G : void 0,
+          downstreamJoinKeys: F.length > 0 ? F : void 0,
           intermediateJoins: U && U.length > 0 ? U : void 0,
           cteType: "aggregate",
           cteReason: N
@@ -4311,7 +4311,7 @@ class CE {
     for (const [, E] of e)
       if (E.name !== t && E.joins) {
         for (const [, s] of Object.entries(E.joins))
-          if (Q(s.targetCube).name === t)
+          if (X(s.targetCube).name === t)
             return { sourceCube: E, joinDef: s };
       }
     return null;
@@ -4396,7 +4396,7 @@ class CE {
       if (!i.has(T) && (i.add(T), !!A.joins)) {
         for (const [, a] of Object.entries(A.joins))
           if (a.relationship === "hasMany") {
-            const R = Q(a.targetCube);
+            const R = X(a.targetCube);
             (r.has(T) || r.has(R.name)) && s.push({
               fromCube: T,
               toCube: R.name,
@@ -4436,15 +4436,21 @@ class CE {
    */
   findJoinInfoForCube(e, t, E) {
     if (t.joins) {
-      for (const [, s] of Object.entries(t.joins))
-        if (Q(s.targetCube).name === E)
-          return { sourceCube: t, joinDef: s };
+      for (const [, i] of Object.entries(t.joins))
+        if (X(i.targetCube).name === E)
+          return { sourceCube: t, joinDef: i };
     }
-    for (const [, s] of e)
-      if (s.name !== t.name && s.joins) {
-        for (const [, i] of Object.entries(s.joins))
-          if (Q(i.targetCube).name === E)
-            return { sourceCube: s, joinDef: i };
+    const s = e.get(E);
+    if (s?.joins) {
+      for (const [, i] of Object.entries(s.joins))
+        if (X(i.targetCube).name === t.name)
+          return { sourceCube: s, joinDef: i, reversed: !0 };
+    }
+    for (const [, i] of e)
+      if (!(i.name === t.name || i.name === E) && i.joins) {
+        for (const [, r] of Object.entries(i.joins))
+          if (X(r.targetCube).name === E)
+            return { sourceCube: i, joinDef: r };
       }
     return null;
   }
@@ -4475,7 +4481,7 @@ class CE {
       }
     if (e.joins)
       for (const [, r] of Object.entries(e.joins)) {
-        const A = Q(r.targetCube).name;
+        const A = X(r.targetCube).name;
         if (i.has(A)) {
           const a = r.on.map((R) => ({
             sourceColumn: R.source.name,
@@ -4531,7 +4537,7 @@ class CE {
     if (!e.joins)
       return null;
     for (const [, E] of Object.entries(e.joins))
-      if (Q(E.targetCube).name === t && E.relationship === "hasMany")
+      if (X(E.targetCube).name === t && E.relationship === "hasMany")
         return E;
     return null;
   }
@@ -4559,7 +4565,7 @@ class CE {
       const T = E.get(r);
       if (T?.joins) {
         for (const [, A] of Object.entries(T.joins))
-          if (Q(A.targetCube).name === t.name && A.relationship === "hasMany") {
+          if (X(A.targetCube).name === t.name && A.relationship === "hasMany") {
             const R = this.extractFiltersForCube(e.filters, r), S = this.extractTimeDimensionFiltersForCube(e, r), I = [...R, ...S];
             I.length > 0 && A.on.length > 0 && s.push({
               sourceCube: T,
@@ -4985,16 +4991,16 @@ class us {
       for (const m of t.dimensions) {
         const [P, M] = m.split(".");
         if (P === R && r.dimensions && r.dimensions[M]) {
-          const g = r.dimensions[M], h = this.queryBuilder.buildMeasureExpression({ sql: g.sql, type: "number" }, E);
-          a[M] = o`${h}`.as(M);
+          const g = r.dimensions[M], f = this.queryBuilder.buildMeasureExpression({ sql: g.sql, type: "number" }, E);
+          a[M] = o`${f}`.as(M);
         }
       }
     if (t.timeDimensions)
       for (const m of t.timeDimensions) {
         const [P, M] = m.dimension.split(".");
         if (P === R && r.dimensions && r.dimensions[M]) {
-          const g = r.dimensions[M], h = this.queryBuilder.buildTimeDimensionExpression(g.sql, m.granularity, E);
-          a[M] = o`${h}`.as(M);
+          const g = r.dimensions[M], f = this.queryBuilder.buildTimeDimensionExpression(g.sql, m.granularity, E);
+          a[M] = o`${f}`.as(M);
         }
       }
     if (Object.keys(a).length === 0)
@@ -5002,10 +5008,10 @@ class us {
     let N = E.db.select(a).from(T.from);
     if (A && e.intermediateJoins)
       for (const m of e.intermediateJoins) {
-        const P = m.cube.sql(E), g = [X(m.cteJoinColumn, m.joinDef.on[0]?.target)];
+        const P = m.cube.sql(E), g = [K(m.cteJoinColumn, m.joinDef.on[0]?.target)];
         m.securityFilter && g.push(m.securityFilter), N = N.leftJoin(
           P.from,
-          y(...g)
+          G(...g)
         );
       }
     const O = s ? {
@@ -5016,8 +5022,8 @@ class us {
       for (const m of t.timeDimensions) {
         const [P, M] = m.dimension.split(".");
         if (P === R && r.dimensions && r.dimensions[M] && m.dateRange) {
-          const g = r.dimensions[M], h = this.queryBuilder.buildMeasureExpression({ sql: g.sql, type: "number" }, E), G = this.queryBuilder.buildDateRangeCondition(h, m.dateRange);
-          G && u.push(G);
+          const g = r.dimensions[M], f = this.queryBuilder.buildMeasureExpression({ sql: g.sql, type: "number" }, E), F = this.queryBuilder.buildDateRangeCondition(f, m.dateRange);
+          F && u.push(F);
         }
       }
     if (t.filters) {
@@ -5025,10 +5031,10 @@ class us {
         if (!("and" in m) && !("or" in m) && "member" in m && "operator" in m) {
           const P = m, [M, g] = P.member.split(".");
           if (M === R && r.dimensions && r.dimensions[g]) {
-            const h = r.dimensions[g];
+            const f = r.dimensions[g];
             if (P.operator === "inDateRange") {
-              const G = this.queryBuilder.buildMeasureExpression({ sql: h.sql, type: "number" }, E), B = this.queryBuilder.buildDateRangeCondition(G, P.values);
-              B && u.push(B);
+              const F = this.queryBuilder.buildMeasureExpression({ sql: f.sql, type: "number" }, E), y = this.queryBuilder.buildDateRangeCondition(F, P.values);
+              y && u.push(y);
             }
           }
         }
@@ -5043,7 +5049,7 @@ class us {
       }
     const l = [];
     if (T.where && l.push(T.where), l.push(...C, ...u), l.length > 0) {
-      const m = l.length === 1 ? l[0] : y(...l);
+      const m = l.length === 1 ? l[0] : G(...l);
       N = N.where(m);
     }
     const _ = [], U = /* @__PURE__ */ new Set(), D = (m) => {
@@ -5064,16 +5070,16 @@ class us {
       for (const m of t.dimensions) {
         const [P, M] = m.split(".");
         if (P === R && r.dimensions && r.dimensions[M]) {
-          const g = r.dimensions[M], h = b(g.sql, E);
-          _.push(h);
+          const g = r.dimensions[M], f = b(g.sql, E);
+          _.push(f);
         }
       }
     if (t.timeDimensions)
       for (const m of t.timeDimensions) {
         const [P, M] = m.dimension.split(".");
         if (P === R && r.dimensions && r.dimensions[M]) {
-          const g = r.dimensions[M], h = this.queryBuilder.buildTimeDimensionExpression(g.sql, m.granularity, E);
-          _.push(h);
+          const g = r.dimensions[M], f = this.queryBuilder.buildTimeDimensionExpression(g.sql, m.granularity, E);
+          _.push(f);
         }
       }
     return _.length > 0 && (N = N.groupBy(..._)), E.db.$with(e.cteAlias).as(N);
@@ -5096,13 +5102,13 @@ class us {
     const i = [];
     if (s.intermediateJoins && s.intermediateJoins.length > 0) {
       const r = s.intermediateJoins[0], T = s.joinKeys[0]?.sourceColumnObj, A = o`${o.identifier(t)}.${o.identifier(r.primaryJoinColumn.name)}`;
-      i.push(X(T, A));
+      i.push(K(T, A));
     } else
       for (const r of s.joinKeys) {
         const T = r.sourceColumnObj || o.identifier(r.sourceColumn), A = o`${o.identifier(t)}.${o.identifier(r.targetColumn)}`;
-        i.push(X(T, A));
+        i.push(K(T, A));
       }
-    return i.length === 1 ? i[0] : y(...i);
+    return i.length === 1 ? i[0] : G(...i);
   }
   /**
    * Build a subquery filter for propagating filters from related cubes.
@@ -5131,12 +5137,12 @@ class us {
     }
     if (i.length === 0)
       return null;
-    const r = i.length === 1 ? i[0] : y(...i), T = e.joinConditions;
+    const r = i.length === 1 ? i[0] : G(...i), T = e.joinConditions;
     if (T.length === 1) {
       const { source: A, target: a } = T[0], R = t.db.select({ pk: A }).from(s.from).where(r);
       return o`${a} IN ${R}`;
     } else {
-      const A = T.map((S) => X(S.source, S.target)), a = y(
+      const A = T.map((S) => K(S.source, S.target)), a = G(
         ...A,
         r
       ), R = t.db.select({ one: o`1` }).from(s.from).where(a);
@@ -5743,7 +5749,7 @@ class ps {
           D && C.push(D);
         }
       }
-      return C.length === 0 ? null : C.length === 1 ? C[0] : u ? y(...C) : o`(${o.join(C, o` OR `)})`;
+      return C.length === 0 ? null : C.length === 1 ? C[0] : u ? G(...C) : o`(${o.join(C, o` OR `)})`;
     }
     const T = e, [A, a] = T.member.split("."), R = T.dateRange !== void 0;
     if (T.operator !== "set" && T.operator !== "notSet" && !R && (!T.values || T.values.length === 0 || T.values[0] === void 0 || T.values[0] === ""))
@@ -5799,7 +5805,7 @@ class ps {
       step_time: o`MIN(${e.timeExpr})`.as("step_time")
     }).from(s.from);
     if (r = this.addCrossJoinsToQuery(r, e, t, i), i.length > 0) {
-      const T = i.length === 1 ? i[0] : y(...i);
+      const T = i.length === 1 ? i[0] : G(...i);
       r = r.where(T);
     }
     return r = r.groupBy(e.bindingKeyExpr), t.db.$with(E).as(r);
@@ -5832,7 +5838,7 @@ class ps {
       o`${e.bindingKeyExpr} = ${o.identifier(i)}.binding_key`
     );
     if (R = this.addCrossJoinsToQuery(R, e, t, T), T.length > 0) {
-      const S = T.length === 1 ? T[0] : y(...T);
+      const S = T.length === 1 ? T[0] : G(...T);
       R = R.where(S);
     }
     return R = R.groupBy(e.bindingKeyExpr), t.db.$with(s).as(R);
@@ -5848,8 +5854,8 @@ class ps {
       for (const r of i.joinPath) {
         const T = r.joinDef, A = [];
         for (const I of T.on)
-          I.as ? A.push(I.as(I.source, I.target)) : A.push(X(I.source, I.target));
-        const a = A.length === 1 ? A[0] : y(...A), S = i.cube.sql(E);
+          I.as ? A.push(I.as(I.source, I.target)) : A.push(K(I.source, I.target));
+        const a = A.length === 1 ? A[0] : G(...A), S = i.cube.sql(E);
         e = e.leftJoin(S.from, a), S.where && s.push(S.where);
       }
     return e;
@@ -6158,7 +6164,7 @@ class Ms {
         const I = this.buildFilterCondition(S, t, E);
         I && a.push(I);
       }
-      return a.length === 0 ? null : a.length === 1 ? a[0] : "and" in e ? y(...a) : o`(${o.join(a, o` OR `)})`;
+      return a.length === 0 ? null : a.length === 1 ? a[0] : "and" in e ? G(...a) : o`(${o.join(a, o` OR `)})`;
     }
     if ("type" in e && "filters" in e) {
       const A = e, a = [];
@@ -6166,7 +6172,7 @@ class Ms {
         const S = this.buildFilterCondition(R, t, E);
         S && a.push(S);
       }
-      return a.length === 0 ? null : a.length === 1 ? a[0] : A.type === "and" ? y(...a) : o`(${o.join(a, o` OR `)})`;
+      return a.length === 0 ? null : a.length === 1 ? a[0] : A.type === "and" ? G(...a) : o`(${o.join(a, o` OR `)})`;
     }
     const s = e, [, i] = s.member.split("."), r = t.dimensions?.[i];
     if (!r) return null;
@@ -6198,7 +6204,7 @@ class Ms {
       event_path: o`${T}`.as("event_path")
     }).from(s.from);
     if (a.length > 0) {
-      const S = a.length === 1 ? a[0] : y(...a);
+      const S = a.length === 1 ? a[0] : G(...a);
       R = R.where(S);
     }
     return R = R.groupBy(i, T), e.entityLimit && (R = R.limit(e.entityLimit)), E.db.$with("starting_entities").as(R);
@@ -6215,7 +6221,7 @@ class Ms {
         o`${i} = ${o.identifier(S)}.binding_key`,
         o`${r} < ${o.identifier(S)}.${o.identifier(I)}`
       );
-      const C = O.length === 1 ? O[0] : y(...O), u = a ? o`${T} || ${"→"} || ${o.identifier(S)}.event_path` : o`${T}`, l = E.db.select({
+      const C = O.length === 1 ? O[0] : G(...O), u = a ? o`${T} || ${"→"} || ${o.identifier(S)}.event_path` : o`${T}`, l = E.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${T}`.as("event_type"),
@@ -6244,7 +6250,7 @@ class Ms {
         o`${i} = ${o.identifier(S)}.binding_key`,
         o`${r} > ${o.identifier(S)}.${o.identifier(I)}`
       );
-      const C = O.length === 1 ? O[0] : y(...O), u = a ? o`${o.identifier(S)}.event_path || ${"→"} || ${T}` : o`${T}`, l = E.db.select({
+      const C = O.length === 1 ? O[0] : G(...O), u = a ? o`${o.identifier(S)}.event_path || ${"→"} || ${T}` : o`${T}`, l = E.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${T}`.as("event_type"),
@@ -6275,7 +6281,7 @@ class Ms {
       s.where && O.push(s.where), O.push(
         o`${r} < ${o.identifier(S)}.${o.identifier(I)}`
       );
-      const C = O.length === 1 ? O[0] : y(...O), u = a ? o`${T} || ${"→"} || ${o.identifier(S)}.event_path` : o`${T}`, l = E.db.select({
+      const C = O.length === 1 ? O[0] : G(...O), u = a ? o`${T} || ${"→"} || ${o.identifier(S)}.event_path` : o`${T}`, l = E.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${T}`.as("event_type"),
@@ -6308,7 +6314,7 @@ class Ms {
       s.where && O.push(s.where), O.push(
         o`${r} > ${o.identifier(S)}.${o.identifier(I)}`
       );
-      const C = O.length === 1 ? O[0] : y(...O), u = a ? o`${o.identifier(S)}.event_path || ${"→"} || ${T}` : o`${T}`, l = E.db.select({
+      const C = O.length === 1 ? O[0] : G(...O), u = a ? o`${o.identifier(S)}.event_path || ${"→"} || ${T}` : o`${T}`, l = E.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${T}`.as("event_type"),
@@ -6744,7 +6750,7 @@ class Us {
         const u = this.buildSingleFilterCondition(C, t, E, s);
         u && I.push(u);
       }
-      return I.length === 0 ? null : I.length === 1 ? I[0] : N ? y(...I) : o`(${o.join(I, o` OR `)})`;
+      return I.length === 0 ? null : I.length === 1 ? I[0] : N ? G(...I) : o`(${o.join(I, o` OR `)})`;
     }
     const i = e, [r, T] = i.member.split("."), A = E.get(r);
     if (!A) return null;
@@ -6786,7 +6792,7 @@ class Us {
     }
     let A = E.db.select(T).from(s.from);
     if (i.length > 0) {
-      const R = i.length === 1 ? i[0] : y(...i);
+      const R = i.length === 1 ? i[0] : G(...i);
       A = A.where(R);
     }
     const a = [t.bindingKeyExpr];
@@ -6841,7 +6847,7 @@ class Us {
       o`${t.bindingKeyExpr} = cohort_base.binding_key`
     );
     if (i.length > 0) {
-      const S = i.length === 1 ? i[0] : y(...i);
+      const S = i.length === 1 ? i[0] : G(...i);
       a = a.where(S);
     }
     const R = [
@@ -7374,15 +7380,15 @@ class te {
             if (!s.has(P)) {
               const g = {
                 filters: m.filters
-              }, h = /* @__PURE__ */ new Map([[P, m.sourceCube]]), G = this.queryBuilder.buildWhereConditions(
-                h,
+              }, f = /* @__PURE__ */ new Map([[P, m.sourceCube]]), F = this.queryBuilder.buildWhereConditions(
+                f,
                 g,
                 E
               );
-              s.set(P, G);
+              s.set(P, F);
             }
             const M = s.get(P);
-            M && M.length > 0 && (m.preBuiltFilterSQL = M.length === 1 ? M[0] : y(...M));
+            M && M.length > 0 && (m.preBuiltFilterSQL = M.length === 1 ? M[0] : G(...M));
           }
     }
     const i = [], r = /* @__PURE__ */ new Map(), T = /* @__PURE__ */ new Map();
@@ -7409,58 +7415,58 @@ class te {
           if (S[P]) {
             const [, M] = P.split("."), g = a.get(m);
             if (g && g.measures && g.measures[M]) {
-              const h = g.measures[M], G = o`${o.identifier(D.cteAlias)}.${o.identifier(M)}`;
-              let B;
-              if (h.type === "calculated" && h.calculatedSql)
-                B = this.queryBuilder.buildCTECalculatedMeasure(
-                  h,
+              const f = g.measures[M], F = o`${o.identifier(D.cteAlias)}.${o.identifier(M)}`;
+              let y;
+              if (f.type === "calculated" && f.calculatedSql)
+                y = this.queryBuilder.buildCTECalculatedMeasure(
+                  f,
                   g,
                   D,
                   a,
                   E
                 );
               else {
-                const F = D.cteReason === "fanOutPrevention", W = this.shouldUseMaxForHasManyAtJoinKeyGrain(
+                const B = D.cteReason === "fanOutPrevention", W = this.shouldUseMaxForHasManyAtJoinKeyGrain(
                   D,
                   t,
                   a
-                ), V = F || W;
-                switch (h.type) {
+                ), V = B || W;
+                switch (f.type) {
                   case "count":
                   case "countDistinct":
                   case "sum":
-                    B = V ? Z(G) : J(G);
+                    y = V ? Z(F) : Q(F);
                     break;
                   case "avg":
-                    B = V ? Z(G) : this.databaseAdapter.buildAvg(G);
+                    y = V ? Z(F) : this.databaseAdapter.buildAvg(F);
                     break;
                   case "min":
-                    B = le(G);
+                    y = le(F);
                     break;
                   case "max":
-                    B = Z(G);
+                    y = Z(F);
                     break;
                   case "number":
-                    B = V ? Z(G) : J(G);
+                    y = V ? Z(F) : Q(F);
                     break;
                   default:
-                    B = V ? Z(G) : J(G);
+                    y = V ? Z(F) : Q(F);
                 }
               }
-              S[P] = o`${B}`.as(P);
+              S[P] = o`${y}`.as(P);
             }
           }
         for (const P in S) {
           const [M, g] = P.split(".");
           if (M === m) {
-            const h = a.get(m), G = h && h.dimensions?.[g], B = P.startsWith(m + ".");
-            if (G || B) {
-              let F = D.joinKeys.find((W) => W.targetColumn === g);
-              if (!F && h?.dimensions?.[g]) {
-                const W = h.dimensions[g].sql;
-                F = D.joinKeys.find((V) => V.targetColumnObj === W);
+            const f = a.get(m), F = f && f.dimensions?.[g], y = P.startsWith(m + ".");
+            if (F || y) {
+              let B = D.joinKeys.find((W) => W.targetColumn === g);
+              if (!B && f?.dimensions?.[g]) {
+                const W = f.dimensions[g].sql;
+                B = D.joinKeys.find((V) => V.targetColumnObj === W);
               }
-              F ? S[P] = o`${o.identifier(D.cteAlias)}.${o.identifier(g)}`.as(P) : B && h?.dimensions?.[g] && (S[P] = o`${o.identifier(D.cteAlias)}.${o.identifier(g)}`.as(P));
+              B ? S[P] = o`${o.identifier(D.cteAlias)}.${o.identifier(g)}`.as(P) : y && f?.dimensions?.[g] && (S[P] = o`${o.identifier(D.cteAlias)}.${o.identifier(g)}`.as(P));
             }
           }
         }
@@ -7471,20 +7477,20 @@ class te {
         if (M?.measures?.[P]) {
           const g = M.measures[P];
           if (H.isPostAggregationWindow(g)) {
-            const h = H.getWindowBaseMeasure(g, m);
-            if (h) {
-              const [G, B] = h.split("."), F = a.get(G);
-              if (F?.measures?.[B]) {
-                const W = F.measures[B], V = e.preAggregationCTEs?.find(
-                  (ie) => ie.cube?.name === G && ie.measures?.includes(h)
+            const f = H.getWindowBaseMeasure(g, m);
+            if (f) {
+              const [F, y] = f.split("."), B = a.get(F);
+              if (B?.measures?.[y]) {
+                const W = B.measures[y], V = e.preAggregationCTEs?.find(
+                  (ie) => ie.cube?.name === F && ie.measures?.includes(f)
                 );
                 let j;
                 if (V) {
-                  const ie = o`${o.identifier(V.cteAlias)}.${o.identifier(B)}`;
+                  const ie = o`${o.identifier(V.cteAlias)}.${o.identifier(y)}`;
                   j = o`sum(${ie})`;
                 } else
-                  j = this.queryBuilder.buildMeasureExpression(W, E, F);
-                S[h] || (S[h] = o`${j}`.as(h));
+                  j = this.queryBuilder.buildMeasureExpression(W, E, B);
+                S[f] || (S[f] = o`${j}`.as(f));
                 const Oe = this.buildPostAggregationWindowExpression(
                   g,
                   j,
@@ -7531,59 +7537,59 @@ class te {
           continue;
         const P = r.get(D.cube.name);
         if (D.junctionTable) {
-          const F = D.junctionTable, W = [];
-          if (F.securitySql) {
-            const V = F.securitySql(E.securityContext);
+          const B = D.junctionTable, W = [];
+          if (B.securitySql) {
+            const V = B.securitySql(E.securityContext);
             Array.isArray(V) ? W.push(...V) : W.push(V);
           }
           try {
-            switch (F.joinType || "left") {
+            switch (B.joinType || "left") {
               case "left":
-                N = N.leftJoin(F.table, F.joinCondition);
+                N = N.leftJoin(B.table, B.joinCondition);
                 break;
               case "inner":
-                N = N.innerJoin(F.table, F.joinCondition);
+                N = N.innerJoin(B.table, B.joinCondition);
                 break;
               case "right":
-                N = N.rightJoin(F.table, F.joinCondition);
+                N = N.rightJoin(B.table, B.joinCondition);
                 break;
               case "full":
-                N = N.fullJoin(F.table, F.joinCondition);
+                N = N.fullJoin(B.table, B.joinCondition);
                 break;
             }
             W.length > 0 && I.push(...W);
           } catch {
           }
         }
-        let M, g, h;
+        let M, g, f;
         if (P)
-          M = o`${o.identifier(P)}`, g = this.cteBuilder.buildCTEJoinCondition(D, P, e), h = void 0;
+          M = o`${o.identifier(P)}`, g = this.cteBuilder.buildCTEJoinCondition(D, P, e), f = void 0;
         else {
-          const F = T.get(D.cube.name), W = D.cube.sql(E);
-          if (M = W.from, h = W.where, F) {
+          const B = T.get(D.cube.name), W = D.cube.sql(E);
+          if (M = W.from, f = W.where, B) {
             const V = [];
-            for (const j of F.joinKeys) {
-              const Oe = o`${o.identifier(F.cteAlias)}.${o.identifier(j.sourceColumn)}`, ie = j.targetColumnObj || o.identifier(j.targetColumn);
-              V.push(X(Oe, ie));
+            for (const j of B.joinKeys) {
+              const Oe = o`${o.identifier(B.cteAlias)}.${o.identifier(j.sourceColumn)}`, ie = j.targetColumnObj || o.identifier(j.targetColumn);
+              V.push(K(Oe, ie));
             }
-            g = V.length === 1 ? V[0] : y(...V);
+            g = V.length === 1 ? V[0] : G(...V);
           } else
             g = D.joinCondition;
         }
-        const G = D.joinType || "left", B = G !== "inner" && h ? y(g, h) : g;
+        const F = D.joinType || "left", y = F !== "inner" && f ? G(g, f) : g;
         try {
-          switch (G) {
+          switch (F) {
             case "left":
-              N = N.leftJoin(M, B), h && O.add(D.cube.name);
+              N = N.leftJoin(M, y), f && O.add(D.cube.name);
               break;
             case "inner":
               N = N.innerJoin(M, g);
               break;
             case "right":
-              N = N.rightJoin(M, B), h && O.add(D.cube.name);
+              N = N.rightJoin(M, y), f && O.add(D.cube.name);
               break;
             case "full":
-              N = N.fullJoin(M, B), h && O.add(D.cube.name);
+              N = N.fullJoin(M, y), f && O.add(D.cube.name);
               break;
           }
         } catch {
@@ -7608,7 +7614,7 @@ class te {
       // Reuse pre-built filters for parameter deduplication
     );
     if (u.length > 0 && I.push(...u), I.length > 0) {
-      const D = I.length === 1 ? I[0] : y(...I);
+      const D = I.length === 1 ? I[0] : G(...I);
       N = N.where(D);
     }
     const l = this.queryBuilder.buildGroupByFields(
@@ -7629,7 +7635,7 @@ class te {
       // Pass the queryPlan to handle CTE scenarios
     );
     if (_.length > 0) {
-      const D = _.length === 1 ? _[0] : y(..._);
+      const D = _.length === 1 ? _[0] : G(..._);
       N = N.having(D);
     }
     const U = this.queryBuilder.buildOrderBy(t);
@@ -23343,9 +23349,9 @@ const Dr = [
   "SHOW FUNCTIONS",
   "SHOW SESSION"
 ]), Qr = L([
-  "UNION [ALL | DISTINCT]",
-  "EXCEPT [ALL | DISTINCT]",
-  "INTERSECT [ALL | DISTINCT]"
+  "UNION [ALL | DISTINCT] [CORRESPONDING]",
+  "EXCEPT [ALL | DISTINCT] [CORRESPONDING]",
+  "INTERSECT [ALL | DISTINCT] [CORRESPONDING]"
 ]), kr = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
@@ -26069,20 +26075,20 @@ const Dr = [
   tidb: mi,
   transactsql: aT,
   trino: Zr
-}, Symbol.toStringTag, { value: "Module" })), Ie = (n) => n[n.length - 1], _E = (n) => n.sort((e, t) => t.length - e.length || e.localeCompare(t)), _e = (n) => n.replace(/\s+/gu, " "), tt = (n) => /\n/.test(n), x = (n) => n.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), Zt = /\s+/uy, ne = (n) => new RegExp(`(?:${n})`, "uy"), hT = (n) => n.split("").map((e) => / /gu.test(e) ? "\\s+" : `[${e.toUpperCase()}${e.toLowerCase()}]`).join(""), gT = (n) => n + "(?:-" + n + ")*", GT = ({ prefixes: n, requirePrefix: e }) => `(?:${n.map(hT).join("|")}${e ? "" : "|"})`, yT = (n) => new RegExp(`(?:${n.map(x).join("|")}).*?(?=\r
+}, Symbol.toStringTag, { value: "Module" })), Ie = (n) => n[n.length - 1], _E = (n) => n.sort((e, t) => t.length - e.length || e.localeCompare(t)), _e = (n) => n.replace(/\s+/gu, " "), tt = (n) => /\n/.test(n), J = (n) => n.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), Zt = /\s+/uy, ne = (n) => new RegExp(`(?:${n})`, "uy"), hT = (n) => n.split("").map((e) => / /gu.test(e) ? "\\s+" : `[${e.toUpperCase()}${e.toLowerCase()}]`).join(""), gT = (n) => n + "(?:-" + n + ")*", GT = ({ prefixes: n, requirePrefix: e }) => `(?:${n.map(hT).join("|")}${e ? "" : "|"})`, yT = (n) => new RegExp(`(?:${n.map(J).join("|")}).*?(?=\r
 |\r|
 |$)`, "uy"), zt = (n, e = []) => {
   const t = n === "open" ? 0 : 1, E = ["()", ...e].map((s) => s[t]);
-  return ne(E.map(x).join("|"));
-}, eE = (n) => ne(`${_E(n).map(x).join("|")}`), bT = ({ rest: n, dashes: e }) => n || e ? `(?![${n || ""}${e ? "-" : ""}])` : "", k = (n, e = {}) => {
+  return ne(E.map(J).join("|"));
+}, eE = (n) => ne(`${_E(n).map(J).join("|")}`), bT = ({ rest: n, dashes: e }) => n || e ? `(?![${n || ""}${e ? "-" : ""}])` : "", k = (n, e = {}) => {
   if (n.length === 0)
     return /^\b$/u;
-  const t = bT(e), E = _E(n).map(x).join("|").replace(/ /gu, "\\s+");
+  const t = bT(e), E = _E(n).map(J).join("|").replace(/ /gu, "\\s+");
   return new RegExp(`(?:${E})${t}\\b`, "iuy");
 }, Et = (n, e) => {
   if (!n.length)
     return;
-  const t = n.map(x).join("|");
+  const t = n.map(J).join("|");
   return ne(`(?:${t})(?:${e})`);
 }, FT = () => {
   const n = {
@@ -26090,7 +26096,7 @@ const Dr = [
     "[": "]",
     "(": ")",
     "{": "}"
-  }, e = "{left}(?:(?!{right}').)*?{right}", t = Object.entries(n).map(([r, T]) => e.replace(/{left}/g, x(r)).replace(/{right}/g, x(T))), E = x(Object.keys(n).join(""));
+  }, e = "{left}(?:(?!{right}').)*?{right}", t = Object.entries(n).map(([r, T]) => e.replace(/{left}/g, J(r)).replace(/{right}/g, J(T))), E = J(Object.keys(n).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${E}])(?:(?!\k<tag>').)*?\k<tag>`}|${t.join("|")})'`;
 }, tE = {
   // - backtick quoted (using `` to escape)
@@ -26118,7 +26124,7 @@ const Dr = [
   // Oracle q'' strings: q'<text>' q'|text|' ...
   "q''": FT()
 }, cE = (n) => typeof n == "string" ? tE[n] : "regex" in n ? n.regex : GT(n) + tE[n.quote], BT = (n) => ne(n.map((e) => "regex" in e ? e.regex : cE(e)).join("|")), dE = (n) => n.map(cE).join("|"), EE = (n) => ne(dE(n)), HT = (n = {}) => ne(DE(n)), DE = ({ first: n, rest: e, dashes: t, allowFirstCharNumber: E } = {}) => {
-  const s = "\\p{Alphabetic}\\p{Mark}_", i = "\\p{Decimal_Number}", r = x(n ?? ""), T = x(e ?? ""), A = E ? `[${s}${i}${r}][${s}${i}${T}]*` : `[${s}${r}][${s}${i}${T}]*`;
+  const s = "\\p{Alphabetic}\\p{Mark}_", i = "\\p{Decimal_Number}", r = J(n ?? ""), T = J(e ?? ""), A = E ? `[${s}${i}${r}][${s}${i}${T}]*` : `[${s}${r}][${s}${i}${T}]*`;
   return t ? gT(A) : A;
 };
 function mE(n, e) {
@@ -26425,7 +26431,7 @@ class WT {
       {
         type: d.QUOTED_PARAMETER,
         regex: Et(A.quoted, dE(e.identTypes)),
-        key: (a) => (({ tokenKey: R, quoteChar: S }) => R.replace(new RegExp(x("\\" + S), "gu"), S))({
+        key: (a) => (({ tokenKey: R, quoteChar: S }) => R.replace(new RegExp(J("\\" + S), "gu"), S))({
           tokenKey: a.slice(2, -1),
           quoteChar: a.slice(-1)
         })
@@ -26852,7 +26858,7 @@ var p;
 function st(n) {
   return n[0];
 }
-const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
+const h = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
   type: p.keyword,
   tokenType: n.type,
   text: n.text,
@@ -26872,7 +26878,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
   }
   return n;
 }, aa = {
-  Lexer: f,
+  Lexer: h,
   ParserRules: [
     { name: "main$ebnf$1", symbols: [] },
     { name: "main$ebnf$1", symbols: ["main$ebnf$1", "statement"], postprocess: (n) => n[0].concat([n[1]]) },
@@ -26884,8 +26890,8 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
         return e && !e.hasSemicolon ? e.children.length > 0 ? n : n.slice(0, -1) : n;
       }
     },
-    { name: "statement$subexpression$1", symbols: [f.has("DELIMITER") ? { type: "DELIMITER" } : DELIMITER] },
-    { name: "statement$subexpression$1", symbols: [f.has("EOF") ? { type: "EOF" } : EOF] },
+    { name: "statement$subexpression$1", symbols: [h.has("DELIMITER") ? { type: "DELIMITER" } : DELIMITER] },
+    { name: "statement$subexpression$1", symbols: [h.has("EOF") ? { type: "EOF" } : EOF] },
     {
       name: "statement",
       symbols: ["expressions_or_clauses", "statement$subexpression$1"],
@@ -26911,12 +26917,12 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     { name: "clause", symbols: ["clause$subexpression$1"], postprocess: Ee },
     { name: "limit_clause$ebnf$1$subexpression$1$ebnf$1", symbols: ["free_form_sql"] },
     { name: "limit_clause$ebnf$1$subexpression$1$ebnf$1", symbols: ["limit_clause$ebnf$1$subexpression$1$ebnf$1", "free_form_sql"], postprocess: (n) => n[0].concat([n[1]]) },
-    { name: "limit_clause$ebnf$1$subexpression$1", symbols: [f.has("COMMA") ? { type: "COMMA" } : COMMA, "limit_clause$ebnf$1$subexpression$1$ebnf$1"] },
+    { name: "limit_clause$ebnf$1$subexpression$1", symbols: [h.has("COMMA") ? { type: "COMMA" } : COMMA, "limit_clause$ebnf$1$subexpression$1$ebnf$1"] },
     { name: "limit_clause$ebnf$1", symbols: ["limit_clause$ebnf$1$subexpression$1"], postprocess: st },
     { name: "limit_clause$ebnf$1", symbols: [], postprocess: () => null },
     {
       name: "limit_clause",
-      symbols: [f.has("LIMIT") ? { type: "LIMIT" } : LIMIT, "_", "expression_chain_", "limit_clause$ebnf$1"],
+      symbols: [h.has("LIMIT") ? { type: "LIMIT" } : LIMIT, "_", "expression_chain_", "limit_clause$ebnf$1"],
       postprocess: ([n, e, t, E]) => {
         if (E) {
           const [s, i] = E;
@@ -26942,7 +26948,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     { name: "select_clause$subexpression$1", symbols: ["asteriskless_free_form_sql", "select_clause$subexpression$1$ebnf$2"] },
     {
       name: "select_clause",
-      symbols: [f.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT, "select_clause$subexpression$1"],
+      symbols: [h.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT, "select_clause$subexpression$1"],
       postprocess: ([n, [e, t]]) => ({
         type: p.clause,
         nameKw: $(n),
@@ -26951,7 +26957,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     },
     {
       name: "select_clause",
-      symbols: [f.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT],
+      symbols: [h.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT],
       postprocess: ([n]) => ({
         type: p.clause,
         nameKw: $(n),
@@ -26960,14 +26966,14 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     },
     {
       name: "all_columns_asterisk",
-      symbols: [f.has("ASTERISK") ? { type: "ASTERISK" } : ASTERISK],
+      symbols: [h.has("ASTERISK") ? { type: "ASTERISK" } : ASTERISK],
       postprocess: () => ({ type: p.all_columns_asterisk })
     },
     { name: "other_clause$ebnf$1", symbols: [] },
     { name: "other_clause$ebnf$1", symbols: ["other_clause$ebnf$1", "free_form_sql"], postprocess: (n) => n[0].concat([n[1]]) },
     {
       name: "other_clause",
-      symbols: [f.has("RESERVED_CLAUSE") ? { type: "RESERVED_CLAUSE" } : RESERVED_CLAUSE, "other_clause$ebnf$1"],
+      symbols: [h.has("RESERVED_CLAUSE") ? { type: "RESERVED_CLAUSE" } : RESERVED_CLAUSE, "other_clause$ebnf$1"],
       postprocess: ([n, e]) => ({
         type: p.clause,
         nameKw: $(n),
@@ -26978,7 +26984,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     { name: "set_operation$ebnf$1", symbols: ["set_operation$ebnf$1", "free_form_sql"], postprocess: (n) => n[0].concat([n[1]]) },
     {
       name: "set_operation",
-      symbols: [f.has("RESERVED_SET_OPERATION") ? { type: "RESERVED_SET_OPERATION" } : RESERVED_SET_OPERATION, "set_operation$ebnf$1"],
+      symbols: [h.has("RESERVED_SET_OPERATION") ? { type: "RESERVED_SET_OPERATION" } : RESERVED_SET_OPERATION, "set_operation$ebnf$1"],
       postprocess: ([n, e]) => ({
         type: p.set_operation,
         nameKw: $(n),
@@ -27051,7 +27057,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     { name: "atomic_expression", symbols: ["atomic_expression$subexpression$1"], postprocess: Ee },
     {
       name: "array_subscript",
-      symbols: [f.has("ARRAY_IDENTIFIER") ? { type: "ARRAY_IDENTIFIER" } : ARRAY_IDENTIFIER, "_", "square_brackets"],
+      symbols: [h.has("ARRAY_IDENTIFIER") ? { type: "ARRAY_IDENTIFIER" } : ARRAY_IDENTIFIER, "_", "square_brackets"],
       postprocess: ([n, e, t]) => ({
         type: p.array_subscript,
         array: w({ type: p.identifier, quoted: !1, text: n.text }, { trailing: e }),
@@ -27060,7 +27066,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     },
     {
       name: "array_subscript",
-      symbols: [f.has("ARRAY_KEYWORD") ? { type: "ARRAY_KEYWORD" } : ARRAY_KEYWORD, "_", "square_brackets"],
+      symbols: [h.has("ARRAY_KEYWORD") ? { type: "ARRAY_KEYWORD" } : ARRAY_KEYWORD, "_", "square_brackets"],
       postprocess: ([n, e, t]) => ({
         type: p.array_subscript,
         array: w($(n), { trailing: e }),
@@ -27069,7 +27075,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     },
     {
       name: "function_call",
-      symbols: [f.has("RESERVED_FUNCTION_NAME") ? { type: "RESERVED_FUNCTION_NAME" } : RESERVED_FUNCTION_NAME, "_", "parenthesis"],
+      symbols: [h.has("RESERVED_FUNCTION_NAME") ? { type: "RESERVED_FUNCTION_NAME" } : RESERVED_FUNCTION_NAME, "_", "parenthesis"],
       postprocess: ([n, e, t]) => ({
         type: p.function_call,
         nameKw: w($(n), { trailing: e }),
@@ -27116,7 +27122,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     { name: "property_access$subexpression$1", symbols: ["parameter"] },
     {
       name: "property_access",
-      symbols: ["atomic_expression", "_", f.has("PROPERTY_ACCESS_OPERATOR") ? { type: "PROPERTY_ACCESS_OPERATOR" } : PROPERTY_ACCESS_OPERATOR, "_", "property_access$subexpression$1"],
+      symbols: ["atomic_expression", "_", h.has("PROPERTY_ACCESS_OPERATOR") ? { type: "PROPERTY_ACCESS_OPERATOR" } : PROPERTY_ACCESS_OPERATOR, "_", "property_access$subexpression$1"],
       postprocess: (
         // Allowing property to be <array_subscript> is currently a hack.
         // A better way would be to allow <property_access> on the left side of array_subscript,
@@ -27132,7 +27138,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     },
     {
       name: "between_predicate",
-      symbols: [f.has("BETWEEN") ? { type: "BETWEEN" } : BETWEEN, "_", "andless_expression_chain", "_", f.has("AND") ? { type: "AND" } : AND, "_", "andless_expression"],
+      symbols: [h.has("BETWEEN") ? { type: "BETWEEN" } : BETWEEN, "_", "andless_expression_chain", "_", h.has("AND") ? { type: "AND" } : AND, "_", "andless_expression"],
       postprocess: ([n, e, t, E, s, i, r]) => ({
         type: p.between_predicate,
         betweenKw: $(n),
@@ -27147,7 +27153,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     { name: "case_expression$ebnf$2", symbols: ["case_expression$ebnf$2", "case_clause"], postprocess: (n) => n[0].concat([n[1]]) },
     {
       name: "case_expression",
-      symbols: [f.has("CASE") ? { type: "CASE" } : CASE, "_", "case_expression$ebnf$1", "case_expression$ebnf$2", f.has("END") ? { type: "END" } : END],
+      symbols: [h.has("CASE") ? { type: "CASE" } : CASE, "_", "case_expression$ebnf$1", "case_expression$ebnf$2", h.has("END") ? { type: "END" } : END],
       postprocess: ([n, e, t, E, s]) => ({
         type: p.case_expression,
         caseKw: w($(n), { trailing: e }),
@@ -27158,7 +27164,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     },
     {
       name: "case_clause",
-      symbols: [f.has("WHEN") ? { type: "WHEN" } : WHEN, "_", "expression_chain_", f.has("THEN") ? { type: "THEN" } : THEN, "_", "expression_chain_"],
+      symbols: [h.has("WHEN") ? { type: "WHEN" } : WHEN, "_", "expression_chain_", h.has("THEN") ? { type: "THEN" } : THEN, "_", "expression_chain_"],
       postprocess: ([n, e, t, E, s, i]) => ({
         type: p.case_when,
         whenKw: w($(n), { trailing: e }),
@@ -27169,42 +27175,42 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     },
     {
       name: "case_clause",
-      symbols: [f.has("ELSE") ? { type: "ELSE" } : ELSE, "_", "expression_chain_"],
+      symbols: [h.has("ELSE") ? { type: "ELSE" } : ELSE, "_", "expression_chain_"],
       postprocess: ([n, e, t]) => ({
         type: p.case_else,
         elseKw: w($(n), { trailing: e }),
         result: t
       })
     },
-    { name: "comma$subexpression$1", symbols: [f.has("COMMA") ? { type: "COMMA" } : COMMA] },
+    { name: "comma$subexpression$1", symbols: [h.has("COMMA") ? { type: "COMMA" } : COMMA] },
     { name: "comma", symbols: ["comma$subexpression$1"], postprocess: ([[n]]) => ({ type: p.comma }) },
-    { name: "asterisk$subexpression$1", symbols: [f.has("ASTERISK") ? { type: "ASTERISK" } : ASTERISK] },
+    { name: "asterisk$subexpression$1", symbols: [h.has("ASTERISK") ? { type: "ASTERISK" } : ASTERISK] },
     { name: "asterisk", symbols: ["asterisk$subexpression$1"], postprocess: ([[n]]) => ({ type: p.operator, text: n.text }) },
-    { name: "operator$subexpression$1", symbols: [f.has("OPERATOR") ? { type: "OPERATOR" } : OPERATOR] },
+    { name: "operator$subexpression$1", symbols: [h.has("OPERATOR") ? { type: "OPERATOR" } : OPERATOR] },
     { name: "operator", symbols: ["operator$subexpression$1"], postprocess: ([[n]]) => ({ type: p.operator, text: n.text }) },
-    { name: "identifier$subexpression$1", symbols: [f.has("IDENTIFIER") ? { type: "IDENTIFIER" } : IDENTIFIER] },
-    { name: "identifier$subexpression$1", symbols: [f.has("QUOTED_IDENTIFIER") ? { type: "QUOTED_IDENTIFIER" } : QUOTED_IDENTIFIER] },
-    { name: "identifier$subexpression$1", symbols: [f.has("VARIABLE") ? { type: "VARIABLE" } : VARIABLE] },
+    { name: "identifier$subexpression$1", symbols: [h.has("IDENTIFIER") ? { type: "IDENTIFIER" } : IDENTIFIER] },
+    { name: "identifier$subexpression$1", symbols: [h.has("QUOTED_IDENTIFIER") ? { type: "QUOTED_IDENTIFIER" } : QUOTED_IDENTIFIER] },
+    { name: "identifier$subexpression$1", symbols: [h.has("VARIABLE") ? { type: "VARIABLE" } : VARIABLE] },
     { name: "identifier", symbols: ["identifier$subexpression$1"], postprocess: ([[n]]) => ({ type: p.identifier, quoted: n.type !== "IDENTIFIER", text: n.text }) },
-    { name: "parameter$subexpression$1", symbols: [f.has("NAMED_PARAMETER") ? { type: "NAMED_PARAMETER" } : NAMED_PARAMETER] },
-    { name: "parameter$subexpression$1", symbols: [f.has("QUOTED_PARAMETER") ? { type: "QUOTED_PARAMETER" } : QUOTED_PARAMETER] },
-    { name: "parameter$subexpression$1", symbols: [f.has("NUMBERED_PARAMETER") ? { type: "NUMBERED_PARAMETER" } : NUMBERED_PARAMETER] },
-    { name: "parameter$subexpression$1", symbols: [f.has("POSITIONAL_PARAMETER") ? { type: "POSITIONAL_PARAMETER" } : POSITIONAL_PARAMETER] },
-    { name: "parameter$subexpression$1", symbols: [f.has("CUSTOM_PARAMETER") ? { type: "CUSTOM_PARAMETER" } : CUSTOM_PARAMETER] },
+    { name: "parameter$subexpression$1", symbols: [h.has("NAMED_PARAMETER") ? { type: "NAMED_PARAMETER" } : NAMED_PARAMETER] },
+    { name: "parameter$subexpression$1", symbols: [h.has("QUOTED_PARAMETER") ? { type: "QUOTED_PARAMETER" } : QUOTED_PARAMETER] },
+    { name: "parameter$subexpression$1", symbols: [h.has("NUMBERED_PARAMETER") ? { type: "NUMBERED_PARAMETER" } : NUMBERED_PARAMETER] },
+    { name: "parameter$subexpression$1", symbols: [h.has("POSITIONAL_PARAMETER") ? { type: "POSITIONAL_PARAMETER" } : POSITIONAL_PARAMETER] },
+    { name: "parameter$subexpression$1", symbols: [h.has("CUSTOM_PARAMETER") ? { type: "CUSTOM_PARAMETER" } : CUSTOM_PARAMETER] },
     { name: "parameter", symbols: ["parameter$subexpression$1"], postprocess: ([[n]]) => ({ type: p.parameter, key: n.key, text: n.text }) },
-    { name: "literal$subexpression$1", symbols: [f.has("NUMBER") ? { type: "NUMBER" } : NUMBER] },
-    { name: "literal$subexpression$1", symbols: [f.has("STRING") ? { type: "STRING" } : STRING] },
+    { name: "literal$subexpression$1", symbols: [h.has("NUMBER") ? { type: "NUMBER" } : NUMBER] },
+    { name: "literal$subexpression$1", symbols: [h.has("STRING") ? { type: "STRING" } : STRING] },
     { name: "literal", symbols: ["literal$subexpression$1"], postprocess: ([[n]]) => ({ type: p.literal, text: n.text }) },
-    { name: "keyword$subexpression$1", symbols: [f.has("RESERVED_KEYWORD") ? { type: "RESERVED_KEYWORD" } : RESERVED_KEYWORD] },
-    { name: "keyword$subexpression$1", symbols: [f.has("RESERVED_KEYWORD_PHRASE") ? { type: "RESERVED_KEYWORD_PHRASE" } : RESERVED_KEYWORD_PHRASE] },
-    { name: "keyword$subexpression$1", symbols: [f.has("RESERVED_JOIN") ? { type: "RESERVED_JOIN" } : RESERVED_JOIN] },
+    { name: "keyword$subexpression$1", symbols: [h.has("RESERVED_KEYWORD") ? { type: "RESERVED_KEYWORD" } : RESERVED_KEYWORD] },
+    { name: "keyword$subexpression$1", symbols: [h.has("RESERVED_KEYWORD_PHRASE") ? { type: "RESERVED_KEYWORD_PHRASE" } : RESERVED_KEYWORD_PHRASE] },
+    { name: "keyword$subexpression$1", symbols: [h.has("RESERVED_JOIN") ? { type: "RESERVED_JOIN" } : RESERVED_JOIN] },
     {
       name: "keyword",
       symbols: ["keyword$subexpression$1"],
       postprocess: ([[n]]) => $(n)
     },
-    { name: "data_type$subexpression$1", symbols: [f.has("RESERVED_DATA_TYPE") ? { type: "RESERVED_DATA_TYPE" } : RESERVED_DATA_TYPE] },
-    { name: "data_type$subexpression$1", symbols: [f.has("RESERVED_DATA_TYPE_PHRASE") ? { type: "RESERVED_DATA_TYPE_PHRASE" } : RESERVED_DATA_TYPE_PHRASE] },
+    { name: "data_type$subexpression$1", symbols: [h.has("RESERVED_DATA_TYPE") ? { type: "RESERVED_DATA_TYPE" } : RESERVED_DATA_TYPE] },
+    { name: "data_type$subexpression$1", symbols: [h.has("RESERVED_DATA_TYPE_PHRASE") ? { type: "RESERVED_DATA_TYPE_PHRASE" } : RESERVED_DATA_TYPE_PHRASE] },
     {
       name: "data_type",
       symbols: ["data_type$subexpression$1"],
@@ -27212,25 +27218,25 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     },
     {
       name: "data_type",
-      symbols: [f.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
+      symbols: [h.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
       postprocess: ([n, e, t]) => ({
         type: p.parameterized_data_type,
         dataType: w(rE(n), { trailing: e }),
         parenthesis: t
       })
     },
-    { name: "logic_operator$subexpression$1", symbols: [f.has("AND") ? { type: "AND" } : AND] },
-    { name: "logic_operator$subexpression$1", symbols: [f.has("OR") ? { type: "OR" } : OR] },
-    { name: "logic_operator$subexpression$1", symbols: [f.has("XOR") ? { type: "XOR" } : XOR] },
+    { name: "logic_operator$subexpression$1", symbols: [h.has("AND") ? { type: "AND" } : AND] },
+    { name: "logic_operator$subexpression$1", symbols: [h.has("OR") ? { type: "OR" } : OR] },
+    { name: "logic_operator$subexpression$1", symbols: [h.has("XOR") ? { type: "XOR" } : XOR] },
     {
       name: "logic_operator",
       symbols: ["logic_operator$subexpression$1"],
       postprocess: ([[n]]) => $(n)
     },
-    { name: "other_keyword$subexpression$1", symbols: [f.has("WHEN") ? { type: "WHEN" } : WHEN] },
-    { name: "other_keyword$subexpression$1", symbols: [f.has("THEN") ? { type: "THEN" } : THEN] },
-    { name: "other_keyword$subexpression$1", symbols: [f.has("ELSE") ? { type: "ELSE" } : ELSE] },
-    { name: "other_keyword$subexpression$1", symbols: [f.has("END") ? { type: "END" } : END] },
+    { name: "other_keyword$subexpression$1", symbols: [h.has("WHEN") ? { type: "WHEN" } : WHEN] },
+    { name: "other_keyword$subexpression$1", symbols: [h.has("THEN") ? { type: "THEN" } : THEN] },
+    { name: "other_keyword$subexpression$1", symbols: [h.has("ELSE") ? { type: "ELSE" } : ELSE] },
+    { name: "other_keyword$subexpression$1", symbols: [h.has("END") ? { type: "END" } : END] },
     {
       name: "other_keyword",
       symbols: ["other_keyword$subexpression$1"],
@@ -27241,7 +27247,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     { name: "_", symbols: ["_$ebnf$1"], postprocess: ([n]) => n },
     {
       name: "comment",
-      symbols: [f.has("LINE_COMMENT") ? { type: "LINE_COMMENT" } : LINE_COMMENT],
+      symbols: [h.has("LINE_COMMENT") ? { type: "LINE_COMMENT" } : LINE_COMMENT],
       postprocess: ([n]) => ({
         type: p.line_comment,
         text: n.text,
@@ -27250,7 +27256,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     },
     {
       name: "comment",
-      symbols: [f.has("BLOCK_COMMENT") ? { type: "BLOCK_COMMENT" } : BLOCK_COMMENT],
+      symbols: [h.has("BLOCK_COMMENT") ? { type: "BLOCK_COMMENT" } : BLOCK_COMMENT],
       postprocess: ([n]) => ({
         type: p.block_comment,
         text: n.text,
@@ -27259,7 +27265,7 @@ const f = new ME((n) => []), Ee = ([[n]]) => n, $ = (n) => ({
     },
     {
       name: "comment",
-      symbols: [f.has("DISABLE_COMMENT") ? { type: "DISABLE_COMMENT" } : DISABLE_COMMENT],
+      symbols: [h.has("DISABLE_COMMENT") ? { type: "DISABLE_COMMENT" } : DISABLE_COMMENT],
       postprocess: ([n]) => ({
         type: p.disable_comment,
         text: n.text,
@@ -27938,7 +27944,7 @@ class Nt {
    * Validates calculated measures during registration
    */
   registerCube(e) {
-    e.meta && console.log(`[DEBUG] registerCube: ${e.name} has meta:`, JSON.stringify(e.meta)), this.validateCalculatedMeasures(e), new se(this.cubes).populateDependencies(e), this.cubes.set(e.name, e), this.invalidateMetadataCache();
+    this.validateCalculatedMeasures(e), new se(this.cubes).populateDependencies(e), this.cubes.set(e.name, e), this.invalidateMetadataCache();
   }
   /**
    * Validate calculated measures in a cube
@@ -28125,7 +28131,7 @@ ${t.join(`
           // Convert level names to full qualified names
           levels: a.levels.map((R) => R.includes(".") ? R : `${e.name}.${R}`)
         });
-    const A = {
+    return {
       name: e.name,
       title: e.title || e.name,
       description: e.description,
@@ -28138,7 +28144,6 @@ ${t.join(`
       hierarchies: T.length > 0 ? T : void 0,
       meta: e.meta
     };
-    return e.meta && console.log(`[DEBUG] Cube ${e.name} has meta:`, JSON.stringify(e.meta)), A;
   }
   /**
    * Get SQL for a query without executing it (debugging)
@@ -30146,7 +30151,7 @@ export {
   Qa as getCubeInvalidationPattern,
   Tt as getJoinType,
   os as normalizeQuery,
-  Q as resolveCubeReference,
+  X as resolveCubeReference,
   b as resolveSqlExpression,
   so as suggestQuery
 };