drizzle-cube 0.3.31 → 0.3.33

package/dist/adapters/{mcp-transport-D4KrudfS.js → mcp-transport-n-4QT0Xg.js}

@@ -1,28 +1,28 @@
-import { formatSqlString as Z, handleLoad as He, handleValidate as Ye, handleDiscover as Xe, generateRequestId as ht } from "./utils.js";
-const x = /* @__PURE__ */ Symbol.for("drizzle:entityKind");
+import { formatSqlString as te, handleLoad as Ze, handleValidate as et, handleDiscover as tt, generateRequestId as Ct } from "./utils.js";
+const k = /* @__PURE__ */ Symbol.for("drizzle:entityKind");
 function L(d, e) {
   if (!d || typeof d != "object")
     return !1;
   if (d instanceof e)
     return !0;
-  if (!Object.prototype.hasOwnProperty.call(e, x))
+  if (!Object.prototype.hasOwnProperty.call(e, k))
     throw new Error(
       `Class "${e.name ?? "<unknown>"}" doesn't look like a Drizzle entity. If this is incorrect and the class is provided by Drizzle, please report this as a bug.`
     );
   let t = Object.getPrototypeOf(d).constructor;
   if (t)
     for (; t; ) {
-      if (x in t && t[x] === e[x])
+      if (k in t && t[k] === e[k])
         return !0;
       t = Object.getPrototypeOf(t);
     }
   return !1;
 }
-class te {
+class se {
   constructor(e, t) {
     this.table = e, this.config = t, this.name = t.name, this.keyAsName = t.keyAsName, this.notNull = t.notNull, this.default = t.default, this.defaultFn = t.defaultFn, this.onUpdateFn = t.onUpdateFn, this.hasDefault = t.hasDefault, this.primary = t.primaryKey, this.isUnique = t.isUnique, this.uniqueName = t.uniqueName, this.uniqueType = t.uniqueType, this.dataType = t.dataType, this.columnType = t.columnType, this.generated = t.generated, this.generatedIdentity = t.generatedIdentity;
   }
-  static [x] = "Column";
+  static [k] = "Column";
   name;
   keyAsName;
   primary;
@@ -51,12 +51,12 @@ class te {
     return this.config.generated !== void 0 && this.config.generated.type !== "byDefault";
   }
 }
-const ge = /* @__PURE__ */ Symbol.for("drizzle:Name"), Fe = /* @__PURE__ */ Symbol.for("drizzle:isPgEnum");
-function gt(d) {
-  return !!d && typeof d == "function" && Fe in d && d[Fe] === !0;
+const be = /* @__PURE__ */ Symbol.for("drizzle:Name"), Le = /* @__PURE__ */ Symbol.for("drizzle:isPgEnum");
+function wt(d) {
+  return !!d && typeof d == "function" && Le in d && d[Le] === !0;
 }
-class Ze {
-  static [x] = "Subquery";
+class nt {
+  static [k] = "Subquery";
   constructor(e, t, n, s = !1, i = []) {
     this._ = {
       brand: "Subquery",
@@ -71,66 +71,66 @@ class Ze {
   // 	return new SQL([this]);
   // }
 }
-const bt = {
+const $t = {
   startActiveSpan(d, e) {
     return e();
   }
-}, ee = /* @__PURE__ */ Symbol.for("drizzle:ViewBaseConfig"), be = /* @__PURE__ */ Symbol.for("drizzle:Schema"), Oe = /* @__PURE__ */ Symbol.for("drizzle:Columns"), Ie = /* @__PURE__ */ Symbol.for("drizzle:ExtraConfigColumns"), ye = /* @__PURE__ */ Symbol.for("drizzle:OriginalName"), Ce = /* @__PURE__ */ Symbol.for("drizzle:BaseName"), ue = /* @__PURE__ */ Symbol.for("drizzle:IsAlias"), Le = /* @__PURE__ */ Symbol.for("drizzle:ExtraConfigBuilder"), yt = /* @__PURE__ */ Symbol.for("drizzle:IsDrizzleTable");
-class B {
-  static [x] = "Table";
+}, ne = /* @__PURE__ */ Symbol.for("drizzle:ViewBaseConfig"), ye = /* @__PURE__ */ Symbol.for("drizzle:Schema"), Me = /* @__PURE__ */ Symbol.for("drizzle:Columns"), je = /* @__PURE__ */ Symbol.for("drizzle:ExtraConfigColumns"), Ce = /* @__PURE__ */ Symbol.for("drizzle:OriginalName"), we = /* @__PURE__ */ Symbol.for("drizzle:BaseName"), le = /* @__PURE__ */ Symbol.for("drizzle:IsAlias"), Ue = /* @__PURE__ */ Symbol.for("drizzle:ExtraConfigBuilder"), Tt = /* @__PURE__ */ Symbol.for("drizzle:IsDrizzleTable");
+class P {
+  static [k] = "Table";
   /** @internal */
   static Symbol = {
-    Name: ge,
-    Schema: be,
-    OriginalName: ye,
-    Columns: Oe,
-    ExtraConfigColumns: Ie,
-    BaseName: Ce,
-    IsAlias: ue,
-    ExtraConfigBuilder: Le
+    Name: be,
+    Schema: ye,
+    OriginalName: Ce,
+    Columns: Me,
+    ExtraConfigColumns: je,
+    BaseName: we,
+    IsAlias: le,
+    ExtraConfigBuilder: Ue
   };
   /**
    * @internal
    * Can be changed if the table is aliased.
    */
-  [ge];
+  [be];
   /**
    * @internal
    * Used to store the original name of the table, before any aliasing.
    */
-  [ye];
+  [Ce];
   /** @internal */
-  [be];
+  [ye];
   /** @internal */
-  [Oe];
+  [Me];
   /** @internal */
-  [Ie];
+  [je];
   /**
    *  @internal
    * Used to store the table name before the transformation via the `tableCreator` functions.
    */
-  [Ce];
+  [we];
   /** @internal */
-  [ue] = !1;
+  [le] = !1;
   /** @internal */
-  [yt] = !0;
+  [Tt] = !0;
   /** @internal */
-  [Le] = void 0;
+  [Ue] = void 0;
   constructor(e, t, n) {
-    this[ge] = this[ye] = e, this[be] = t, this[Ce] = n;
+    this[be] = this[Ce] = e, this[ye] = t, this[we] = n;
   }
 }
-function et(d) {
+function st(d) {
   return d != null && typeof d.getSQL == "function";
 }
-function Ct(d) {
+function Et(d) {
   const e = { sql: "", params: [] };
   for (const t of d)
     e.sql += t.sql, e.params.push(...t.params), t.typings?.length && (e.typings || (e.typings = []), e.typings.push(...t.typings));
   return e;
 }
-class j {
-  static [x] = "StringChunk";
+class M {
+  static [k] = "StringChunk";
   value;
   constructor(e) {
     this.value = Array.isArray(e) ? e : [e];
@@ -143,16 +143,16 @@ class O {
   constructor(e) {
     this.queryChunks = e;
     for (const t of e)
-      if (L(t, B)) {
-        const n = t[B.Symbol.Schema];
+      if (L(t, P)) {
+        const n = t[P.Symbol.Schema];
         this.usedTables.push(
-          n === void 0 ? t[B.Symbol.Name] : n + "." + t[B.Symbol.Name]
+          n === void 0 ? t[P.Symbol.Name] : n + "." + t[P.Symbol.Name]
         );
       }
   }
-  static [x] = "SQL";
+  static [k] = "SQL";
   /** @internal */
-  decoder = tt;
+  decoder = it;
   shouldInlineParams = !1;
   /** @internal */
   usedTables = [];
@@ -160,7 +160,7 @@ class O {
     return this.queryChunks.push(...e.queryChunks), this;
   }
   toQuery(e) {
-    return bt.startActiveSpan("drizzle.buildSQL", (t) => {
+    return $t.startActiveSpan("drizzle.buildSQL", (t) => {
       const n = this.buildQueryFromSourceParams(this.queryChunks, e);
       return t?.setAttributes({
         "drizzle.query.text": n.sql,
@@ -180,50 +180,50 @@ class O {
       inlineParams: u,
       paramStartIndex: c
     } = n;
-    return Ct(e.map((l) => {
-      if (L(l, j))
+    return Et(e.map((l) => {
+      if (L(l, M))
         return { sql: l.value.join(""), params: [] };
-      if (L(l, Ne))
+      if (L(l, De))
         return { sql: i(l.value), params: [] };
       if (l === void 0)
         return { sql: "", params: [] };
       if (Array.isArray(l)) {
-        const m = [new j("(")];
+        const m = [new M("(")];
         for (const [p, f] of l.entries())
-          m.push(f), p < l.length - 1 && m.push(new j(", "));
-        return m.push(new j(")")), this.buildQueryFromSourceParams(m, n);
+          m.push(f), p < l.length - 1 && m.push(new M(", "));
+        return m.push(new M(")")), this.buildQueryFromSourceParams(m, n);
       }
       if (L(l, O))
         return this.buildQueryFromSourceParams(l.queryChunks, {
           ...n,
           inlineParams: u || l.shouldInlineParams
         });
-      if (L(l, B)) {
-        const m = l[B.Symbol.Schema], p = l[B.Symbol.Name];
+      if (L(l, P)) {
+        const m = l[P.Symbol.Schema], p = l[P.Symbol.Name];
         return {
-          sql: m === void 0 || l[ue] ? i(p) : i(m) + "." + i(p),
+          sql: m === void 0 || l[le] ? i(p) : i(m) + "." + i(p),
           params: []
         };
       }
-      if (L(l, te)) {
+      if (L(l, se)) {
         const m = s.getColumnCasing(l);
         if (t.invokeSource === "indexes")
           return { sql: i(m), params: [] };
-        const p = l.table[B.Symbol.Schema];
+        const p = l.table[P.Symbol.Schema];
         return {
-          sql: l.table[ue] || p === void 0 ? i(l.table[B.Symbol.Name]) + "." + i(m) : i(p) + "." + i(l.table[B.Symbol.Name]) + "." + i(m),
+          sql: l.table[le] || p === void 0 ? i(l.table[P.Symbol.Name]) + "." + i(m) : i(p) + "." + i(l.table[P.Symbol.Name]) + "." + i(m),
           params: []
         };
       }
-      if (L(l, st)) {
-        const m = l[ee].schema, p = l[ee].name;
+      if (L(l, ot)) {
+        const m = l[ne].schema, p = l[ne].name;
         return {
-          sql: m === void 0 || l[ee].isAlias ? i(p) : i(m) + "." + i(p),
+          sql: m === void 0 || l[ne].isAlias ? i(p) : i(m) + "." + i(p),
           params: []
         };
       }
-      if (L(l, le)) {
-        if (L(l.value, ce))
+      if (L(l, ce)) {
+        if (L(l.value, de))
           return { sql: r(c.value++, l), params: [l], typings: ["none"] };
         const m = l.value === null ? null : l.encoder.mapToDriverValue(l.value);
         if (L(m, O))
@@ -233,15 +233,15 @@ class O {
         let p = ["none"];
         return a && (p = [a(l.encoder)]), { sql: r(c.value++, m), params: [m], typings: p };
       }
-      return L(l, ce) ? { sql: r(c.value++, l), params: [l], typings: ["none"] } : L(l, O.Aliased) && l.fieldAlias !== void 0 ? { sql: i(l.fieldAlias), params: [] } : L(l, Ze) ? l._.isWith ? { sql: i(l._.alias), params: [] } : this.buildQueryFromSourceParams([
-        new j("("),
+      return L(l, de) ? { sql: r(c.value++, l), params: [l], typings: ["none"] } : L(l, O.Aliased) && l.fieldAlias !== void 0 ? { sql: i(l.fieldAlias), params: [] } : L(l, nt) ? l._.isWith ? { sql: i(l._.alias), params: [] } : this.buildQueryFromSourceParams([
+        new M("("),
         l._.sql,
-        new j(") "),
-        new Ne(l._.alias)
-      ], n) : gt(l) ? l.schema ? { sql: i(l.schema) + "." + i(l.enumName), params: [] } : { sql: i(l.enumName), params: [] } : et(l) ? l.shouldOmitSQLParens?.() ? this.buildQueryFromSourceParams([l.getSQL()], n) : this.buildQueryFromSourceParams([
-        new j("("),
+        new M(") "),
+        new De(l._.alias)
+      ], n) : wt(l) ? l.schema ? { sql: i(l.schema) + "." + i(l.enumName), params: [] } : { sql: i(l.enumName), params: [] } : st(l) ? l.shouldOmitSQLParens?.() ? this.buildQueryFromSourceParams([l.getSQL()], n) : this.buildQueryFromSourceParams([
+        new M("("),
         l.getSQL(),
-        new j(")")
+        new M(")")
       ], n) : u ? { sql: this.mapInlineParam(l, n), params: [] } : { sql: r(c.value++, l), params: [l], typings: ["none"] };
     }));
   }
@@ -280,37 +280,37 @@ class O {
     return e ? this : void 0;
   }
 }
-class Ne {
+class De {
   constructor(e) {
     this.value = e;
   }
-  static [x] = "Name";
+  static [k] = "Name";
   brand;
   getSQL() {
     return new O([this]);
   }
 }
-function wt(d) {
+function St(d) {
   return typeof d == "object" && d !== null && "mapToDriverValue" in d && typeof d.mapToDriverValue == "function";
 }
-const tt = {
+const it = {
   mapFromDriverValue: (d) => d
-}, nt = {
+}, rt = {
   mapToDriverValue: (d) => d
 };
 ({
-  ...tt,
-  ...nt
+  ...it,
+  ...rt
 });
-class le {
+class ce {
   /**
    * @param value - Parameter value
    * @param encoder - Encoder to convert the value to a driver parameter
    */
-  constructor(e, t = nt) {
+  constructor(e, t = rt) {
     this.value = e, this.encoder = t;
   }
-  static [x] = "Param";
+  static [k] = "Param";
   brand;
   getSQL() {
     return new O([this]);
@@ -318,9 +318,9 @@ class le {
 }
 function o(d, ...e) {
   const t = [];
-  (e.length > 0 || d.length > 0 && d[0] !== "") && t.push(new j(d[0]));
+  (e.length > 0 || d.length > 0 && d[0] !== "") && t.push(new M(d[0]));
   for (const [n, s] of e.entries())
-    t.push(s, new j(d[n + 1]));
+    t.push(s, new M(d[n + 1]));
   return new O(t);
 }
 ((d) => {
@@ -333,7 +333,7 @@ function o(d, ...e) {
   }
   d.fromList = t;
   function n(u) {
-    return new O([new j(u)]);
+    return new O([new M(u)]);
   }
   d.raw = n;
   function s(u, c) {
@@ -344,15 +344,15 @@ function o(d, ...e) {
   }
   d.join = s;
   function i(u) {
-    return new Ne(u);
+    return new De(u);
   }
   d.identifier = i;
   function r(u) {
-    return new ce(u);
+    return new de(u);
   }
   d.placeholder = r;
   function a(u, c) {
-    return new le(u, c);
+    return new ce(u, c);
   }
   d.param = a;
 })(o || (o = {}));
@@ -361,7 +361,7 @@ function o(d, ...e) {
     constructor(n, s) {
       this.sql = n, this.fieldAlias = s;
     }
-    static [x] = "SQL.Aliased";
+    static [k] = "SQL.Aliased";
     /** @internal */
     isSelectionField = !1;
     getSQL() {
@@ -374,24 +374,24 @@ function o(d, ...e) {
   }
   d.Aliased = e;
 })(O || (O = {}));
-class ce {
+class de {
   constructor(e) {
     this.name = e;
   }
-  static [x] = "Placeholder";
+  static [k] = "Placeholder";
   getSQL() {
     return new O([this]);
   }
 }
-const $t = /* @__PURE__ */ Symbol.for("drizzle:IsDrizzleView");
-class st {
-  static [x] = "View";
+const Nt = /* @__PURE__ */ Symbol.for("drizzle:IsDrizzleView");
+class ot {
+  static [k] = "View";
   /** @internal */
-  [ee];
+  [ne];
   /** @internal */
-  [$t] = !0;
+  [Nt] = !0;
   constructor({ name: e, schema: t, selectedFields: n, query: s }) {
-    this[ee] = {
+    this[ne] = {
       name: e,
       originalName: e,
       schema: t,
@@ -405,103 +405,103 @@ class st {
     return new O([this]);
   }
 }
-te.prototype.getSQL = function() {
+se.prototype.getSQL = function() {
   return new O([this]);
 };
-B.prototype.getSQL = function() {
+P.prototype.getSQL = function() {
   return new O([this]);
 };
-Ze.prototype.getSQL = function() {
+nt.prototype.getSQL = function() {
   return new O([this]);
 };
-function U(d, e) {
-  return wt(e) && !et(d) && !L(d, le) && !L(d, ce) && !L(d, te) && !L(d, B) && !L(d, st) ? new le(d, e) : d;
+function x(d, e) {
+  return St(e) && !st(d) && !L(d, ce) && !L(d, de) && !L(d, se) && !L(d, P) && !L(d, ot) ? new ce(d, e) : d;
 }
-const Q = (d, e) => o`${d} = ${U(e, d)}`, Me = (d, e) => o`${d} <> ${U(e, d)}`;
-function D(...d) {
+const Q = (d, e) => o`${d} = ${x(e, d)}`, xe = (d, e) => o`${d} <> ${x(e, d)}`;
+function _(...d) {
   const e = d.filter(
     (t) => t !== void 0
   );
   if (e.length !== 0)
     return e.length === 1 ? new O(e) : new O([
-      new j("("),
-      o.join(e, new j(" and ")),
-      new j(")")
+      new M("("),
+      o.join(e, new M(" and ")),
+      new M(")")
     ]);
 }
-function ie(...d) {
+function re(...d) {
   const e = d.filter(
     (t) => t !== void 0
   );
   if (e.length !== 0)
     return e.length === 1 ? new O(e) : new O([
-      new j("("),
-      o.join(e, new j(" or ")),
-      new j(")")
+      new M("("),
+      o.join(e, new M(" or ")),
+      new M(")")
     ]);
 }
-const we = (d, e) => o`${d} > ${U(e, d)}`, Y = (d, e) => o`${d} >= ${U(e, d)}`, $e = (d, e) => o`${d} < ${U(e, d)}`, X = (d, e) => o`${d} <= ${U(e, d)}`;
-function Te(d, e) {
-  return Array.isArray(e) ? e.length === 0 ? o`false` : o`${d} in ${e.map((t) => U(t, d))}` : o`${d} in ${U(e, d)}`;
+const $e = (d, e) => o`${d} > ${x(e, d)}`, Z = (d, e) => o`${d} >= ${x(e, d)}`, Te = (d, e) => o`${d} < ${x(e, d)}`, ee = (d, e) => o`${d} <= ${x(e, d)}`;
+function Ee(d, e) {
+  return Array.isArray(e) ? e.length === 0 ? o`false` : o`${d} in ${e.map((t) => x(t, d))}` : o`${d} in ${x(e, d)}`;
 }
-function je(d, e) {
-  return Array.isArray(e) ? e.length === 0 ? o`true` : o`${d} not in ${e.map((t) => U(t, d))}` : o`${d} not in ${U(e, d)}`;
+function ke(d, e) {
+  return Array.isArray(e) ? e.length === 0 ? o`true` : o`${d} not in ${e.map((t) => x(t, d))}` : o`${d} not in ${x(e, d)}`;
 }
-function Ue(d) {
+function Be(d) {
   return o`${d} is null`;
 }
-function ke(d) {
+function Pe(d) {
   return o`${d} is not null`;
 }
-function Tt(d, e) {
+function Dt(d, e) {
   if (Array.isArray(e)) {
     if (e.length === 0)
       throw new Error("arrayContains requires at least one value");
-    const t = o`${U(e, d)}`;
+    const t = o`${x(e, d)}`;
     return o`${d} @> ${t}`;
   }
-  return o`${d} @> ${U(e, d)}`;
+  return o`${d} @> ${x(e, d)}`;
 }
-function Et(d, e) {
+function At(d, e) {
   if (Array.isArray(e)) {
     if (e.length === 0)
       throw new Error("arrayContained requires at least one value");
-    const t = o`${U(e, d)}`;
+    const t = o`${x(e, d)}`;
     return o`${d} <@ ${t}`;
   }
-  return o`${d} <@ ${U(e, d)}`;
+  return o`${d} <@ ${x(e, d)}`;
 }
-function St(d, e) {
+function _t(d, e) {
   if (Array.isArray(e)) {
     if (e.length === 0)
       throw new Error("arrayOverlaps requires at least one value");
-    const t = o`${U(e, d)}`;
+    const t = o`${x(e, d)}`;
     return o`${d} && ${t}`;
   }
-  return o`${d} && ${U(e, d)}`;
+  return o`${d} && ${x(e, d)}`;
 }
-function xe(d) {
+function Qe(d) {
   return o`${d} asc`;
 }
-function Nt(d) {
+function vt(d) {
   return o`${d} desc`;
 }
-function De(d) {
+function Ae(d) {
   return o`count(${d || o.raw("*")})`.mapWith(Number);
 }
-function Dt(d) {
+function Rt(d) {
   return o`count(distinct ${d})`.mapWith(Number);
 }
-function K(d) {
+function z(d) {
   return o`sum(${d})`.mapWith(String);
 }
-function V(d) {
-  return o`max(${d})`.mapWith(L(d, te) ? d : String);
+function G(d) {
+  return o`max(${d})`.mapWith(L(d, se) ? d : String);
 }
-function re(d) {
-  return o`min(${d})`.mapWith(L(d, te) ? d : String);
+function oe(d) {
+  return o`min(${d})`.mapWith(L(d, se) ? d : String);
 }
-class fe {
+class pe {
   /**
    * Default implementation returns template unchanged
    * Override in specific adapters for database-specific preprocessing
@@ -549,7 +549,7 @@ class fe {
     return t.years * 365 * 24 * 60 * 60 + t.months * 30 * 24 * 60 * 60 + t.days * 24 * 60 * 60 + t.hours * 60 * 60 + t.minutes * 60 + t.seconds;
   }
 }
-class At extends fe {
+class Ft extends pe {
   getEngineType() {
     return "postgres";
   }
@@ -820,7 +820,7 @@ class At extends fe {
     }
   }
 }
-class it extends fe {
+class at extends pe {
   getEngineType() {
     return "mysql";
   }
@@ -1098,7 +1098,7 @@ class it extends fe {
     }
   }
 }
-class _t extends fe {
+class Ot extends pe {
   getEngineType() {
     return "sqlite";
   }
@@ -1415,7 +1415,7 @@ class _t extends fe {
     }
   }
 }
-class vt extends it {
+class It extends at {
   getEngineType() {
     return "singlestore";
   }
@@ -1428,7 +1428,7 @@ class vt extends it {
   // These limitations are typically handled at the query building level
   // rather than in the adapter, but can be addressed here if needed
 }
-class Rt extends fe {
+class Lt extends pe {
   getEngineType() {
     return "duckdb";
   }
@@ -1693,31 +1693,31 @@ class Rt extends fe {
     }
   }
 }
-function Ft(d) {
+function Mt(d) {
   switch (d) {
     case "postgres":
-      return new At();
+      return new Ft();
     case "mysql":
-      return new it();
+      return new at();
     case "sqlite":
-      return new _t();
+      return new Ot();
     case "singlestore":
-      return new vt();
+      return new It();
     case "duckdb":
-      return new Rt();
+      return new Lt();
     default:
       throw new Error(`Unsupported database engine: ${d}`);
   }
 }
-class pe {
+class he {
   constructor(e, t, n) {
     this.db = e, this.schema = t;
     const s = n || this.getEngineType();
-    this.databaseAdapter = Ft(s);
+    this.databaseAdapter = Mt(s);
   }
   databaseAdapter;
 }
-function Ot(d, e) {
+function jt(d, e) {
   const t = [], n = [];
   let s = !1, i, r, a;
   const u = [];
@@ -1732,7 +1732,7 @@ function Ot(d, e) {
       r = parseFloat(p[1]);
       continue;
     }
-    const f = It(l);
+    const f = Ut(l);
     if (f) {
       f.type.includes("Seq Scan") && (s = !0), f.index && n.push(f.index), t.length === 0 && f.estimatedCost !== void 0 && (a = f.estimatedCost);
       const h = l.search(/\S/);
@@ -1764,7 +1764,7 @@ function Ot(d, e) {
     sql: e
   };
 }
-function It(d) {
+function Ut(d) {
   const e = d.replace(/^[\s->]+/, "").trim();
   if (!e) return null;
   const t = e.match(
@@ -1784,7 +1784,7 @@ function It(d) {
   const l = d.match(/Filter:\s*(.+?)(?:\)|$)/i);
   return l && (c.filter = l[1].trim()), c;
 }
-class Lt extends pe {
+class xt extends he {
   async execute(e, t) {
     if (e && typeof e == "object" && typeof e.execute == "function") {
       const s = await e.execute();
@@ -1854,7 +1854,7 @@ class Lt extends pe {
           typeof u == "string" && r.push(u);
         }
     }
-    return Ot(r, { sql: e, params: t });
+    return jt(r, { sql: e, params: t });
   }
   /**
    * Get existing indexes for the specified tables
@@ -1895,10 +1895,10 @@ class Lt extends pe {
     }
   }
 }
-function Be(d, e) {
-  return new Lt(d, e, "postgres");
+function We(d, e) {
+  return new xt(d, e, "postgres");
 }
-function Mt(d, e) {
+function kt(d, e) {
   const t = e?.toLowerCase() || "";
   switch (d.toLowerCase()) {
     case "all":
@@ -1920,11 +1920,11 @@ function Mt(d, e) {
       return `MySQL ${d}`;
   }
 }
-function jt(d, e) {
+function Bt(d, e) {
   const t = [], n = [];
   let s = !1, i = 0;
   for (const u of d) {
-    const c = Mt(u.type, u.Extra);
+    const c = kt(u.type, u.Extra);
     u.type.toLowerCase() === "all" && (s = !0), u.key && n.push(u.key);
     const l = {
       type: c,
@@ -1963,7 +1963,7 @@ function jt(d, e) {
     sql: e
   };
 }
-class rt extends pe {
+class ut extends he {
   async execute(e, t) {
     if (e && typeof e == "object" && typeof e.execute == "function") {
       const s = await e.execute();
@@ -2031,7 +2031,7 @@ class rt extends pe {
           filtered: Number(c.filtered) || 100,
           Extra: c.Extra || null
         });
-    return jt(u, { sql: e, params: t });
+    return Bt(u, { sql: e, params: t });
   }
   /**
    * Get existing indexes for the specified tables
@@ -2067,10 +2067,10 @@ class rt extends pe {
     }
   }
 }
-function Ut(d, e) {
-  return new rt(d, e, "mysql");
+function Pt(d, e) {
+  return new ut(d, e, "mysql");
 }
-function kt(d) {
+function Qt(d) {
   const e = d.toLowerCase(), t = d.match(/^SCAN\s+(\S+)/i);
   if (t)
     return {
@@ -2102,12 +2102,12 @@ function kt(d) {
     table: i[1]
   } : e.includes("temp b-tree") ? e.includes("order by") ? { type: "Sort" } : e.includes("group by") ? { type: "Group" } : e.includes("distinct") ? { type: "Distinct" } : { type: "Temp B-Tree" } : e.includes("compound") ? { type: "Compound Query" } : e.includes("subquery") ? { type: "Subquery" } : e.includes("co-routine") ? { type: "Coroutine" } : { type: d };
 }
-function xt(d, e) {
+function Wt(d, e) {
   const t = [], n = [];
   let s = !1;
   const i = /* @__PURE__ */ new Map();
   for (const u of d) {
-    const c = kt(u.detail);
+    const c = Qt(u.detail);
     c.type === "Seq Scan" && (s = !0), c.index && n.push(c.index);
     const l = {
       type: c.type,
@@ -2145,7 +2145,7 @@ function xt(d, e) {
     sql: e
   };
 }
-class Bt extends pe {
+class Kt extends he {
   async execute(e, t) {
     if (e && typeof e == "object" && typeof e.execute == "function") {
       const n = await e.execute();
@@ -2215,7 +2215,7 @@ class Bt extends pe {
           notused: Number(c.notused) || 0,
           detail: String(c.detail || "")
         });
-    return xt(u, { sql: e, params: t });
+    return Wt(u, { sql: e, params: t });
   }
   /**
    * Get existing indexes for the specified tables
@@ -2256,10 +2256,10 @@ class Bt extends pe {
     }
   }
 }
-function Pe(d, e) {
-  return new Bt(d, e, "sqlite");
+function Ke(d, e) {
+  return new Kt(d, e, "sqlite");
 }
-class Pt extends rt {
+class qt extends ut {
   getEngineType() {
     return "singlestore";
   }
@@ -2267,19 +2267,19 @@ class Pt extends rt {
   // For now, we inherit all behavior from MySQLExecutor since
   // SingleStore is largely MySQL-compatible
 }
-function Qt(d, e) {
-  return new Pt(d, e);
+function zt(d, e) {
+  return new qt(d, e);
 }
-function Wt(d, e) {
+function Vt(d, e) {
   const t = [], n = [];
   let s = !1, i;
   const r = [];
   for (const u of d) {
     if (/^[┌├└│─┐┤┘]+$/.test(u.trim()) || /EXPLANATION|QUERY PLAN/i.test(u)) continue;
-    const c = qt(u);
+    const c = Gt(u);
     if (c) {
       (c.type.includes("SEQ_SCAN") || c.type.includes("TABLE_SCAN")) && (s = !0), c.type.includes("INDEX_SCAN") && c.index && n.push(c.index), t.length === 0 && c.estimatedCost !== void 0 && (i = c.estimatedCost);
-      const l = Kt(u);
+      const l = Jt(u);
       for (; r.length > 0 && r[r.length - 1].indent >= l; )
         r.pop();
       if (r.length === 0)
@@ -2307,7 +2307,7 @@ function Wt(d, e) {
     sql: e
   };
 }
-function Kt(d) {
+function Jt(d) {
   let e = 0;
   for (const t of d)
     if (t === " " || t === "│" || t === "├" || t === "└" || t === "─")
@@ -2316,7 +2316,7 @@ function Kt(d) {
       break;
   return e;
 }
-function qt(d) {
+function Gt(d) {
   const e = d.replace(/[┌├└│─┐┤┘]/g, "").replace(/^\s*/, "").trim();
   if (!e || e.match(/^\(cost=([\d.]+)\s+rows=(\d+)\)$/i))
     return null;
@@ -2345,7 +2345,7 @@ function qt(d) {
     estimatedCost: a
   };
 }
-class zt extends pe {
+class Ht extends he {
   async execute(e, t) {
     if (e && typeof e == "object" && typeof e.execute == "function")
       try {
@@ -2450,7 +2450,7 @@ class zt extends pe {
           typeof u == "string" && r.push(u);
         }
     }
-    return Wt(r, { sql: e, params: t });
+    return Vt(r, { sql: e, params: t });
   }
   /**
    * Get existing indexes for the specified tables
@@ -2486,33 +2486,33 @@ class zt extends pe {
     }
   }
 }
-function Vt(d, e) {
-  return new zt(d, e, "duckdb");
+function Yt(d, e) {
+  return new Ht(d, e, "duckdb");
 }
-function Qe(d, e, t) {
+function qe(d, e, t) {
   if (t)
     switch (t) {
       case "postgres":
-        return Be(d, e);
+        return We(d, e);
       case "mysql":
-        return Ut(d, e);
+        return Pt(d, e);
       case "sqlite":
-        return Pe(d, e);
+        return Ke(d, e);
       case "singlestore":
-        return Qt(d, e);
+        return zt(d, e);
       case "duckdb":
-        return Vt(d, e);
+        return Yt(d, e);
     }
   if (d.all && d.run)
-    return Pe(d, e);
+    return Ke(d, e);
   if (d.execute)
-    return Be(d, e);
+    return We(d, e);
   throw new Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
-function P(d) {
+function W(d) {
   return typeof d == "function" ? d() : d;
 }
-function Ae(d, e) {
+function _e(d, e) {
   if (e) return e;
   switch (d) {
     case "belongsTo":
@@ -2531,14 +2531,14 @@ function Ae(d, e) {
       return "left";
   }
 }
-function _e(d) {
+function ve(d) {
   return d && typeof d == "object" ? o`${o`${d}`}` : d;
 }
 function v(d, e) {
   const t = typeof d == "function" ? d(e) : d;
-  return _e(t);
+  return ve(t);
 }
-function Jt(d, e) {
+function Xt(d, e) {
   if (d.relationship !== "belongsToMany" || !d.through)
     throw new Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
   const { table: t, sourceKey: n, targetKey: s, securitySql: i } = d.through, r = [];
@@ -2556,38 +2556,38 @@ function Jt(d, e) {
     const l = i(e);
     u = Array.isArray(l) ? l : [l];
   }
-  const c = Ae("belongsToMany", d.sqlJoinType);
+  const c = _e("belongsToMany", d.sqlJoinType);
   return {
     junctionJoins: [
       {
         joinType: c,
         table: t,
-        condition: D(...r)
+        condition: _(...r)
       },
       {
         joinType: c,
         table: t,
         // This will be replaced with target cube table in query planner
-        condition: D(...a)
+        condition: _(...a)
       }
     ],
     junctionSecurityConditions: u
   };
 }
-function de(d) {
+function me(d) {
   if ("and" in d)
-    return `and:[${d.and.map(de).sort().join(",")}]`;
+    return `and:[${d.and.map(me).sort().join(",")}]`;
   if ("or" in d)
-    return `or:[${d.or.map(de).sort().join(",")}]`;
+    return `or:[${d.or.map(me).sort().join(",")}]`;
   const e = d, t = JSON.stringify(
     Array.isArray(e.values) ? [...e.values].sort() : e.values
   ), n = e.dateRange ? `:dr:${JSON.stringify(e.dateRange)}` : "";
   return `${e.member}:${e.operator}:${t}${n}`;
 }
-function ot(d, e) {
+function lt(d, e) {
   return `timeDim:${d}:${JSON.stringify(e)}`;
 }
-class We {
+class ze {
   cache = /* @__PURE__ */ new Map();
   stats = { hits: 0, misses: 0 };
   /**
@@ -2644,40 +2644,40 @@ class We {
     this.cache.clear(), this.stats = { hits: 0, misses: 0 };
   }
 }
-function ve(d) {
+function Re(d) {
   const e = [];
   for (const t of d)
-    "and" in t && t.and ? e.push(...ve(t.and)) : "or" in t && t.or ? e.push(...ve(t.or)) : "member" in t && e.push(t);
+    "and" in t && t.and ? e.push(...Re(t.and)) : "or" in t && t.or ? e.push(...Re(t.or)) : "member" in t && e.push(t);
   return e;
 }
-function Gt(d, e, t = {}) {
-  const n = t.keyPrefix ?? "drizzle-cube:", s = Ht(d), i = Ke(JSON.stringify(s));
+function Zt(d, e, t = {}) {
+  const n = t.keyPrefix ?? "drizzle-cube:", s = en(d), i = Ve(JSON.stringify(s));
   let r = `${n}query:${i}`;
   if (t.includeSecurityContext !== !1) {
-    const a = t.securityContextSerializer ? t.securityContextSerializer(e) : JSON.stringify(me(e)), u = Ke(a);
+    const a = t.securityContextSerializer ? t.securityContextSerializer(e) : JSON.stringify(fe(e)), u = Ve(a);
     r += `:ctx:${u}`;
   }
   return r;
 }
-function Ht(d) {
+function en(d) {
   return {
     measures: d.measures ? [...d.measures].sort() : void 0,
     dimensions: d.dimensions ? [...d.dimensions].sort() : void 0,
-    filters: d.filters ? W(d.filters) : void 0,
-    timeDimensions: d.timeDimensions ? en(d.timeDimensions) : void 0,
+    filters: d.filters ? K(d.filters) : void 0,
+    timeDimensions: d.timeDimensions ? rn(d.timeDimensions) : void 0,
     limit: d.limit,
     offset: d.offset,
-    order: d.order ? me(d.order) : void 0,
+    order: d.order ? fe(d.order) : void 0,
     fillMissingDatesValue: d.fillMissingDatesValue,
     // Include funnel config in cache key for proper cache invalidation
-    funnel: d.funnel ? Yt(d.funnel) : void 0,
+    funnel: d.funnel ? tn(d.funnel) : void 0,
     // Include flow config in cache key for proper cache invalidation
-    flow: d.flow ? Xt(d.flow) : void 0,
+    flow: d.flow ? nn(d.flow) : void 0,
     // Include retention config in cache key for proper cache invalidation
-    retention: d.retention ? Zt(d.retention) : void 0
+    retention: d.retention ? sn(d.retention) : void 0
   };
 }
-function Yt(d) {
+function tn(d) {
   return {
     bindingKey: d.bindingKey,
     timeDimension: d.timeDimension,
@@ -2685,7 +2685,7 @@ function Yt(d) {
     steps: d.steps.map((e) => {
       const t = {
         name: e.name,
-        filter: e.filter ? Array.isArray(e.filter) ? W(e.filter) : W([e.filter])[0] : void 0,
+        filter: e.filter ? Array.isArray(e.filter) ? K(e.filter) : K([e.filter])[0] : void 0,
         timeToConvert: e.timeToConvert
       };
       return "cube" in e && e.cube && (t.cube = e.cube), t;
@@ -2694,7 +2694,7 @@ function Yt(d) {
     globalTimeWindow: d.globalTimeWindow
   };
 }
-function Xt(d) {
+function nn(d) {
   return {
     bindingKey: d.bindingKey,
     timeDimension: d.timeDimension,
@@ -2702,7 +2702,7 @@ function Xt(d) {
     // Normalize starting step - sort filters for consistent hashing
     startingStep: {
       name: d.startingStep.name,
-      filter: d.startingStep.filter ? Array.isArray(d.startingStep.filter) ? W(d.startingStep.filter) : W([d.startingStep.filter])[0] : void 0
+      filter: d.startingStep.filter ? Array.isArray(d.startingStep.filter) ? K(d.startingStep.filter) : K([d.startingStep.filter])[0] : void 0
     },
     // CRITICAL: Include step counts in cache key
     stepsBefore: d.stepsBefore,
@@ -2715,7 +2715,7 @@ function Xt(d) {
     joinStrategy: d.joinStrategy
   };
 }
-function Zt(d) {
+function sn(d) {
   return {
     timeDimension: d.timeDimension,
     bindingKey: d.bindingKey,
@@ -2724,18 +2724,18 @@ function Zt(d) {
     periods: d.periods,
     retentionType: d.retentionType,
     // Normalize filters for consistent hashing
-    cohortFilters: d.cohortFilters ? Array.isArray(d.cohortFilters) ? W(d.cohortFilters) : W([d.cohortFilters])[0] : void 0,
-    activityFilters: d.activityFilters ? Array.isArray(d.activityFilters) ? W(d.activityFilters) : W([d.activityFilters])[0] : void 0,
+    cohortFilters: d.cohortFilters ? Array.isArray(d.cohortFilters) ? K(d.cohortFilters) : K([d.cohortFilters])[0] : void 0,
+    activityFilters: d.activityFilters ? Array.isArray(d.activityFilters) ? K(d.activityFilters) : K([d.activityFilters])[0] : void 0,
     // Include breakdown dimensions for cache key
     breakdownDimensions: d.breakdownDimensions
   };
 }
-function W(d) {
+function K(d) {
   return [...d].map((e) => {
     if ("and" in e && e.and)
-      return { and: W(e.and) };
+      return { and: K(e.and) };
     if ("or" in e && e.or)
-      return { or: W(e.or) };
+      return { or: K(e.or) };
     const t = e;
     return {
       ...t,
@@ -2743,7 +2743,7 @@ function W(d) {
     };
   }).sort((e, t) => JSON.stringify(e).localeCompare(JSON.stringify(t)));
 }
-function en(d) {
+function rn(d) {
   return [...d].map((e) => ({
     dimension: e.dimension,
     granularity: e.granularity,
@@ -2755,18 +2755,18 @@ function en(d) {
     }) : void 0
   })).sort((e, t) => e.dimension.localeCompare(t.dimension));
 }
-function me(d) {
-  return d === null || typeof d != "object" ? d : Array.isArray(d) ? d.map(me) : Object.keys(d).sort().reduce((e, t) => (e[t] = me(
+function fe(d) {
+  return d === null || typeof d != "object" ? d : Array.isArray(d) ? d.map(fe) : Object.keys(d).sort().reduce((e, t) => (e[t] = fe(
     d[t]
   ), e), {});
 }
-function Ke(d) {
+function Ve(d) {
   let e = 2166136261;
   for (let t = 0; t < d.length; t++)
     e ^= d.charCodeAt(t), e = e * 16777619 >>> 0;
   return e.toString(16).padStart(8, "0");
 }
-class ne {
+class ie {
   constructor(e) {
     this.databaseAdapter = e;
   }
@@ -2790,18 +2790,18 @@ 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 D(
-        Y(e, n),
-        X(e, s)
+      return _(
+        Z(e, n),
+        ee(e, s)
       );
     }
     if (typeof t == "string") {
       const n = this.parseRelativeDateRange(t);
       if (n) {
         let l, m;
-        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (l = Math.floor(n.start.getTime() / 1e3), m = Math.floor(n.end.getTime() / 1e3)) : (l = n.start.getTime(), m = n.end.getTime()) : (l = n.start.toISOString(), m = n.end.toISOString()), D(
-          Y(e, l),
-          X(e, m)
+        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (l = Math.floor(n.start.getTime() / 1e3), m = Math.floor(n.end.getTime() / 1e3)) : (l = n.start.getTime(), m = n.end.getTime()) : (l = n.start.toISOString(), m = n.end.toISOString()), _(
+          Z(e, l),
+          ee(e, m)
         );
       }
       const s = this.normalizeDate(t);
@@ -2811,9 +2811,9 @@ class ne {
       const a = new Date(i);
       a.setUTCHours(23, 59, 59, 999);
       let u, c;
-      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (u = Math.floor(r.getTime() / 1e3), c = Math.floor(a.getTime() / 1e3)) : (u = r.getTime(), c = a.getTime()) : (u = r.toISOString(), c = a.toISOString()), D(
-        Y(e, u),
-        X(e, c)
+      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (u = Math.floor(r.getTime() / 1e3), c = Math.floor(a.getTime() / 1e3)) : (u = r.getTime(), c = a.getTime()) : (u = r.toISOString(), c = a.toISOString()), _(
+        Z(e, u),
+        ee(e, c)
       );
     }
     return null;
@@ -2927,7 +2927,7 @@ class ne {
     return isNaN(t.getTime()) ? null : this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(t.getTime() / 1e3) : t.getTime() : t.toISOString();
   }
 }
-class he {
+class ge {
   constructor(e, t) {
     this.databaseAdapter = e, this.dateTimeBuilder = t;
   }
@@ -2957,16 +2957,16 @@ class he {
         if (r.length > 1) {
           if (s?.type === "time") {
             const u = r.map((c) => this.dateTimeBuilder.normalizeDate(c) || c);
-            return Te(e, u);
+            return Ee(e, u);
           }
-          return Te(e, r);
+          return Ee(e, r);
         } else if (r.length === 1) {
           const u = s?.type === "time" && this.dateTimeBuilder.normalizeDate(a) || a;
           return Q(e, u);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return r.length > 1 ? je(e, r) : r.length === 1 ? Me(e, a) : null;
+        return r.length > 1 ? ke(e, r) : r.length === 1 ? xe(e, a) : null;
       case "contains":
         return this.databaseAdapter.buildStringCondition(e, "contains", a);
       case "notContains":
@@ -2976,17 +2976,17 @@ class he {
       case "endsWith":
         return this.databaseAdapter.buildStringCondition(e, "endsWith", a);
       case "gt":
-        return we(e, a);
+        return $e(e, a);
       case "gte":
-        return Y(e, a);
+        return Z(e, a);
       case "lt":
-        return $e(e, a);
+        return Te(e, a);
       case "lte":
-        return X(e, a);
+        return ee(e, a);
       case "set":
-        return ke(e);
+        return Pe(e);
       case "notSet":
-        return Ue(e);
+        return Be(e);
       case "inDateRange":
         if (r.length >= 2) {
           const u = this.dateTimeBuilder.normalizeDate(r[0]);
@@ -2997,35 +2997,35 @@ class he {
               const m = typeof c == "number" ? new Date(c * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(c), p = new Date(m);
               p.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? c = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(p.getTime() / 1e3) : p.getTime() : c = p.toISOString();
             }
-            return D(
-              Y(e, u),
-              X(e, c)
+            return _(
+              Z(e, u),
+              ee(e, c)
             );
           }
         }
         return null;
       case "beforeDate": {
         const u = this.dateTimeBuilder.normalizeDate(a);
-        return u ? $e(e, u) : null;
+        return u ? Te(e, u) : null;
       }
       case "afterDate": {
         const u = this.dateTimeBuilder.normalizeDate(a);
-        return u ? we(e, u) : null;
+        return u ? $e(e, u) : null;
       }
       case "between":
-        return r.length >= 2 ? D(
-          Y(e, r[0]),
-          X(e, r[1])
+        return r.length >= 2 ? _(
+          Z(e, r[0]),
+          ee(e, r[1])
         ) : null;
       case "notBetween":
-        return r.length >= 2 ? ie(
-          $e(e, r[0]),
-          we(e, r[1])
+        return r.length >= 2 ? re(
+          Te(e, r[0]),
+          $e(e, r[1])
         ) : null;
       case "in":
-        return r.length > 0 ? Te(e, r) : null;
+        return r.length > 0 ? Ee(e, r) : null;
       case "notIn":
-        return r.length > 0 ? je(e, r) : null;
+        return r.length > 0 ? ke(e, r) : null;
       case "like":
         return this.databaseAdapter.buildStringCondition(e, "like", a);
       case "notLike":
@@ -3037,23 +3037,23 @@ class he {
       case "notRegex":
         return this.databaseAdapter.buildStringCondition(e, "notRegex", a);
       case "isEmpty":
-        return ie(
-          Ue(e),
+        return re(
+          Be(e),
           Q(e, "")
         );
       case "isNotEmpty":
-        return D(
-          ke(e),
-          Me(e, "")
+        return _(
+          Pe(e),
+          xe(e, "")
         );
       // PostgreSQL array operators - silent no-op for other databases
       // These use Drizzle's built-in array operator functions
       case "arrayContains":
-        return this.databaseAdapter.getEngineType() === "postgres" ? Tt(e, r) : null;
+        return this.databaseAdapter.getEngineType() === "postgres" ? Dt(e, r) : null;
       case "arrayOverlaps":
-        return this.databaseAdapter.getEngineType() === "postgres" ? St(e, r) : null;
+        return this.databaseAdapter.getEngineType() === "postgres" ? _t(e, r) : null;
       case "arrayContained":
-        return this.databaseAdapter.getEngineType() === "postgres" ? Et(e, r) : null;
+        return this.databaseAdapter.getEngineType() === "postgres" ? At(e, r) : null;
       default:
         return null;
     }
@@ -3065,11 +3065,11 @@ class he {
   buildLogicalFilter(e, t, n) {
     if ("and" in e && e.and) {
       const s = e.and.map((i) => this.buildSingleFilter(i, t, n)).filter((i) => i !== null);
-      return s.length > 0 ? s.length === 1 ? s[0] : D(...s) : null;
+      return s.length > 0 ? s.length === 1 ? s[0] : _(...s) : null;
     }
     if ("or" in e && e.or) {
       const s = e.or.map((i) => this.buildSingleFilter(i, t, n)).filter((i) => i !== null);
-      return s.length > 0 ? s.length === 1 ? s[0] : ie(...s) : null;
+      return s.length > 0 ? s.length === 1 ? s[0] : re(...s) : null;
     }
     return null;
   }
@@ -3094,7 +3094,7 @@ class he {
     );
   }
 }
-class G {
+class X {
   dependencyGraph;
   cubes;
   constructor(e) {
@@ -3314,21 +3314,21 @@ class G {
     return e.type === "calculated" && !!e.calculatedSql;
   }
 }
-function tn(d, e) {
-  const { cube: t, allCubes: n, resolvedMeasures: s } = e, i = Re(d), r = /* @__PURE__ */ new Map();
+function on(d, e) {
+  const { cube: t, allCubes: n, resolvedMeasures: s } = e, i = Fe(d), r = /* @__PURE__ */ new Map();
   for (const m of i) {
     const { originalRef: p, cubeName: f, fieldName: h } = m, g = f || t.name;
     if (!n.get(g))
       throw new Error(
         `Cannot substitute {${p}}: cube '${g}' not found`
       );
-    const b = `${g}.${h}`, w = s.get(b);
-    if (!w)
+    const b = `${g}.${h}`, $ = s.get(b);
+    if (!$)
       throw new Error(
         `Cannot substitute {${p}}: measure '${b}' not resolved yet. Ensure measures are resolved in dependency order.`
       );
-    const A = w(), $ = o`${A}`;
-    r.set(p, $);
+    const A = $(), w = o`${A}`;
+    r.set(p, w);
   }
   const a = [], u = [];
   let c = 0;
@@ -3344,10 +3344,10 @@ function tn(d, e) {
     return o.raw(d);
   const l = [];
   for (let m = 0; m < a.length; m++)
-    a[m] && l.push(new j(a[m])), m < u.length && l.push(u[m]);
+    a[m] && l.push(new M(a[m])), m < u.length && l.push(u[m]);
   return o.join(l, o.raw(""));
 }
-function Re(d) {
+function Fe(d) {
   const e = /\{([^}]+)\}/g, t = d.matchAll(e), n = [];
   for (const s of t) {
     const i = s[1].trim();
@@ -3367,7 +3367,7 @@ function Re(d) {
   }
   return n;
 }
-function nn(d) {
+function an(d) {
   const e = [];
   let t = 0;
   for (let r = 0; r < d.length; r++)
@@ -3378,7 +3378,7 @@ function nn(d) {
       break;
     }
   t > 0 && e.push("Unmatched opening brace in template"), /\{\s*\}/.test(d) && e.push("Empty member reference {} found in template"), /\{[^}]*\{/.test(d) && e.push("Nested braces are not allowed in member references");
-  const i = Re(d);
+  const i = Fe(d);
   for (const r of i) {
     const a = r.cubeName ? `${r.cubeName}.${r.fieldName}` : r.fieldName;
     /^[a-zA-Z_][a-zA-Z0-9_.]*$/.test(a) || e.push(
@@ -3392,8 +3392,8 @@ function nn(d) {
     errors: e
   };
 }
-function Ee(d, e) {
-  const t = Re(d), n = /* @__PURE__ */ new Set();
+function Se(d, e) {
+  const t = Fe(d), n = /* @__PURE__ */ new Set();
   for (const s of t) {
     const r = `${s.cubeName || e}.${s.fieldName}`;
     n.add(r);
@@ -3416,7 +3416,7 @@ class I {
    * @returns Map of measure names to SQL builder functions
    */
   buildResolvedMeasures(e, t, n, s) {
-    const i = /* @__PURE__ */ new Map(), r = [], a = [], u = new Set(e), c = new G(t);
+    const i = /* @__PURE__ */ new Map(), r = [], a = [], u = new Set(e), c = new X(t);
     for (const l of t.values())
       c.buildGraph(l);
     for (const l of e) {
@@ -3428,11 +3428,11 @@ class I {
           g && u.add(g);
           continue;
         }
-        G.isCalculatedMeasure(h) ? (a.push(l), Ee(h.calculatedSql, m).forEach((b) => u.add(b)), c.getAllDependencies(l).forEach((b) => {
-          const [w, A] = b.split("."), $ = t.get(w);
-          if ($ && $.measures[A]) {
-            const C = $.measures[A];
-            G.isCalculatedMeasure(C) && Ee(C.calculatedSql, w).forEach((E) => u.add(E));
+        X.isCalculatedMeasure(h) ? (a.push(l), Se(h.calculatedSql, m).forEach((b) => u.add(b)), c.getAllDependencies(l).forEach((b) => {
+          const [$, A] = b.split("."), w = t.get($);
+          if (w && w.measures[A]) {
+            const C = w.measures[A];
+            X.isCalculatedMeasure(C) && Se(C.calculatedSql, $).forEach((E) => u.add(E));
           }
         })) : r.push(l);
       }
@@ -3443,7 +3443,7 @@ class I {
         const h = f.measures[p];
         if (I.isPostAggregationWindow(h))
           continue;
-        G.isCalculatedMeasure(h) ? a.includes(l) || a.push(l) : r.includes(l) || r.push(l);
+        X.isCalculatedMeasure(h) ? a.includes(l) || a.push(l) : r.includes(l) || r.push(l);
       }
     }
     for (const l of r) {
@@ -3479,7 +3479,7 @@ class I {
         `Calculated measure '${t.name}.${e.name}' missing calculatedSql property`
       );
     const r = this.databaseAdapter.preprocessCalculatedTemplate(e.calculatedSql);
-    return tn(r, {
+    return on(r, {
       cube: t,
       allCubes: n,
       resolvedMeasures: s
@@ -3504,7 +3504,7 @@ class I {
       throw new Error(
         `Calculated measure '${t.name}.${e.name || "unknown"}' missing calculatedSql property`
       );
-    const r = /* @__PURE__ */ new Map(), a = Ee(e.calculatedSql, t.name);
+    const r = /* @__PURE__ */ new Map(), a = Se(e.calculatedSql, t.name);
     for (const u of a) {
       const [c, l] = u.split("."), m = s.get(c);
       if (m && m.measures[l]) {
@@ -3516,22 +3516,22 @@ class I {
             case "count":
             case "countDistinct":
             case "sum":
-              h = K(f);
+              h = z(f);
               break;
             case "avg":
               h = this.databaseAdapter.buildAvg(f);
               break;
             case "min":
-              h = re(f);
+              h = oe(f);
               break;
             case "max":
-              h = V(f);
+              h = G(f);
               break;
             case "number":
-              h = K(f);
+              h = z(f);
               break;
             default:
-              h = K(f);
+              h = z(f);
           }
           r.set(u, () => h);
         }
@@ -3573,17 +3573,17 @@ class I {
             case "count":
             case "countDistinct":
             case "sum":
-              return K(a);
+              return z(a);
             case "avg":
               return this.databaseAdapter.buildAvg(a);
             case "min":
-              return re(a);
+              return oe(a);
             case "max":
-              return V(a);
+              return G(a);
             case "number":
-              return K(a);
+              return z(a);
             default:
-              return K(a);
+              return z(a);
           }
         }
     }
@@ -3617,7 +3617,7 @@ class I {
         return a ? o`(${a})` : void 0;
       }).filter(Boolean);
       if (i.length > 0) {
-        const r = i.length === 1 ? i[0] : D(...i);
+        const r = i.length === 1 ? i[0] : _(...i);
         s = this.databaseAdapter.buildCaseWhen([
           { when: r, then: s }
         ]);
@@ -3625,17 +3625,17 @@ class I {
     }
     switch (e.type) {
       case "count":
-        return De(s);
+        return Ae(s);
       case "countDistinct":
-        return Dt(s);
+        return Rt(s);
       case "sum":
-        return K(s);
+        return z(s);
       case "avg":
         return this.databaseAdapter.buildAvg(s);
       case "min":
-        return re(s);
+        return oe(s);
       case "max":
-        return V(s);
+        return G(s);
       case "number":
         return s;
       // Statistical functions (Phase 1)
@@ -3722,7 +3722,7 @@ class I {
         return u === null ? (console.warn(`[drizzle-cube] ${e.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), o`NULL`) : u;
       }
       default:
-        return De(s);
+        return Ae(s);
     }
   }
   /**
@@ -3868,7 +3868,7 @@ class I {
     return n.length > 0;
   }
 }
-class sn {
+class un {
   constructor(e) {
     this.dateTimeBuilder = e;
   }
@@ -3936,8 +3936,8 @@ class sn {
         if (I.isPostAggregationWindow(g)) {
           const y = I.getWindowBaseMeasure(g, p);
           if (y) {
-            const [b, w] = y.split("."), $ = r.get(b)?.measures?.[w];
-            if ($ && this.isAggregateFunctionType($.type)) {
+            const [b, $] = y.split("."), w = r.get(b)?.measures?.[$];
+            if (w && this.isAggregateFunctionType(w.type)) {
               l = !0;
               break;
             }
@@ -3952,12 +3952,12 @@ class sn {
         const [p, f] = m.split("."), h = r.get(p);
         if (h && h.dimensions && h.dimensions[f])
           if (s?.preAggregationCTEs?.some((y) => y.cube.name === p)) {
-            const y = s.preAggregationCTEs.find((w) => w.cube.name === p), b = y.joinKeys.find((w) => w.targetColumn === f);
+            const y = s.preAggregationCTEs.find(($) => $.cube.name === p), b = y.joinKeys.find(($) => $.targetColumn === f);
             if (b && b.sourceColumnObj)
               i.push(b.sourceColumnObj);
             else {
-              const w = o`${o.identifier(y.cteAlias)}.${o.identifier(f)}`;
-              i.push(w);
+              const $ = o`${o.identifier(y.cteAlias)}.${o.identifier(f)}`;
+              i.push($);
             }
           } else {
             const y = h.dimensions[f], b = v(y.sql, n);
@@ -3969,17 +3969,17 @@ class sn {
         const [p, f] = m.dimension.split("."), h = r.get(p);
         if (h && h.dimensions && h.dimensions[f])
           if (s?.preAggregationCTEs?.some((y) => y.cube.name === p)) {
-            const y = s.preAggregationCTEs.find((w) => w.cube.name === p), b = y.joinKeys.find((w) => w.targetColumn === f);
+            const y = s.preAggregationCTEs.find(($) => $.cube.name === p), b = y.joinKeys.find(($) => $.targetColumn === f);
             if (b && b.sourceColumnObj) {
-              const w = this.dateTimeBuilder.buildTimeDimensionExpression(
+              const $ = this.dateTimeBuilder.buildTimeDimensionExpression(
                 b.sourceColumnObj,
                 m.granularity,
                 n
               );
-              i.push(w);
+              i.push($);
             } else {
-              const w = o`${o.identifier(y.cteAlias)}.${o.identifier(f)}`;
-              i.push(w);
+              const $ = o`${o.identifier(y.cteAlias)}.${o.identifier(f)}`;
+              i.push($);
             }
           } else {
             const y = h.dimensions[f], b = this.dateTimeBuilder.buildTimeDimensionExpression(
@@ -3993,13 +3993,13 @@ class sn {
     return i;
   }
 }
-class rn {
+class ln {
   dateTimeBuilder;
   filterBuilder;
   groupByBuilder;
   measureBuilder;
   constructor(e) {
-    this.dateTimeBuilder = new ne(e), this.filterBuilder = new he(e, this.dateTimeBuilder), this.groupByBuilder = new sn(this.dateTimeBuilder), this.measureBuilder = new I(e);
+    this.dateTimeBuilder = new ie(e), this.filterBuilder = new ge(e, this.dateTimeBuilder), this.groupByBuilder = new un(this.dateTimeBuilder), this.measureBuilder = new I(e);
   }
   /**
    * Build resolvedMeasures map for a set of measures
@@ -4049,7 +4049,7 @@ class rn {
           s[r.dimension] = o`${m}`.as(r.dimension);
         }
       }
-    return Object.keys(s).length === 0 && (s.count = De()), s;
+    return Object.keys(s).length === 0 && (s.count = Ae()), s;
   }
   /**
    * Build calculated measure expression by substituting {member} references
@@ -4114,7 +4114,7 @@ class rn {
           if (s?.preAggregationCTEs && s.preAggregationCTEs.some((b) => b.cube.name === l))
             continue;
           if (n.filterCache) {
-            const y = ot(c.dimension, c.dateRange), b = n.filterCache.get(y);
+            const y = lt(c.dimension, c.dateRange), b = n.filterCache.get(y);
             if (b) {
               r.push(b);
               continue;
@@ -4148,11 +4148,11 @@ class rn {
       const f = e;
       if (f.and) {
         const h = f.and.map((g) => this.processFilter(g, t, n, s, i)).filter((g) => g !== null);
-        return h.length > 0 ? D(...h) : null;
+        return h.length > 0 ? _(...h) : null;
       }
       if (f.or) {
         const h = f.or.map((g) => this.processFilter(g, t, n, s, i)).filter((g) => g !== null);
-        return h.length > 0 ? ie(...h) : null;
+        return h.length > 0 ? re(...h) : null;
       }
     }
     const r = e, [a, u] = r.member.split("."), c = t.get(a);
@@ -4164,7 +4164,7 @@ class rn {
         return null;
       const f = ["arrayContains", "arrayOverlaps", "arrayContained"].includes(r.operator);
       if (!f && n.filterCache) {
-        const g = de(e), y = n.filterCache.get(g);
+        const g = me(e), y = n.filterCache.get(g);
         if (y)
           return y;
       }
@@ -4226,7 +4226,7 @@ class rn {
       for (const [i, r] of Object.entries(e.order)) {
         if (!s.includes(i))
           throw new Error(`Cannot order by '${i}': field is not selected in the query`);
-        const a = r === "desc" ? Nt(o.identifier(i)) : xe(o.identifier(i));
+        const a = r === "desc" ? vt(o.identifier(i)) : Qe(o.identifier(i));
         n.push(a);
       }
     if (e.timeDimensions && e.timeDimensions.length > 0) {
@@ -4234,7 +4234,7 @@ class rn {
         (a, u) => a.dimension.localeCompare(u.dimension)
       );
       for (const a of r)
-        i.has(a.dimension) || n.push(xe(o.identifier(a.dimension)));
+        i.has(a.dimension) || n.push(Qe(o.identifier(a.dimension)));
     }
     return n;
   }
@@ -4290,7 +4290,7 @@ class rn {
     return this.filterBuilder.buildLogicalFilter(e, t, n);
   }
 }
-class oe {
+class ae {
   cubes;
   connectivityCache = /* @__PURE__ */ new Map();
   /**
@@ -4321,7 +4321,7 @@ class oe {
       const { cube: u, path: c } = r.shift(), l = this.cubes.get(u);
       if (l?.joins)
         for (const [, m] of Object.entries(l.joins)) {
-          const f = P(m.targetCube).name;
+          const f = W(m.targetCube).name;
           if (a.has(f))
             continue;
           const h = [
@@ -4401,7 +4401,7 @@ class oe {
       const l = this.cubes.get(a);
       if (l?.joins)
         for (const [, m] of Object.entries(l.joins)) {
-          const f = P(m.targetCube).name;
+          const f = W(m.targetCube).name;
           if (c.has(f))
             continue;
           const h = [
@@ -4449,10 +4449,10 @@ class oe {
   buildJoinCondition(e, t, n) {
     const s = [];
     for (const i of e.on) {
-      const r = t ? o`${o.identifier(t)}.${o.identifier(i.source.name)}` : _e(i.source), a = n ? o`${o.identifier(n)}.${o.identifier(i.target.name)}` : _e(i.target), u = i.as || Q;
+      const r = t ? o`${o.identifier(t)}.${o.identifier(i.source.name)}` : ve(i.source), a = n ? o`${o.identifier(n)}.${o.identifier(i.target.name)}` : ve(i.target), u = i.as || Q;
       s.push(u(r, a));
     }
-    return D(...s);
+    return _(...s);
   }
   /**
    * Get all reachable cubes from a starting cube
@@ -4467,7 +4467,7 @@ class oe {
       const s = n.shift(), i = this.cubes.get(s);
       if (i?.joins)
         for (const [, r] of Object.entries(i.joins)) {
-          const u = P(r.targetCube).name;
+          const u = W(r.targetCube).name;
           t.has(u) || (t.add(u), n.push(u));
         }
     }
@@ -4487,7 +4487,7 @@ class oe {
     this.connectivityCache.set(e, { path: t });
   }
 }
-class at {
+class ct {
   // Cache resolver per cubes map to avoid repeated instantiation
   resolverCache = /* @__PURE__ */ new WeakMap();
   /**
@@ -4495,7 +4495,7 @@ class at {
    */
   getResolver(e) {
     let t = this.resolverCache.get(e);
-    return t || (t = new oe(e), this.resolverCache.set(e, t)), t;
+    return t || (t = new ae(e), this.resolverCache.set(e, t)), t;
   }
   /**
    * Analyze a semantic query to determine which cubes are involved
@@ -4644,45 +4644,46 @@ class at {
       );
       if (!h || h.length === 0)
         throw new Error(`No join path found from '${t.name}' to '${p}'`);
-      for (const { toCube: g, joinDef: y } of h) {
-        if (u.has(g))
+      for (const { fromCube: g, toCube: y, joinDef: b } of h) {
+        if (u.has(y))
           continue;
-        const b = e.get(g);
-        if (!b)
-          throw new Error(`Cube '${g}' not found`);
-        if (y.relationship === "belongsToMany" && y.through) {
-          const w = Jt(y, s.securityContext);
+        const $ = e.get(y);
+        if (!$)
+          throw new Error(`Cube '${y}' not found`);
+        if (b.relationship === "belongsToMany" && b.through) {
+          const A = Xt(b, s.securityContext);
           a.push({
-            cube: b,
-            alias: `${g.toLowerCase()}_cube`,
-            joinType: w.junctionJoins[1].joinType,
+            cube: $,
+            alias: `${y.toLowerCase()}_cube`,
+            joinType: A.junctionJoins[1].joinType,
             // Use the target join type
-            joinCondition: w.junctionJoins[1].condition,
+            joinCondition: A.junctionJoins[1].condition,
             // Target join condition
             junctionTable: {
-              table: y.through.table,
-              alias: `junction_${g.toLowerCase()}`,
-              joinType: w.junctionJoins[0].joinType,
-              joinCondition: w.junctionJoins[0].condition,
-              securitySql: y.through.securitySql
+              table: b.through.table,
+              alias: `junction_${y.toLowerCase()}`,
+              joinType: A.junctionJoins[0].joinType,
+              joinCondition: A.junctionJoins[0].condition,
+              securitySql: b.through.securitySql,
+              sourceCubeName: g
             }
           });
         } else {
-          const w = r.buildJoinCondition(
-            y,
+          const A = r.buildJoinCondition(
+            b,
             null,
             // No source alias needed - use the actual column
             null
             // No target alias needed - use the actual column
-          ), A = Ae(y.relationship, y.sqlJoinType);
+          ), w = _e(b.relationship, b.sqlJoinType);
           a.push({
-            cube: b,
-            alias: `${g.toLowerCase()}_cube`,
-            joinType: A,
-            joinCondition: w
+            cube: $,
+            alias: `${y.toLowerCase()}_cube`,
+            joinType: w,
+            joinCondition: A
           });
         }
-        u.add(g);
+        u.add(y);
       }
     }
     return a;
@@ -4738,26 +4739,38 @@ class at {
       if (y.length === 0)
         continue;
       const b = this.analyzeJoinPathToPrimary(e, t, l.name, i);
-      let w, A;
+      let $, A;
       if (b?.hasIntermediateHasMany && b.intermediateJoins.length > 0)
-        w = b.correctJoinKeys, A = b.intermediateJoins;
+        $ = b.correctJoinKeys, A = b.intermediateJoins;
       else {
         const S = p ? this.findJoinInfoToCube(e, t.name) : this.findJoinInfoForCube(e, t, l.name);
         if (!S)
           continue;
-        w = p || "reversed" in S && S.reversed ? S.joinDef.on.map((_) => ({
-          sourceColumn: _.target.name,
-          targetColumn: _.source.name,
-          sourceColumnObj: _.target,
-          targetColumnObj: _.source
-        })) : S.joinDef.on.map((_) => ({
-          sourceColumn: _.source.name,
-          targetColumn: _.target.name,
-          sourceColumnObj: _.source,
-          targetColumnObj: _.target
+        S.joinDef.relationship === "belongsToMany" && S.joinDef.through ? S.sourceCube?.name === t.name && !("reversed" in S && S.reversed) ? $ = S.joinDef.through.targetKey.map((D) => ({
+          sourceColumn: D.source.name,
+          // junction table column
+          targetColumn: D.target.name,
+          // CTE cube column
+          sourceColumnObj: D.source,
+          targetColumnObj: D.target
+        })) : $ = S.joinDef.through.sourceKey.map((D) => ({
+          sourceColumn: D.target.name,
+          targetColumn: D.source.name,
+          sourceColumnObj: D.target,
+          targetColumnObj: D.source
+        })) : $ = p || "reversed" in S && S.reversed ? S.joinDef.on.map((D) => ({
+          sourceColumn: D.target.name,
+          targetColumn: D.source.name,
+          sourceColumnObj: D.target,
+          targetColumnObj: D.source
+        })) : S.joinDef.on.map((D) => ({
+          sourceColumn: D.source.name,
+          targetColumn: D.target.name,
+          sourceColumnObj: D.source,
+          targetColumnObj: D.target
         })), A = void 0;
       }
-      const $ = this.findPropagatingFilters(s, l, e), C = /* @__PURE__ */ new Map([[l.name, l]]), { aggregateMeasures: T, requiredBaseMeasures: E } = I.categorizeForPostAggregation(
+      const w = this.findPropagatingFilters(s, l, e), C = /* @__PURE__ */ new Map([[l.name, l]]), { aggregateMeasures: T, requiredBaseMeasures: E } = I.categorizeForPostAggregation(
         y,
         C
       ), N = [.../* @__PURE__ */ new Set([
@@ -4777,9 +4790,9 @@ class at {
           cube: l,
           alias: m,
           cteAlias: `${l.name.toLowerCase()}_agg`,
-          joinKeys: w,
+          joinKeys: $,
           measures: S,
-          propagatingFilters: $.length > 0 ? $ : void 0,
+          propagatingFilters: w.length > 0 ? w : void 0,
           downstreamJoinKeys: R.length > 0 ? R : void 0,
           intermediateJoins: A && A.length > 0 ? A : void 0,
           cteType: "aggregate",
@@ -4797,7 +4810,7 @@ class at {
     for (const [, n] of e)
       if (n.name !== t && n.joins) {
         for (const [, s] of Object.entries(n.joins))
-          if (P(s.targetCube).name === t)
+          if (W(s.targetCube).name === t)
             return { sourceCube: n, joinDef: s };
       }
     return null;
@@ -4837,12 +4850,12 @@ class at {
     for (let f = 0; f < a.length - 1; f++) {
       const h = a[f], g = a[f + 1], y = e.get(h.toCube);
       if (!y) continue;
-      const w = y.sql(s).where, A = g.joinDef.on[0]?.source, $ = h.joinDef.on[0]?.target;
+      const $ = y.sql(s).where, A = g.joinDef.on[0]?.source, w = h.joinDef.on[0]?.target;
       l.push({
         cube: y,
         joinDef: g.joinDef,
-        securityFilter: w,
-        primaryJoinColumn: $,
+        securityFilter: $,
+        primaryJoinColumn: w,
         cteJoinColumn: A
       });
     }
@@ -4882,7 +4895,7 @@ class at {
       if (!i.has(a) && (i.add(a), !!u.joins)) {
         for (const [, c] of Object.entries(u.joins))
           if (c.relationship === "hasMany") {
-            const l = P(c.targetCube);
+            const l = W(c.targetCube);
             (r.has(a) || r.has(l.name)) && s.push({
               fromCube: a,
               toCube: l.name,
@@ -4923,19 +4936,19 @@ class at {
   findJoinInfoForCube(e, t, n) {
     if (t.joins) {
       for (const [, i] of Object.entries(t.joins))
-        if (P(i.targetCube).name === n)
+        if (W(i.targetCube).name === n)
           return { sourceCube: t, joinDef: i };
     }
     const s = e.get(n);
     if (s?.joins) {
       for (const [, i] of Object.entries(s.joins))
-        if (P(i.targetCube).name === t.name)
+        if (W(i.targetCube).name === t.name)
           return { sourceCube: s, joinDef: i, reversed: !0 };
     }
     for (const [, i] of e)
       if (!(i.name === t.name || i.name === n) && i.joins) {
         for (const [, r] of Object.entries(i.joins))
-          if (P(r.targetCube).name === n)
+          if (W(r.targetCube).name === n)
             return { sourceCube: i, joinDef: r };
       }
     return null;
@@ -4967,15 +4980,20 @@ class at {
       }
     if (e.joins)
       for (const [, r] of Object.entries(e.joins)) {
-        const u = P(r.targetCube).name;
+        const u = W(r.targetCube).name;
         if (i.has(u)) {
-          const c = r.on.map((l) => ({
+          let c;
+          r.relationship === "belongsToMany" && r.through ? c = r.through.sourceKey.map((l) => ({
             sourceColumn: l.source.name,
             targetColumn: l.target.name,
             sourceColumnObj: l.source,
             targetColumnObj: l.target
-          }));
-          s.push({
+          })) : c = r.on.map((l) => ({
+            sourceColumn: l.source.name,
+            targetColumn: l.target.name,
+            sourceColumnObj: l.source,
+            targetColumnObj: l.target
+          })), s.push({
             targetCubeName: u,
             joinKeys: c
           });
@@ -5023,7 +5041,7 @@ class at {
     if (!e.joins)
       return null;
     for (const [, n] of Object.entries(e.joins))
-      if (P(n.targetCube).name === t && n.relationship === "hasMany")
+      if (W(n.targetCube).name === t && n.relationship === "hasMany")
         return n;
     return null;
   }
@@ -5051,7 +5069,7 @@ class at {
       const a = n.get(r);
       if (a?.joins) {
         for (const [, u] of Object.entries(a.joins))
-          if (P(u.targetCube).name === t.name && u.relationship === "hasMany") {
+          if (W(u.targetCube).name === t.name && u.relationship === "hasMany") {
             const l = this.extractFiltersForCube(e.filters, r), m = this.extractTimeDimensionFiltersForCube(e, r), p = [...l, ...m];
             p.length > 0 && u.on.length > 0 && s.push({
               sourceCube: a,
@@ -5307,7 +5325,7 @@ class at {
         visitedCubes: r
       };
     const a = i.map((u) => {
-      const c = Ae(u.joinDef.relationship, u.joinDef.sqlJoinType), l = u.joinDef.on.map((p) => ({
+      const c = _e(u.joinDef.relationship, u.joinDef.sqlJoinType), l = u.joinDef.on.map((p) => ({
         sourceColumn: p.source.name,
         targetColumn: p.target.name
       })), m = {
@@ -5351,26 +5369,26 @@ class at {
       if (!u)
         continue;
       const c = s.measures.filter(
-        (w) => w.startsWith(r + ".")
+        ($) => $.startsWith(r + ".")
       ), l = this.extractMeasuresFromFilters(s, u), m = [.../* @__PURE__ */ new Set([...c, ...l])];
       if (m.length === 0)
         continue;
-      const p = a.on.map((w) => ({
-        sourceColumn: w.source.name,
-        targetColumn: w.target.name
+      const p = a.on.map(($) => ({
+        sourceColumn: $.source.name,
+        targetColumn: $.target.name
       })), f = /* @__PURE__ */ new Map([[r, u]]), { aggregateMeasures: h, postAggWindowMeasures: g, requiredBaseMeasures: y } = I.categorizeForPostAggregation(
         m,
         f
       ), b = [.../* @__PURE__ */ new Set([
         ...h,
-        ...Array.from(y).filter((w) => w.startsWith(r + "."))
+        ...Array.from(y).filter(($) => $.startsWith(r + "."))
       ])];
       if (b.length > 0) {
-        const w = g.length > 0;
+        const $ = g.length > 0;
         i.push({
           cubeName: r,
           cteAlias: `${r.toLowerCase()}_agg`,
-          reason: w ? `hasMany relationship from ${t.name} - requires pre-aggregation; includes base measures for post-aggregation window functions` : `hasMany relationship from ${t.name} - requires pre-aggregation to prevent row duplication (fan-out)`,
+          reason: $ ? `hasMany relationship from ${t.name} - requires pre-aggregation; includes base measures for post-aggregation window functions` : `hasMany relationship from ${t.name} - requires pre-aggregation to prevent row duplication (fan-out)`,
           reasonType: "hasMany",
           measures: b,
           joinKeys: p,
@@ -5428,7 +5446,7 @@ class at {
     };
   }
 }
-class on {
+class cn {
   constructor(e) {
     this.queryBuilder = e;
   }
@@ -5497,7 +5515,7 @@ class on {
         const T = C.cube.sql(n), N = [Q(C.cteJoinColumn, C.joinDef.on[0]?.target)];
         C.securityFilter && N.push(C.securityFilter), f = f.leftJoin(
           T.from,
-          D(...N)
+          _(...N)
         );
       }
     const h = s ? {
@@ -5519,8 +5537,8 @@ class on {
           if (E === l && r.dimensions && r.dimensions[N]) {
             const S = r.dimensions[N];
             if (T.operator === "inDateRange") {
-              const R = this.queryBuilder.buildMeasureExpression({ sql: S.sql, type: "number" }, n), _ = this.queryBuilder.buildDateRangeCondition(R, T.values);
-              _ && y.push(_);
+              const R = this.queryBuilder.buildMeasureExpression({ sql: S.sql, type: "number" }, n), D = this.queryBuilder.buildDateRangeCondition(R, T.values);
+              D && y.push(D);
             }
           }
         }
@@ -5535,29 +5553,29 @@ class on {
       }
     const b = [];
     if (a.where && b.push(a.where), b.push(...g, ...y), b.length > 0) {
-      const C = b.length === 1 ? b[0] : D(...b);
+      const C = b.length === 1 ? b[0] : _(...b);
       f = f.where(C);
     }
-    const w = [], A = /* @__PURE__ */ new Set(), $ = (C) => {
+    const $ = [], A = /* @__PURE__ */ new Set(), w = (C) => {
       const T = C?.name || (typeof C == "string" ? C : null);
-      T && !A.has(T) ? (A.add(T), w.push(C)) : T || w.push(C);
+      T && !A.has(T) ? (A.add(T), $.push(C)) : T || $.push(C);
     };
     if (u && e.intermediateJoins) {
       const C = e.intermediateJoins[0];
-      C.primaryJoinColumn && $(C.primaryJoinColumn);
+      C.primaryJoinColumn && w(C.primaryJoinColumn);
     } else
       for (const C of e.joinKeys)
-        C.targetColumnObj && $(C.targetColumnObj);
+        C.targetColumnObj && w(C.targetColumnObj);
     if (e.downstreamJoinKeys)
       for (const C of e.downstreamJoinKeys)
         for (const T of C.joinKeys)
-          T.sourceColumnObj && $(T.sourceColumnObj);
+          T.sourceColumnObj && w(T.sourceColumnObj);
     if (t.dimensions)
       for (const C of t.dimensions) {
         const [T, E] = C.split(".");
         if (T === l && r.dimensions && r.dimensions[E]) {
           const N = r.dimensions[E], S = v(N.sql, n);
-          w.push(S);
+          $.push(S);
         }
       }
     if (t.timeDimensions)
@@ -5565,10 +5583,10 @@ class on {
         const [T, E] = C.dimension.split(".");
         if (T === l && r.dimensions && r.dimensions[E]) {
           const N = r.dimensions[E], S = this.queryBuilder.buildTimeDimensionExpression(N.sql, C.granularity, n);
-          w.push(S);
+          $.push(S);
         }
       }
-    return w.length > 0 && (f = f.groupBy(...w)), n.db.$with(e.cteAlias).as(f);
+    return $.length > 0 && (f = f.groupBy(...$)), n.db.$with(e.cteAlias).as(f);
   }
   /**
    * Build join condition for CTE
@@ -5594,7 +5612,7 @@ class on {
         const a = r.sourceColumnObj || o.identifier(r.sourceColumn), u = o`${o.identifier(t)}.${o.identifier(r.targetColumn)}`;
         i.push(Q(a, u));
       }
-    return i.length === 1 ? i[0] : D(...i);
+    return i.length === 1 ? i[0] : _(...i);
   }
   /**
    * Build a subquery filter for propagating filters from related cubes.
@@ -5623,12 +5641,12 @@ class on {
     }
     if (i.length === 0)
       return null;
-    const r = i.length === 1 ? i[0] : D(...i), a = e.joinConditions;
+    const r = i.length === 1 ? i[0] : _(...i), a = e.joinConditions;
     if (a.length === 1) {
       const { source: u, target: c } = a[0], l = t.db.select({ pk: u }).from(s.from).where(r);
       return o`${c} IN ${l}`;
     } else {
-      const u = a.map((m) => Q(m.source, m.target)), c = D(
+      const u = a.map((m) => Q(m.source, m.target)), c = _(
         ...u,
         r
       ), l = t.db.select({ one: o`1` }).from(s.from).where(c);
@@ -5636,15 +5654,15 @@ class on {
     }
   }
 }
-function an(d, e, t) {
+function dn(d, e, t) {
   const n = [];
-  let s = qe(new Date(d), t);
-  const i = qe(new Date(e), t), r = 1e4;
+  let s = Je(new Date(d), t);
+  const i = Je(new Date(e), t), r = 1e4;
   for (; s <= i && n.length < r; )
-    n.push(new Date(s)), s = un(s, t);
+    n.push(new Date(s)), s = mn(s, t);
   return n;
 }
-function qe(d, e) {
+function Je(d, e) {
   const t = new Date(d);
   switch (e) {
     case "second":
@@ -5678,7 +5696,7 @@ function qe(d, e) {
   }
   return t;
 }
-function un(d, e) {
+function mn(d, e) {
   const t = new Date(d);
   switch (e) {
     case "second":
@@ -5708,7 +5726,7 @@ function un(d, e) {
   }
   return t;
 }
-function ln(d) {
+function fn(d) {
   if (d instanceof Date)
     return d.toISOString();
   if (typeof d == "string") {
@@ -5718,16 +5736,16 @@ function ln(d) {
   }
   return String(d);
 }
-function cn(d, e) {
+function pn(d, e) {
   return e.length === 0 ? "__all__" : e.map((t) => String(d[t] ?? "")).join("|||");
 }
-function dn(d, e) {
-  const { timeDimensionKey: t, granularity: n, dateRange: s, fillValue: i, measures: r, dimensions: a } = e, u = an(s[0], s[1], n);
+function hn(d, e) {
+  const { timeDimensionKey: t, granularity: n, dateRange: s, fillValue: i, measures: r, dimensions: a } = e, u = dn(s[0], s[1], n);
   if (u.length === 0)
     return d;
   const c = /* @__PURE__ */ new Map();
   for (const m of d) {
-    const p = cn(m, a), f = ln(m[t]);
+    const p = pn(m, a), f = fn(m[t]);
     c.has(p) || c.set(p, /* @__PURE__ */ new Map()), c.get(p).set(f, m);
   }
   c.size === 0 && a.length === 0 && c.set("__all__", /* @__PURE__ */ new Map());
@@ -5743,17 +5761,17 @@ function dn(d, e) {
           [t]: g
         };
         if (f)
-          for (const w of a)
-            b[w] = f[w];
-        for (const w of r)
-          b[w] = i;
+          for (const $ of a)
+            b[$] = f[$];
+        for (const $ of r)
+          b[$] = i;
         l.push(b);
       }
     }
   }
   return l;
 }
-function mn(d) {
+function gn(d) {
   if (!d)
     return null;
   if (Array.isArray(d)) {
@@ -5765,7 +5783,7 @@ function mn(d) {
   const e = new Date(d);
   return isNaN(e.getTime()) ? null : [e, e];
 }
-function ze(d, e, t) {
+function Ge(d, e, t) {
   if (!e.timeDimensions || e.timeDimensions.length === 0)
     return d;
   const n = e.timeDimensions.filter((u) => {
@@ -5777,7 +5795,7 @@ function ze(d, e, t) {
   const s = e.fillMissingDatesValue === void 0 ? 0 : e.fillMissingDatesValue, i = new Set(e.timeDimensions.map((u) => u.dimension)), r = (e.dimensions || []).filter((u) => !i.has(u));
   let a = d;
   for (const u of n) {
-    const c = mn(u.dateRange);
+    const c = gn(u.dateRange);
     if (!c)
       continue;
     const l = {
@@ -5788,14 +5806,14 @@ function ze(d, e, t) {
       measures: t,
       dimensions: r
     };
-    a = dn(a, l);
+    a = hn(a, l);
   }
   return a;
 }
-class fn {
+class bn {
   dateTimeBuilder;
   constructor(e) {
-    this.dateTimeBuilder = new ne(e);
+    this.dateTimeBuilder = new ie(e);
   }
   /**
    * Check if a query contains compareDateRange
@@ -5976,9 +5994,9 @@ class fn {
     });
   }
 }
-class pn {
+class yn {
   constructor(e) {
-    this.databaseAdapter = e, this.dateTimeBuilder = new ne(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
+    this.databaseAdapter = e, this.dateTimeBuilder = new ie(e), this.filterBuilder = new ge(e, this.dateTimeBuilder);
   }
   filterBuilder;
   dateTimeBuilder;
@@ -6025,7 +6043,7 @@ class pn {
       if (i.name || n.push(`Step ${s} must have a name`), "cube" in i && i.cube && (t.get(i.cube) || n.push(`Step ${s} cube not found: ${i.cube}`)), i.filter) {
         let r;
         "cube" in i && i.cube ? r = i.cube : typeof e.bindingKey == "string" && ([r] = e.bindingKey.split("."));
-        const a = r ? new oe(t) : null, u = Array.isArray(i.filter) ? i.filter : [i.filter];
+        const a = r ? new ae(t) : null, u = Array.isArray(i.filter) ? i.filter : [i.filter];
         for (const c of u)
           if ("member" in c) {
             const [l, m] = c.member.split("."), p = t.get(l);
@@ -6113,7 +6131,7 @@ class pn {
    * Resolve steps with their cube, SQL expressions, and filter conditions
    */
   resolveSteps(e, t, n) {
-    const s = new oe(t);
+    const s = new ae(t);
     return e.steps.map((i, r) => {
       const a = this.resolveCubeForStep(i, e, t), u = this.resolveBindingKey(e, a, n), c = this.resolveTimeDimension(e, a, n), l = this.buildStepFilters(i, a, t, n), m = this.extractFilterCubeNames(i), p = [];
       for (const f of m)
@@ -6222,20 +6240,20 @@ class pn {
       if (r) {
         const b = e;
         y = b.type === "and";
-        for (const w of b.filters || []) {
-          const A = this.buildFilterCondition(w, t, n, s);
+        for (const $ of b.filters || []) {
+          const A = this.buildFilterCondition($, t, n, s);
           A && g.push(A);
         }
       } else {
         const b = e;
         y = "and" in b && !!b.and;
-        const w = b.and || b.or || [];
-        for (const A of w) {
-          const $ = this.buildFilterCondition(A, t, n, s);
-          $ && g.push($);
+        const $ = b.and || b.or || [];
+        for (const A of $) {
+          const w = this.buildFilterCondition(A, t, n, s);
+          w && g.push(w);
         }
       }
-      return g.length === 0 ? null : g.length === 1 ? g[0] : y ? D(...g) : o`(${o.join(g, o` OR `)})`;
+      return g.length === 0 ? null : g.length === 1 ? g[0] : y ? _(...g) : o`(${o.join(g, o` OR `)})`;
     }
     const a = e, [u, c] = a.member.split("."), l = a.dateRange !== void 0;
     if (a.operator !== "set" && a.operator !== "notSet" && !l && (!a.values || a.values.length === 0 || a.values[0] === void 0 || a.values[0] === ""))
@@ -6244,7 +6262,7 @@ class pn {
     if (!p)
       return null;
     if (u !== t.name) {
-      const y = new oe(n).findPath(t.name, u);
+      const y = new ae(n).findPath(t.name, u);
       if (!y || y.length === 0)
         return console.warn(
           `Funnel filter: Cannot filter by '${u}.${c}' in step using '${t.name}'. No join path found. Filter will be skipped.`
@@ -6291,7 +6309,7 @@ class pn {
       step_time: o`MIN(${e.timeExpr})`.as("step_time")
     }).from(s.from);
     if (r = this.addCrossJoinsToQuery(r, e, t, i), i.length > 0) {
-      const a = i.length === 1 ? i[0] : D(...i);
+      const a = i.length === 1 ? i[0] : _(...i);
       r = r.where(a);
     }
     return r = r.groupBy(e.bindingKeyExpr), t.db.$with(n).as(r);
@@ -6324,7 +6342,7 @@ class pn {
       o`${e.bindingKeyExpr} = ${o.identifier(i)}.binding_key`
     );
     if (l = this.addCrossJoinsToQuery(l, e, t, a), a.length > 0) {
-      const m = a.length === 1 ? a[0] : D(...a);
+      const m = a.length === 1 ? a[0] : _(...a);
       l = l.where(m);
     }
     return l = l.groupBy(e.bindingKeyExpr), t.db.$with(s).as(l);
@@ -6341,7 +6359,7 @@ class pn {
         const a = r.joinDef, u = [];
         for (const p of a.on)
           p.as ? u.push(p.as(p.source, p.target)) : u.push(Q(p.source, p.target));
-        const c = u.length === 1 ? u[0] : D(...u), m = i.cube.sql(n);
+        const c = u.length === 1 ? u[0] : _(...u), m = i.cube.sql(n);
         e = e.leftJoin(m.from, c), m.where && s.push(m.where);
       }
     return e;
@@ -6414,12 +6432,12 @@ class pn {
     return i.db.$with("funnel_metrics").as(a);
   }
 }
-class hn {
+class Cn {
   filterBuilder;
   dateTimeBuilder;
   databaseAdapter;
   constructor(e) {
-    this.databaseAdapter = e, this.dateTimeBuilder = new ne(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
+    this.databaseAdapter = e, this.dateTimeBuilder = new ie(e), this.filterBuilder = new ge(e, this.dateTimeBuilder);
   }
   /**
    * Check if query contains flow configuration
@@ -6650,7 +6668,7 @@ class hn {
         const p = this.buildFilterCondition(m, t, n);
         p && c.push(p);
       }
-      return c.length === 0 ? null : c.length === 1 ? c[0] : "and" in e ? D(...c) : o`(${o.join(c, o` OR `)})`;
+      return c.length === 0 ? null : c.length === 1 ? c[0] : "and" in e ? _(...c) : o`(${o.join(c, o` OR `)})`;
     }
     if ("type" in e && "filters" in e) {
       const u = e, c = [];
@@ -6658,7 +6676,7 @@ class hn {
         const m = this.buildFilterCondition(l, t, n);
         m && c.push(m);
       }
-      return c.length === 0 ? null : c.length === 1 ? c[0] : u.type === "and" ? D(...c) : o`(${o.join(c, o` OR `)})`;
+      return c.length === 0 ? null : c.length === 1 ? c[0] : u.type === "and" ? _(...c) : o`(${o.join(c, o` OR `)})`;
     }
     const s = e, [, i] = s.member.split("."), r = t.dimensions?.[i];
     if (!r) return null;
@@ -6690,7 +6708,7 @@ class hn {
       event_path: o`${a}`.as("event_path")
     }).from(s.from);
     if (c.length > 0) {
-      const m = c.length === 1 ? c[0] : D(...c);
+      const m = c.length === 1 ? c[0] : _(...c);
       l = l.where(m);
     }
     return l = l.groupBy(i, a), e.entityLimit && (l = l.limit(e.entityLimit)), n.db.$with("starting_entities").as(l);
@@ -6707,12 +6725,12 @@ class hn {
         o`${i} = ${o.identifier(m)}.binding_key`,
         o`${r} < ${o.identifier(m)}.${o.identifier(p)}`
       );
-      const g = h.length === 1 ? h[0] : D(...h), y = c ? o`${a} || ${"→"} || ${o.identifier(m)}.event_path` : o`${a}`, b = n.db.select({
+      const g = h.length === 1 ? h[0] : _(...h), y = c ? o`${a} || ${"→"} || ${o.identifier(m)}.event_path` : o`${a}`, b = n.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${a}`.as("event_type"),
         event_path: y.as("event_path")
-      }).from(s.from).where(g).orderBy(o`${r} DESC`).limit(1), w = n.db.$with(f).as(
+      }).from(s.from).where(g).orderBy(o`${r} DESC`).limit(1), $ = n.db.$with(f).as(
         n.db.select({
           binding_key: o`e.binding_key`.as("binding_key"),
           step_time: o`e.step_time`.as("step_time"),
@@ -6720,7 +6738,7 @@ class hn {
           event_path: o`e.event_path`.as("event_path")
         }).from(o`${o.identifier(m)}`).crossJoinLateral(b.as("e"))
       );
-      u.push(w);
+      u.push($);
     }
     return u;
   }
@@ -6736,12 +6754,12 @@ class hn {
         o`${i} = ${o.identifier(m)}.binding_key`,
         o`${r} > ${o.identifier(m)}.${o.identifier(p)}`
       );
-      const g = h.length === 1 ? h[0] : D(...h), y = c ? o`${o.identifier(m)}.event_path || ${"→"} || ${a}` : o`${a}`, b = n.db.select({
+      const g = h.length === 1 ? h[0] : _(...h), y = c ? o`${o.identifier(m)}.event_path || ${"→"} || ${a}` : o`${a}`, b = n.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${a}`.as("event_type"),
         event_path: y.as("event_path")
-      }).from(s.from).where(g).orderBy(o`${r} ASC`).limit(1), w = n.db.$with(f).as(
+      }).from(s.from).where(g).orderBy(o`${r} ASC`).limit(1), $ = n.db.$with(f).as(
         n.db.select({
           binding_key: o`e.binding_key`.as("binding_key"),
           step_time: o`e.step_time`.as("step_time"),
@@ -6749,7 +6767,7 @@ class hn {
           event_path: o`e.event_path`.as("event_path")
         }).from(o`${o.identifier(m)}`).crossJoinLateral(b.as("e"))
       );
-      u.push(w);
+      u.push($);
     }
     return u;
   }
@@ -6767,7 +6785,7 @@ class hn {
       s.where && h.push(s.where), h.push(
         o`${r} < ${o.identifier(m)}.${o.identifier(p)}`
       );
-      const g = h.length === 1 ? h[0] : D(...h), y = c ? o`${a} || ${"→"} || ${o.identifier(m)}.event_path` : o`${a}`, b = n.db.select({
+      const g = h.length === 1 ? h[0] : _(...h), y = c ? o`${a} || ${"→"} || ${o.identifier(m)}.event_path` : o`${a}`, b = n.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${a}`.as("event_type"),
@@ -6776,13 +6794,13 @@ class hn {
       }).from(s.from).innerJoin(
         o`${o.identifier(m)}`,
         o`${i} = ${o.identifier(m)}.binding_key`
-      ).where(g), w = n.db.select({
+      ).where(g), $ = n.db.select({
         binding_key: o`binding_key`.as("binding_key"),
         step_time: o`step_time`.as("step_time"),
         event_type: o`event_type`.as("event_type"),
         event_path: o`event_path`.as("event_path")
       }).from(b.as("ranked")).where(o`rn = 1`);
-      u.push(n.db.$with(f).as(w));
+      u.push(n.db.$with(f).as($));
     }
     return u;
   }
@@ -6800,7 +6818,7 @@ class hn {
       s.where && h.push(s.where), h.push(
         o`${r} > ${o.identifier(m)}.${o.identifier(p)}`
       );
-      const g = h.length === 1 ? h[0] : D(...h), y = c ? o`${o.identifier(m)}.event_path || ${"→"} || ${a}` : o`${a}`, b = n.db.select({
+      const g = h.length === 1 ? h[0] : _(...h), y = c ? o`${o.identifier(m)}.event_path || ${"→"} || ${a}` : o`${a}`, b = n.db.select({
         binding_key: o`${i}`.as("binding_key"),
         step_time: o`${r}`.as("step_time"),
         event_type: o`${a}`.as("event_type"),
@@ -6809,13 +6827,13 @@ class hn {
       }).from(s.from).innerJoin(
         o`${o.identifier(m)}`,
         o`${i} = ${o.identifier(m)}.binding_key`
-      ).where(g), w = n.db.select({
+      ).where(g), $ = n.db.select({
         binding_key: o`binding_key`.as("binding_key"),
         step_time: o`step_time`.as("step_time"),
         event_type: o`event_type`.as("event_type"),
         event_path: o`event_path`.as("event_path")
       }).from(b.as("ranked")).where(o`rn = 1`);
-      u.push(n.db.$with(f).as(w));
+      u.push(n.db.$with(f).as($));
     }
     return u;
   }
@@ -7016,31 +7034,31 @@ class hn {
     return e.db.$with("final_result").as(n);
   }
 }
-function Ve(d) {
+function He(d) {
   return Array.isArray(d);
 }
-function ut(d) {
+function dt(d) {
   return typeof d == "object" && d !== null && "cube" in d;
 }
-function Je(d) {
-  if (ut(d))
+function Ye(d) {
+  if (dt(d))
     return d.cube;
   const e = d.indexOf(".");
   if (e === -1)
     throw new Error(`Invalid time dimension format: ${d}. Expected 'CubeName.dimensionName'`);
   return d.substring(0, e);
 }
-function Ge(d) {
-  if (ut(d))
+function Xe(d) {
+  if (dt(d))
     return d.dimension;
   const e = d.indexOf(".");
   if (e === -1)
     throw new Error(`Invalid time dimension format: ${d}. Expected 'CubeName.dimensionName'`);
   return d.substring(e + 1);
 }
-class gn {
+class wn {
   constructor(e) {
-    this.databaseAdapter = e, this.dateTimeBuilder = new ne(e), this.filterBuilder = new he(e, this.dateTimeBuilder);
+    this.databaseAdapter = e, this.dateTimeBuilder = new ie(e), this.filterBuilder = new ge(e, this.dateTimeBuilder);
   }
   filterBuilder;
   dateTimeBuilder;
@@ -7056,12 +7074,12 @@ class gn {
   validateConfig(e, t) {
     const n = [];
     try {
-      const r = Je(e.timeDimension), a = Ge(e.timeDimension), u = t.get(r);
+      const r = Ye(e.timeDimension), a = Xe(e.timeDimension), u = t.get(r);
       u ? u.dimensions?.[a] || n.push(`Time dimension not found: ${a} in cube ${r}`) : n.push(`Cube not found: ${r}`);
     } catch {
       n.push(`Invalid time dimension format: ${e.timeDimension}`);
     }
-    if (Ve(e.bindingKey))
+    if (He(e.bindingKey))
       for (const r of e.bindingKey) {
         const a = t.get(r.cube);
         if (!a)
@@ -7173,7 +7191,7 @@ class gn {
    * Same cube/dimension used for both cohort entry and activity detection
    */
   resolveConfig(e, t, n) {
-    const s = Je(e.timeDimension), i = Ge(e.timeDimension), r = t.get(s);
+    const s = Ye(e.timeDimension), i = Xe(e.timeDimension), r = t.get(s);
     if (!r)
       throw new Error(`Cube not found: ${s}`);
     const a = r.dimensions?.[i];
@@ -7194,7 +7212,7 @@ class gn {
    * Resolve binding key expression for a cube
    */
   resolveBindingKey(e, t, n, s) {
-    if (Ve(e)) {
+    if (He(e)) {
       const c = e.find((f) => f.cube === t.name);
       if (!c)
         throw new Error(`No binding key mapping found for cube: ${t.name}`);
@@ -7236,7 +7254,7 @@ class gn {
         const y = this.buildSingleFilterCondition(g, t, n, s);
         y && p.push(y);
       }
-      return p.length === 0 ? null : p.length === 1 ? p[0] : f ? D(...p) : o`(${o.join(p, o` OR `)})`;
+      return p.length === 0 ? null : p.length === 1 ? p[0] : f ? _(...p) : o`(${o.join(p, o` OR `)})`;
     }
     const i = e, [r, a] = i.member.split("."), u = n.get(r);
     if (!u) return null;
@@ -7278,7 +7296,7 @@ class gn {
     }
     let u = n.db.select(a).from(s.from);
     if (i.length > 0) {
-      const l = i.length === 1 ? i[0] : D(...i);
+      const l = i.length === 1 ? i[0] : _(...i);
       u = u.where(l);
     }
     const c = [t.bindingKeyExpr];
@@ -7333,7 +7351,7 @@ class gn {
       o`${t.bindingKeyExpr} = cohort_base.binding_key`
     );
     if (i.length > 0) {
-      const m = i.length === 1 ? i[0] : D(...i);
+      const m = i.length === 1 ? i[0] : _(...i);
       c = c.where(m);
     }
     const l = [
@@ -7426,11 +7444,11 @@ class gn {
     return t.length > 1 ? t[1] : t[0];
   }
 }
-class J {
+class Y {
   constructor(e, t) {
     if (this.dbExecutor = e, this.databaseAdapter = e.databaseAdapter, !this.databaseAdapter)
       throw new Error("DatabaseExecutor must have a databaseAdapter property");
-    this.queryBuilder = new rn(this.databaseAdapter), this.queryPlanner = new at(), this.cteBuilder = new on(this.queryBuilder), this.comparisonQueryBuilder = new fn(this.databaseAdapter), this.funnelQueryBuilder = new pn(this.databaseAdapter), this.flowQueryBuilder = new hn(this.databaseAdapter), this.retentionQueryBuilder = new gn(this.databaseAdapter), this.cacheConfig = t;
+    this.queryBuilder = new ln(this.databaseAdapter), this.queryPlanner = new ct(), this.cteBuilder = new cn(this.queryBuilder), this.comparisonQueryBuilder = new bn(this.databaseAdapter), this.funnelQueryBuilder = new yn(this.databaseAdapter), this.flowQueryBuilder = new Cn(this.databaseAdapter), this.retentionQueryBuilder = new wn(this.databaseAdapter), this.cacheConfig = t;
   }
   queryBuilder;
   queryPlanner;
@@ -7460,13 +7478,13 @@ class J {
         if (!b.isValid)
           throw new Error(`Retention validation failed: ${b.errors.join(", ")}`);
       } else {
-        const b = ct(e, t);
+        const b = ft(e, t);
         if (!b.isValid)
           throw new Error(`Query validation failed: ${b.errors.join(", ")}`);
       }
       let i;
       if (this.cacheConfig?.enabled !== !1 && this.cacheConfig?.provider)
-        if (i = Gt(t, n, this.cacheConfig), s?.skipCache)
+        if (i = Zt(t, n, this.cacheConfig), s?.skipCache)
           this.cacheConfig.onCacheEvent?.({
             type: "miss",
             key: i,
@@ -7474,19 +7492,19 @@ class J {
           });
         else
           try {
-            const b = Date.now(), w = await this.cacheConfig.provider.get(i);
-            if (w)
+            const b = Date.now(), $ = await this.cacheConfig.provider.get(i);
+            if ($)
               return this.cacheConfig.onCacheEvent?.({
                 type: "hit",
                 key: i,
                 durationMs: Date.now() - b
               }), {
-                ...w.value,
-                cache: w.metadata ? {
+                ...$.value,
+                cache: $.metadata ? {
                   hit: !0,
-                  cachedAt: new Date(w.metadata.cachedAt).toISOString(),
-                  ttlMs: w.metadata.ttlMs,
-                  ttlRemainingMs: w.metadata.ttlRemainingMs
+                  cachedAt: new Date($.metadata.cachedAt).toISOString(),
+                  ttlMs: $.metadata.ttlMs,
+                  ttlRemainingMs: $.metadata.ttlRemainingMs
                 } : {
                   hit: !0,
                   cachedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -7510,7 +7528,7 @@ class J {
         return this.executeFlowQueryWithCache(e, t, n, i);
       if (this.retentionQueryBuilder.hasRetention(t))
         return this.executeRetentionQueryWithCache(e, t, n, i);
-      const r = new We(), a = {
+      const r = new ze(), a = {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: n,
@@ -7520,20 +7538,20 @@ class J {
       const u = this.queryPlanner.createQueryPlan(e, t, a);
       this.validateSecurityContext(u, a);
       const c = this.buildUnifiedQuery(u, t, a), l = this.queryBuilder.collectNumericFields(e, t), m = await this.dbExecutor.execute(c, l), p = Array.isArray(m) ? m.map((b) => {
-        const w = { ...b };
+        const $ = { ...b };
         if (t.timeDimensions) {
           for (const A of t.timeDimensions)
-            if (A.dimension in w) {
-              let $ = w[A.dimension];
-              if (typeof $ == "string" && $.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-                const C = $.replace(" ", "T"), T = !C.endsWith("Z") && !C.includes("+") ? C + "Z" : C;
-                $ = new Date(T);
+            if (A.dimension in $) {
+              let w = $[A.dimension];
+              if (typeof w == "string" && w.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
+                const C = w.replace(" ", "T"), T = !C.endsWith("Z") && !C.includes("+") ? C + "Z" : C;
+                w = new Date(T);
               }
-              $ = this.databaseAdapter.convertTimeDimensionResult($), w[A.dimension] = $;
+              w = this.databaseAdapter.convertTimeDimensionResult(w), $[A.dimension] = w;
             }
         }
-        return w;
-      }) : [m], f = t.measures || [], h = ze(p, t, f), g = this.generateAnnotations(u, t), y = {
+        return $;
+      }) : [m], f = t.measures || [], h = Ge(p, t, f), g = this.generateAnnotations(u, t), y = {
         data: h,
         annotation: g,
         // Include warnings from query planning (e.g., fan-out without dimensions)
@@ -7797,7 +7815,7 @@ class J {
    * This is the core execution logic extracted for use by comparison queries
    */
   async executeStandardQuery(e, t, n) {
-    const s = new We(), i = {
+    const s = new ze(), i = {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: n,
@@ -7811,14 +7829,14 @@ class J {
           if (y.dimension in g) {
             let b = g[y.dimension];
             if (typeof b == "string" && b.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-              const w = b.replace(" ", "T"), A = !w.endsWith("Z") && !w.includes("+") ? w + "Z" : w;
+              const $ = b.replace(" ", "T"), A = !$.endsWith("Z") && !$.includes("+") ? $ + "Z" : $;
               b = new Date(A);
             }
             b = this.databaseAdapter.convertTimeDimensionResult(b), g[y.dimension] = b;
           }
       }
       return g;
-    }) : [c], m = t.measures || [], p = ze(l, t, m), f = this.generateAnnotations(r, t);
+    }) : [c], m = t.measures || [], p = Ge(l, t, m), f = this.generateAnnotations(r, t);
     return {
       data: p,
       annotation: f
@@ -7859,9 +7877,9 @@ class J {
   buildUnifiedQuery(e, t, n) {
     const s = /* @__PURE__ */ new Map();
     if (e.preAggregationCTEs && e.preAggregationCTEs.length > 0) {
-      for (const $ of e.preAggregationCTEs)
-        if ($.propagatingFilters && $.propagatingFilters.length > 0)
-          for (const C of $.propagatingFilters) {
+      for (const w of e.preAggregationCTEs)
+        if (w.propagatingFilters && w.propagatingFilters.length > 0)
+          for (const C of w.propagatingFilters) {
             const T = C.sourceCube.name;
             if (!s.has(T)) {
               const N = {
@@ -7874,17 +7892,17 @@ class J {
               s.set(T, R);
             }
             const E = s.get(T);
-            E && E.length > 0 && (C.preBuiltFilterSQL = E.length === 1 ? E[0] : D(...E));
+            E && E.length > 0 && (C.preBuiltFilterSQL = E.length === 1 ? E[0] : _(...E));
           }
     }
     const i = [], r = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map();
     if (e.preAggregationCTEs && e.preAggregationCTEs.length > 0)
-      for (const $ of e.preAggregationCTEs) {
-        const C = this.cteBuilder.buildPreAggregationCTE($, t, n, e, s);
-        if (C && (i.push(C), r.set($.cube.name, $.cteAlias), $.downstreamJoinKeys))
-          for (const T of $.downstreamJoinKeys)
+      for (const w of e.preAggregationCTEs) {
+        const C = this.cteBuilder.buildPreAggregationCTE(w, t, n, e, s);
+        if (C && (i.push(C), r.set(w.cube.name, w.cteAlias), w.downstreamJoinKeys))
+          for (const T of w.downstreamJoinKeys)
             a.set(T.targetCubeName, {
-              cteAlias: $.cteAlias,
+              cteAlias: w.cteAlias,
               joinKeys: T.joinKeys
             });
       }
@@ -7895,97 +7913,97 @@ class J {
       n
     ) };
     if (e.preAggregationCTEs)
-      for (const $ of e.preAggregationCTEs) {
-        const C = $.cube.name;
-        for (const T of $.measures)
+      for (const w of e.preAggregationCTEs) {
+        const C = w.cube.name;
+        for (const T of w.measures)
           if (m[T]) {
             const [, E] = T.split("."), N = c.get(C);
             if (N && N.measures && N.measures[E]) {
-              const S = N.measures[E], R = o`${o.identifier($.cteAlias)}.${o.identifier(E)}`;
-              let _;
+              const S = N.measures[E], R = o`${o.identifier(w.cteAlias)}.${o.identifier(E)}`;
+              let D;
               if (S.type === "calculated" && S.calculatedSql)
-                _ = this.queryBuilder.buildCTECalculatedMeasure(
+                D = this.queryBuilder.buildCTECalculatedMeasure(
                   S,
                   N,
-                  $,
+                  w,
                   c,
                   n
                 );
               else {
-                const F = $.cteReason === "fanOutPrevention", k = this.shouldUseMaxForHasManyAtJoinKeyGrain(
-                  $,
+                const F = w.cteReason === "fanOutPrevention", U = this.shouldUseMaxForHasManyAtJoinKeyGrain(
+                  w,
                   t,
                   c
-                ), M = F || k;
+                ), j = F || U;
                 switch (S.type) {
                   case "count":
                   case "countDistinct":
                   case "sum":
-                    _ = M ? V(R) : K(R);
+                    D = j ? G(R) : z(R);
                     break;
                   case "avg":
-                    _ = M ? V(R) : this.databaseAdapter.buildAvg(R);
+                    D = j ? G(R) : this.databaseAdapter.buildAvg(R);
                     break;
                   case "min":
-                    _ = re(R);
+                    D = oe(R);
                     break;
                   case "max":
-                    _ = V(R);
+                    D = G(R);
                     break;
                   case "number":
-                    _ = M ? V(R) : K(R);
+                    D = j ? G(R) : z(R);
                     break;
                   default:
-                    _ = M ? V(R) : K(R);
+                    D = j ? G(R) : z(R);
                 }
               }
-              m[T] = o`${_}`.as(T);
+              m[T] = o`${D}`.as(T);
             }
           }
         for (const T in m) {
           const [E, N] = T.split(".");
           if (E === C) {
-            const S = c.get(C), R = S && S.dimensions?.[N], _ = T.startsWith(C + ".");
-            if (R || _) {
-              let F = $.joinKeys.find((k) => k.targetColumn === N);
+            const S = c.get(C), R = S && S.dimensions?.[N], D = T.startsWith(C + ".");
+            if (R || D) {
+              let F = w.joinKeys.find((U) => U.targetColumn === N);
               if (!F && S?.dimensions?.[N]) {
-                const k = S.dimensions[N].sql;
-                F = $.joinKeys.find((M) => M.targetColumnObj === k);
+                const U = S.dimensions[N].sql;
+                F = w.joinKeys.find((j) => j.targetColumnObj === U);
               }
-              F ? m[T] = o`${o.identifier($.cteAlias)}.${o.identifier(N)}`.as(T) : _ && S?.dimensions?.[N] && (m[T] = o`${o.identifier($.cteAlias)}.${o.identifier(N)}`.as(T));
+              F ? m[T] = o`${o.identifier(w.cteAlias)}.${o.identifier(N)}`.as(T) : D && S?.dimensions?.[N] && (m[T] = o`${o.identifier(w.cteAlias)}.${o.identifier(N)}`.as(T));
             }
           }
         }
       }
     if (t.measures)
-      for (const $ of t.measures) {
-        const [C, T] = $.split("."), E = c.get(C);
+      for (const w of t.measures) {
+        const [C, T] = w.split("."), E = c.get(C);
         if (E?.measures?.[T]) {
           const N = E.measures[T];
           if (I.isPostAggregationWindow(N)) {
             const S = I.getWindowBaseMeasure(N, C);
             if (S) {
-              const [R, _] = S.split("."), F = c.get(R);
-              if (F?.measures?.[_]) {
-                const k = F.measures[_], M = e.preAggregationCTEs?.find(
-                  (H) => H.cube?.name === R && H.measures?.includes(S)
+              const [R, D] = S.split("."), F = c.get(R);
+              if (F?.measures?.[D]) {
+                const U = F.measures[D], j = e.preAggregationCTEs?.find(
+                  (q) => q.cube?.name === R && q.measures?.includes(S)
                 );
-                let z;
-                if (M) {
-                  const H = o`${o.identifier(M.cteAlias)}.${o.identifier(_)}`;
-                  z = o`sum(${H})`;
+                let B;
+                if (j) {
+                  const q = o`${o.identifier(j.cteAlias)}.${o.identifier(D)}`;
+                  B = o`sum(${q})`;
                 } else
-                  z = this.queryBuilder.buildMeasureExpression(k, n, F);
-                m[S] || (m[S] = o`${z}`.as(S));
-                const se = this.buildPostAggregationWindowExpression(
+                  B = this.queryBuilder.buildMeasureExpression(U, n, F);
+                m[S] || (m[S] = o`${B}`.as(S));
+                const V = this.buildPostAggregationWindowExpression(
                   N,
-                  z,
+                  B,
                   t,
                   n,
                   E,
                   e
                 );
-                se && (m[$] = o`${se}`.as($));
+                V && (m[w] = o`${V}`.as(w));
               }
             }
           }
@@ -7994,99 +8012,117 @@ class J {
     const p = [];
     let f = n.db.select(m).from(u.from);
     if (i.length > 0 && (f = n.db.with(...i).select(m).from(u.from)), u.joins)
-      for (const $ of u.joins)
-        switch ($.type || "left") {
+      for (const w of u.joins)
+        switch (w.type || "left") {
           case "left":
-            f = f.leftJoin($.table, $.on);
+            f = f.leftJoin(w.table, w.on);
             break;
           case "inner":
-            f = f.innerJoin($.table, $.on);
+            f = f.innerJoin(w.table, w.on);
             break;
           case "right":
-            f = f.rightJoin($.table, $.on);
+            f = f.rightJoin(w.table, w.on);
             break;
           case "full":
-            f = f.fullJoin($.table, $.on);
+            f = f.fullJoin(w.table, w.on);
             break;
         }
     const h = /* @__PURE__ */ new Set(), g = /* @__PURE__ */ new Set();
     if (e.preAggregationCTEs) {
-      for (const $ of e.preAggregationCTEs)
-        if ($.intermediateJoins && $.intermediateJoins.length > 0)
-          for (const C of $.intermediateJoins)
+      for (const w of e.preAggregationCTEs)
+        if (w.intermediateJoins && w.intermediateJoins.length > 0)
+          for (const C of w.intermediateJoins)
             g.add(C.cube.name);
     }
     if (e.joinCubes && e.joinCubes.length > 0)
-      for (const $ of e.joinCubes) {
-        const C = $.cube.name;
+      for (const w of e.joinCubes) {
+        const C = w.cube.name;
         if (g.has(C) && !r.has(C))
           continue;
-        const T = r.get($.cube.name);
-        if ($.junctionTable) {
-          const F = $.junctionTable, k = [];
+        const T = r.get(w.cube.name);
+        if (w.junctionTable) {
+          const F = w.junctionTable;
+          let U = F.joinCondition;
+          const j = F.sourceCubeName ? r.get(F.sourceCubeName) : void 0;
+          if (j) {
+            const q = e.preAggregationCTEs?.find(
+              (H) => H.cube.name === F.sourceCubeName
+            )?.downstreamJoinKeys?.find(
+              (H) => H.targetCubeName === w.cube.name
+            );
+            if (q && q.joinKeys.length > 0) {
+              const H = [];
+              for (const Oe of q.joinKeys) {
+                const yt = o`${o.identifier(j)}.${o.identifier(Oe.sourceColumn)}`, Ie = Oe.targetColumnObj;
+                Ie && H.push(Q(Ie, yt));
+              }
+              H.length > 0 && (U = _(...H));
+            }
+          }
+          const B = [];
           if (F.securitySql) {
-            const M = F.securitySql(n.securityContext);
-            Array.isArray(M) ? k.push(...M) : k.push(M);
+            const V = F.securitySql(n.securityContext);
+            Array.isArray(V) ? B.push(...V) : B.push(V);
           }
           try {
             switch (F.joinType || "left") {
               case "left":
-                f = f.leftJoin(F.table, F.joinCondition);
+                f = f.leftJoin(F.table, U);
                 break;
               case "inner":
-                f = f.innerJoin(F.table, F.joinCondition);
+                f = f.innerJoin(F.table, U);
                 break;
               case "right":
-                f = f.rightJoin(F.table, F.joinCondition);
+                f = f.rightJoin(F.table, U);
                 break;
               case "full":
-                f = f.fullJoin(F.table, F.joinCondition);
+                f = f.fullJoin(F.table, U);
                 break;
             }
-            k.length > 0 && p.push(...k);
+            B.length > 0 && p.push(...B);
           } catch {
           }
         }
         let E, N, S;
         if (T)
-          E = o`${o.identifier(T)}`, N = this.cteBuilder.buildCTEJoinCondition($, T, e), S = void 0;
+          E = o`${o.identifier(T)}`, N = this.cteBuilder.buildCTEJoinCondition(w, T, e), S = void 0;
         else {
-          const F = a.get($.cube.name), k = $.cube.sql(n);
-          if (E = k.from, S = k.where, F) {
-            const M = [];
-            for (const z of F.joinKeys) {
-              const se = o`${o.identifier(F.cteAlias)}.${o.identifier(z.sourceColumn)}`, H = z.targetColumnObj || o.identifier(z.targetColumn);
-              M.push(Q(se, H));
+          const F = a.get(w.cube.name), U = w.cube.sql(n);
+          if (E = U.from, S = U.where, F && !w.junctionTable) {
+            const j = [];
+            for (const B of F.joinKeys) {
+              const V = o`${o.identifier(F.cteAlias)}.${o.identifier(B.sourceColumn)}`, q = B.targetColumnObj || o.identifier(B.targetColumn);
+              j.push(Q(V, q));
             }
-            N = M.length === 1 ? M[0] : D(...M);
+            N = j.length === 1 ? j[0] : _(...j);
           } else
-            N = $.joinCondition;
+            N = w.joinCondition;
         }
-        const R = $.joinType || "left", _ = R !== "inner" && S ? D(N, S) : N;
+        const R = w.joinType || "left", D = R !== "inner" && S ? _(N, S) : N;
         try {
           switch (R) {
             case "left":
-              f = f.leftJoin(E, _), S && h.add($.cube.name);
+              f = f.leftJoin(E, D), S && h.add(w.cube.name);
               break;
             case "inner":
               f = f.innerJoin(E, N);
               break;
             case "right":
-              f = f.rightJoin(E, _), S && h.add($.cube.name);
+              f = f.rightJoin(E, D), S && h.add(w.cube.name);
               break;
             case "full":
-              f = f.fullJoin(E, _), S && h.add($.cube.name);
+              f = f.fullJoin(E, D), S && h.add(w.cube.name);
               break;
           }
         } catch {
         }
       }
     if (u.where && p.push(u.where), e.joinCubes && e.joinCubes.length > 0)
-      for (const $ of e.joinCubes) {
-        const C = $.cube.name;
+      for (const w of e.joinCubes) {
+        const C = w.cube.name;
         if (r.get(C) || g.has(C) || h.has(C))
           continue;
-        const E = $.cube.sql(n);
+        const E = w.cube.sql(n);
         E.where && p.push(E.where);
       }
     const y = this.queryBuilder.buildWhereConditions(
@@ -8100,8 +8136,8 @@ class J {
       // Reuse pre-built filters for parameter deduplication
     );
     if (y.length > 0 && p.push(...y), p.length > 0) {
-      const $ = p.length === 1 ? p[0] : D(...p);
-      f = f.where($);
+      const w = p.length === 1 ? p[0] : _(...p);
+      f = f.where(w);
     }
     const b = this.queryBuilder.buildGroupByFields(
       e.joinCubes.length > 0 ? this.getCubesFromPlan(e) : e.primaryCube,
@@ -8112,7 +8148,7 @@ class J {
       // Pass the queryPlan to handle CTE scenarios
     );
     b.length > 0 && (f = f.groupBy(...b));
-    const w = this.queryBuilder.buildHavingConditions(
+    const $ = this.queryBuilder.buildHavingConditions(
       e.joinCubes.length > 0 ? this.getCubesFromPlan(e) : e.primaryCube,
       // Single cube
       t,
@@ -8120,9 +8156,9 @@ class J {
       e
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (w.length > 0) {
-      const $ = w.length === 1 ? w[0] : D(...w);
-      f = f.having($);
+    if ($.length > 0) {
+      const w = $.length === 1 ? $[0] : _(...$);
+      f = f.having(w);
     }
     const A = this.queryBuilder.buildOrderBy(t);
     return A.length > 0 && (f = f.orderBy(...A)), f = this.queryBuilder.applyLimitAndOffset(f, t), f;
@@ -8323,9 +8359,9 @@ class J {
    */
   preloadFilterCache(e, t, n, s) {
     if (e.filters && e.filters.length > 0) {
-      const i = ve(e.filters);
+      const i = Re(e.filters);
       for (const r of i) {
-        const a = de(r);
+        const a = me(r);
         if (t.has(a)) continue;
         const [u, c] = r.member.split("."), l = n.get(u);
         if (!l) continue;
@@ -8345,7 +8381,7 @@ class J {
     if (e.timeDimensions) {
       for (const i of e.timeDimensions)
         if (i.dateRange) {
-          const r = ot(i.dimension, i.dateRange);
+          const r = lt(i.dimension, i.dateRange);
           if (t.has(r)) continue;
           const [a, u] = i.dimension.split("."), c = n.get(a);
           if (!c) continue;
@@ -8383,12 +8419,12 @@ class J {
         const h = f.field.includes(".") ? f.field.split(".")[1] : f.field;
         if (n.timeDimensions)
           for (const b of n.timeDimensions) {
-            const [w, A] = b.dimension.split(".");
+            const [$, A] = b.dimension.split(".");
             if (A === h) {
-              const $ = u(w, h);
-              if ($)
+              const w = u($, h);
+              if (w)
                 return {
-                  field: $,
+                  field: w,
                   direction: f.direction
                 };
               const C = i.dimensions?.[A];
@@ -8425,10 +8461,10 @@ class J {
       else {
         const b = i.name === h ? i : void 0;
         if (b?.dimensions?.[g]) {
-          const w = b.dimensions[g];
+          const $ = b.dimensions[g];
           c = [{
             field: this.queryBuilder.buildTimeDimensionExpression(
-              w.sql,
+              $.sql,
               f.granularity,
               s
             ),
@@ -8468,7 +8504,7 @@ class J {
     }
   }
 }
-const bn = {
+const $n = {
   name: "drizzle-cube-mcp-guide",
   description: "How to use drizzle-cube MCP tools to generate and run queries",
   messages: [
@@ -8510,7 +8546,7 @@ const bn = {
       }
     }
   ]
-}, yn = {
+}, Tn = {
   name: "drizzle-cube-query-rules",
   description: "Key generation rules aligned with Gemini single-step prompt",
   messages: [
@@ -8533,7 +8569,7 @@ const bn = {
       }
     }
   ]
-}, Cn = {
+}, En = {
   name: "drizzle-cube-query-building",
   description: "CRITICAL: Complete guide for building valid queries of all types with examples",
   messages: [
@@ -8719,7 +8755,7 @@ const bn = {
       }
     }
   ]
-}, wn = {
+}, Sn = {
   name: "drizzle-cube-date-filtering",
   description: "CRITICAL: How to correctly filter by date vs group by time period - the #1 source of query mistakes",
   messages: [
@@ -8812,22 +8848,22 @@ const bn = {
       }
     }
   ]
-}, $n = [
-  bn,
-  yn,
-  Cn,
-  wn
+}, Nn = [
+  $n,
+  Tn,
+  En,
+  Sn
 ];
-function Tn() {
-  return $n;
+function Dn() {
+  return Nn;
 }
-class lt {
+class mt {
   cubes = /* @__PURE__ */ new Map();
   dbExecutor;
   metadataCache;
   cacheConfig;
   constructor(e) {
-    e?.databaseExecutor ? this.dbExecutor = e.databaseExecutor : e?.drizzle && (this.dbExecutor = Qe(
+    e?.databaseExecutor ? this.dbExecutor = e.databaseExecutor : e?.drizzle && (this.dbExecutor = qe(
       e.drizzle,
       e.schema,
       e.engineType
@@ -8849,7 +8885,7 @@ class lt {
    * Set Drizzle instance and schema directly
    */
   setDrizzle(e, t, n) {
-    this.dbExecutor = Qe(e, t, n);
+    this.dbExecutor = qe(e, t, n);
   }
   /**
    * Check if database executor is configured
@@ -8862,7 +8898,7 @@ class lt {
    * Validates calculated measures during registration
    */
   registerCube(e) {
-    this.validateCalculatedMeasures(e), new G(this.cubes).populateDependencies(e), this.cubes.set(e.name, e), this.invalidateMetadataCache();
+    this.validateCalculatedMeasures(e), new X(this.cubes).populateDependencies(e), this.cubes.set(e.name, e), this.invalidateMetadataCache();
   }
   /**
    * Validate calculated measures in a cube
@@ -8878,7 +8914,7 @@ class lt {
           );
           continue;
         }
-        const i = nn(s.calculatedSql);
+        const i = an(s.calculatedSql);
         if (!i.isValid) {
           t.push(
             `Invalid calculatedSql syntax in '${e.name}.${n}': ${i.errors.join(", ")}`
@@ -8887,7 +8923,7 @@ class lt {
         }
         const r = new Map(this.cubes);
         r.set(e.name, e);
-        const a = new G(r);
+        const a = new X(r);
         try {
           a.validateDependencies(e);
         } catch (u) {
@@ -8897,7 +8933,7 @@ class lt {
     if (t.length === 0) {
       const n = new Map(this.cubes);
       n.set(e.name, e);
-      const s = new G(n);
+      const s = new X(n);
       s.buildGraph(e);
       const i = s.detectCycle();
       i && t.push(
@@ -8936,7 +8972,7 @@ ${t.join(`
   async execute(e, t, n) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new J(this.dbExecutor, this.cacheConfig).execute(this.cubes, e, t, n);
+    return new Y(this.dbExecutor, this.cacheConfig).execute(this.cubes, e, t, n);
   }
   /**
    * Execute a multi-cube query
@@ -9014,7 +9050,7 @@ ${t.join(`
     for (let c = 0; c < n.length; c++) {
       const l = n[c], m = e.dimensions[l];
       let p;
-      m.type === "time" && (p = m.granularities || lt.DEFAULT_TIME_GRANULARITIES), i[c] = {
+      m.type === "time" && (p = m.granularities || mt.DEFAULT_TIME_GRANULARITIES), i[c] = {
         name: `${e.name}.${l}`,
         title: m.title || l,
         shortTitle: m.title || l,
@@ -9072,9 +9108,9 @@ ${t.join(`
       throw new Error(`Cube '${e}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const r = await new J(this.dbExecutor).generateSQL(s, t, n), a = this.dbExecutor.getEngineType();
+    const r = await new Y(this.dbExecutor).generateSQL(s, t, n), a = this.dbExecutor.getEngineType();
     return {
-      sql: Z(r.sql, a),
+      sql: te(r.sql, a),
       params: r.params
     };
   }
@@ -9084,9 +9120,9 @@ ${t.join(`
   async generateMultiCubeSQL(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const s = await new J(this.dbExecutor).generateMultiCubeSQL(this.cubes, e, t), i = this.dbExecutor.getEngineType();
+    const s = await new Y(this.dbExecutor).generateMultiCubeSQL(this.cubes, e, t), i = this.dbExecutor.getEngineType();
     return {
-      sql: Z(s.sql, i),
+      sql: te(s.sql, i),
       params: s.params
     };
   }
@@ -9097,9 +9133,9 @@ ${t.join(`
   async dryRunFunnel(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const s = await new J(this.dbExecutor).dryRunFunnel(this.cubes, e, t), i = this.dbExecutor.getEngineType();
+    const s = await new Y(this.dbExecutor).dryRunFunnel(this.cubes, e, t), i = this.dbExecutor.getEngineType();
     return {
-      sql: Z(s.sql, i),
+      sql: te(s.sql, i),
       params: s.params
     };
   }
@@ -9110,9 +9146,9 @@ ${t.join(`
   async dryRunFlow(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const s = await new J(this.dbExecutor).dryRunFlow(this.cubes, e, t), i = this.dbExecutor.getEngineType();
+    const s = await new Y(this.dbExecutor).dryRunFlow(this.cubes, e, t), i = this.dbExecutor.getEngineType();
     return {
-      sql: Z(s.sql, i),
+      sql: te(s.sql, i),
       params: s.params
     };
   }
@@ -9123,9 +9159,9 @@ ${t.join(`
   async dryRunRetention(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const s = await new J(this.dbExecutor).dryRunRetention(this.cubes, e, t), i = this.dbExecutor.getEngineType();
+    const s = await new Y(this.dbExecutor).dryRunRetention(this.cubes, e, t), i = this.dbExecutor.getEngineType();
     return {
-      sql: Z(s.sql, i),
+      sql: te(s.sql, i),
       params: s.params
     };
   }
@@ -9137,7 +9173,7 @@ ${t.join(`
   async explainQuery(e, t, n) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new J(this.dbExecutor).explainQuery(this.cubes, e, t, n);
+    return new Y(this.dbExecutor).explainQuery(this.cubes, e, t, n);
   }
   /**
    * Check if a cube exists
@@ -9176,7 +9212,7 @@ ${t.join(`
    * Ensures all referenced cubes and fields exist
    */
   validateQuery(e) {
-    return ct(this.cubes, e);
+    return ft(this.cubes, e);
   }
   /**
    * Analyze query planning decisions for debugging and transparency
@@ -9186,7 +9222,7 @@ ${t.join(`
   analyzeQuery(e, t) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const n = new at(), s = {
+    const n = new ct(), s = {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: t
@@ -9194,7 +9230,7 @@ ${t.join(`
     return n.analyzeQueryPlan(this.cubes, e, s);
   }
 }
-function ct(d, e) {
+function ft(d, e) {
   const t = [];
   if (e.funnel !== void 0 && e.funnel.steps?.length >= 2) {
     const s = e.funnel.bindingKey;
@@ -9215,7 +9251,7 @@ function ct(d, e) {
     return { isValid: t.length === 0, errors: t };
   }
   if (e.retention !== void 0 && e.retention.timeDimension != null && e.retention.bindingKey != null) {
-    const s = En(e.retention.timeDimension);
+    const s = An(e.retention.timeDimension);
     s && !d.has(s) && t.push(`Retention cube not found: ${s}`);
     const i = e.retention.bindingKey;
     if (typeof i == "string") {
@@ -9279,17 +9315,17 @@ function ct(d, e) {
     }
   if (e.filters)
     for (const s of e.filters)
-      dt(s, d, t, n);
+      pt(s, d, t, n);
   return n.size === 0 && t.push("Query must reference at least one cube through measures, dimensions, or filters"), {
     isValid: t.length === 0,
     errors: t
   };
 }
-function dt(d, e, t, n) {
+function pt(d, e, t, n) {
   if ("and" in d || "or" in d) {
     const a = d.and || d.or || [];
     for (const u of a)
-      dt(u, e, t, n);
+      pt(u, e, t, n);
     return;
   }
   if (!("member" in d)) {
@@ -9309,34 +9345,34 @@ function dt(d, e, t, n) {
   }
   !r.dimensions[i] && !r.measures[i] && t.push(`Filter field '${i}' not found on cube '${s}' (must be a dimension or measure)`);
 }
-function En(d) {
+function An(d) {
   if (typeof d == "string") {
     const [e] = d.split(".");
     return e || null;
   }
   return d.cube;
 }
-const ae = ["2025-11-25", "2025-06-18", "2025-03-26"], mt = "2025-11-25";
-function vn(d) {
-  const t = Sn(d["mcp-protocol-version"]) || mt;
+const ue = ["2025-11-25", "2025-06-18", "2025-03-26"], ht = "2025-11-25";
+function In(d) {
+  const t = _n(d["mcp-protocol-version"]) || ht;
   return {
-    ok: ae.includes(t),
-    negotiated: ae.includes(t) ? t : null,
-    supported: ae
+    ok: ue.includes(t),
+    negotiated: ue.includes(t) ? t : null,
+    supported: ue
   };
 }
-function Rn(d) {
+function Ln(d) {
   if (!d) return !1;
   const e = d.split(",").map((s) => s.trim().toLowerCase()), t = e.includes("text/event-stream"), n = e.includes("application/json");
   return t && !n;
 }
-const Fn = "mcp-session-id";
-function On(d) {
+const Mn = "mcp-session-id";
+function jn(d) {
   if (!d) return !1;
   const e = d.split(",").map((s) => s.trim().toLowerCase().split(";")[0]), t = e.some((s) => s === "application/json"), n = e.some((s) => s === "text/event-stream");
   return t && n;
 }
-function In(d, e = {}) {
+function Un(d, e = {}) {
   const { allowMissingOrigin: t = !0, allowedOrigins: n } = e;
   if (!d)
     return t ? { valid: !0 } : { valid: !1, reason: "Origin header is required" };
@@ -9356,26 +9392,26 @@ function In(d, e = {}) {
     }
   }).includes(s.origin) ? { valid: !0 } : { valid: !1, reason: "Origin not in allowed list" };
 }
-function Ln(d, e, t) {
+function xn(d, e, t) {
   const n = [];
   return e && n.push(`id: ${e}`), t && t > 0 && n.push(`retry: ${t}`), n.push("event: message"), n.push(`data: ${JSON.stringify(d)}`), n.push(""), n.join(`
 `);
 }
-function Mn(d, e, t, n) {
+function kn(d, e, t, n) {
   return {
     jsonrpc: "2.0",
     id: d ?? null,
     error: { code: e, message: t, ...n !== void 0 ? { data: n } : {} }
   };
 }
-function jn(d, e) {
+function Bn(d, e) {
   return {
     jsonrpc: "2.0",
     id: d ?? null,
     result: e
   };
 }
-function Un(d) {
+function Pn(d) {
   if (!d || typeof d != "object") return null;
   const e = d;
   return e.jsonrpc !== "2.0" || typeof e.method != "string" ? null : {
@@ -9385,13 +9421,13 @@ function Un(d) {
     params: e.params
   };
 }
-async function kn(d, e, t) {
-  const { semanticLayer: n, extractSecurityContext: s, rawRequest: i, rawResponse: r } = t, a = t.prompts ?? ft, u = t.resources ?? pt;
+async function Qn(d, e, t) {
+  const { semanticLayer: n, extractSecurityContext: s, rawRequest: i, rawResponse: r } = t, a = t.prompts ?? gt, u = t.resources ?? bt;
   switch (d) {
     case "initialize": {
       const c = e?.protocolVersion;
       let l;
-      return c && ae.includes(c) ? l = c : l = mt, {
+      return c && ue.includes(c) ? l = c : l = ht, {
         protocolVersion: l,
         capabilities: {
           tools: {
@@ -9405,7 +9441,7 @@ async function kn(d, e, t) {
           },
           sampling: {}
         },
-        sessionId: Nn(),
+        sessionId: vn(),
         serverInfo: {
           name: "drizzle-cube",
           // Use safe check for process.env to support edge runtimes (Cloudflare Workers, etc.)
@@ -9415,10 +9451,10 @@ async function kn(d, e, t) {
     }
     case "list_tools":
     case "tools/list":
-      return { tools: Dn(), nextCursor: "" };
+      return { tools: Rn(), nextCursor: "" };
     case "call_tool":
     case "tools/call":
-      return An(e, t);
+      return Fn(e, t);
     case "resources/list":
       return {
         resources: u.map(({ uri: c, name: l, description: m, mimeType: p }) => ({
@@ -9433,7 +9469,7 @@ async function kn(d, e, t) {
       return { resourceTemplates: [], nextCursor: "" };
     case "resources/read": {
       const c = e?.uri, l = u.find((m) => m.uri === c) || u[0];
-      if (!l) throw q(-32602, "resource not found");
+      if (!l) throw J(-32602, "resource not found");
       return {
         contents: [
           {
@@ -9456,7 +9492,7 @@ async function kn(d, e, t) {
       return {};
     case "prompts/get": {
       const c = e?.name, l = a.find((m) => m.name === c) || a[0];
-      if (!l) throw q(-32602, "prompt not found");
+      if (!l) throw J(-32602, "prompt not found");
       return {
         name: l.name,
         description: l.description,
@@ -9464,38 +9500,38 @@ async function kn(d, e, t) {
       };
     }
     case "discover":
-      return Xe(n, e || {});
+      return tt(n, e || {});
     case "validate": {
       const c = e || {};
       if (!c.query)
-        throw q(-32602, "query is required");
-      return Ye(n, c);
+        throw J(-32602, "query is required");
+      return et(n, c);
     }
     case "load": {
       const c = e || {};
       if (!c.query)
-        throw q(-32602, "query is required");
+        throw J(-32602, "query is required");
       const l = await s(i, r);
-      return He(n, l, c);
+      return Ze(n, l, c);
     }
     default:
-      throw q(-32601, `Unknown MCP method: ${d}`);
+      throw J(-32601, `Unknown MCP method: ${d}`);
   }
 }
-function q(d, e, t) {
+function J(d, e, t) {
   const n = new Error(e);
   return n.code = d, n;
 }
-function Sn(d) {
+function _n(d) {
   return d ? Array.isArray(d) ? d[0] || null : d : null;
 }
-function xn(d) {
+function Wn(d) {
   return d.id === void 0 || d.id === null;
 }
-function Nn() {
-  return `evt-${ht()}`;
+function vn() {
+  return `evt-${Ct()}`;
 }
-function Dn() {
+function Rn() {
   return [
     {
       name: "discover",
@@ -9594,30 +9630,30 @@ QUERY CONSTRUCTION RULES:
     }
   ];
 }
-async function An(d, e) {
+async function Fn(d, e) {
   const { semanticLayer: t, extractSecurityContext: n, rawRequest: s, rawResponse: i } = e, r = d || {};
   if (!r.name)
-    throw q(-32602, "name is required for tools/call");
+    throw J(-32602, "name is required for tools/call");
   const a = r.arguments;
   switch (r.name) {
     case "discover":
-      return Se(await Xe(t, a || {}));
+      return Ne(await tt(t, a || {}));
     case "validate": {
       const u = a || {};
-      if (!u.query) throw q(-32602, "query is required");
-      return Se(await Ye(t, u));
+      if (!u.query) throw J(-32602, "query is required");
+      return Ne(await et(t, u));
     }
     case "load": {
       const u = a || {};
-      if (!u.query) throw q(-32602, "query is required");
+      if (!u.query) throw J(-32602, "query is required");
       const c = await n(s, i);
-      return Se(await He(t, c, u));
+      return Ne(await Ze(t, c, u));
     }
     default:
-      throw q(-32601, `Unknown tool: ${r.name}`);
+      throw J(-32601, `Unknown tool: ${r.name}`);
   }
 }
-function Se(d) {
+function Ne(d) {
   return {
     content: [
       {
@@ -9628,7 +9664,7 @@ function Se(d) {
     isError: !1
   };
 }
-const ft = Tn(), pt = [
+const gt = Dn(), bt = [
   {
     uri: "drizzle-cube://quickstart",
     name: "Drizzle Cube MCP Quickstart",
@@ -9734,26 +9770,26 @@ const ft = Tn(), pt = [
 `)
   }
 ];
-function Bn() {
-  return pt;
+function Kn() {
+  return bt;
 }
-function Pn() {
-  return ft;
+function qn() {
+  return gt;
 }
 export {
-  Fn as M,
-  lt as S,
-  On as a,
-  Mn as b,
-  jn as c,
-  kn as d,
-  Nn as e,
-  Bn as f,
-  Pn as g,
-  xn as i,
-  vn as n,
-  Un as p,
-  Ln as s,
-  In as v,
-  Rn as w
+  Mn as M,
+  mt as S,
+  jn as a,
+  kn as b,
+  Bn as c,
+  Qn as d,
+  vn as e,
+  Kn as f,
+  qn as g,
+  Wn as i,
+  In as n,
+  Pn as p,
+  xn as s,
+  Un as v,
+  Ln as w
 };