drizzle-cube 0.2.17 → 0.2.18

package/dist/adapters/{compiler-SWjBOq5Q.js → compiler-Cwmfwbls.js}

@@ -175,7 +175,7 @@ class p {
       casing: A,
       escapeName: t,
       escapeParam: S,
-      prepareTyping: r,
+      prepareTyping: O,
       inlineParams: C,
       paramStartIndex: N
     } = R;
@@ -230,7 +230,7 @@ class p {
         if (C)
           return { sql: this.mapInlineParam(I, R), params: [] };
         let n = ["none"];
-        return r && (n = [r(s.encoder)]), { sql: S(N.value++, I), params: [I], typings: n };
+        return O && (n = [O(s.encoder)]), { sql: S(N.value++, I), params: [I], typings: n };
       }
       return H(s, iE) ? { sql: S(N.value++, s), params: [s], typings: ["none"] } : H(s, p.Aliased) && s.fieldAlias !== void 0 ? { sql: t(s.fieldAlias), params: [] } : H(s, kT) ? s._.isWith ? { sql: t(s._.alias), params: [] } : this.buildQueryFromSourceParams([
         new V("("),
@@ -315,7 +315,7 @@ class CE {
     return new p([this]);
   }
 }
-function O(e, ...E) {
+function r(e, ...E) {
   const T = [];
   (E.length > 0 || e.length > 0 && e[0] !== "") && T.push(new V(e[0]));
   for (const [R, A] of E.entries())
@@ -350,11 +350,11 @@ function O(e, ...E) {
     return new iE(C);
   }
   e.placeholder = S;
-  function r(C, N) {
+  function O(C, N) {
     return new CE(C, N);
   }
-  e.param = r;
-})(O || (O = {}));
+  e.param = O;
+})(r || (r = {}));
 ((e) => {
   class E {
     constructor(R, A) {
@@ -416,7 +416,7 @@ kT.prototype.getSQL = function() {
 function b(e, E) {
   return me(E) && !zT(e) && !H(e, CE) && !H(e, iE) && !H(e, AE) && !H(e, g) && !H(e, ee) ? new CE(e, E) : e;
 }
-const v = (e, E) => O`${e} = ${b(E, e)}`, rT = (e, E) => O`${e} <> ${b(E, e)}`;
+const v = (e, E) => r`${e} = ${b(E, e)}`, rT = (e, E) => r`${e} <> ${b(E, e)}`;
 function F(...e) {
   const E = e.filter(
     (T) => T !== void 0
@@ -424,7 +424,7 @@ function F(...e) {
   if (E.length !== 0)
     return E.length === 1 ? new p(E) : new p([
       new V("("),
-      O.join(E, new V(" and ")),
+      r.join(E, new V(" and ")),
       new V(")")
     ]);
 }
@@ -435,70 +435,70 @@ function tE(...e) {
   if (E.length !== 0)
     return E.length === 1 ? new p(E) : new p([
       new V("("),
-      O.join(E, new V(" or ")),
+      r.join(E, new V(" or ")),
       new V(")")
     ]);
 }
-const uE = (e, E) => O`${e} > ${b(E, e)}`, k = (e, E) => O`${e} >= ${b(E, e)}`, cE = (e, E) => O`${e} < ${b(E, e)}`, z = (e, E) => O`${e} <= ${b(E, e)}`;
+const uE = (e, E) => r`${e} > ${b(E, e)}`, k = (e, E) => r`${e} >= ${b(E, e)}`, cE = (e, E) => r`${e} < ${b(E, e)}`, z = (e, E) => r`${e} <= ${b(E, e)}`;
 function GE(e, E) {
-  return Array.isArray(E) ? E.length === 0 ? O`false` : O`${e} in ${E.map((T) => b(T, e))}` : O`${e} in ${b(E, e)}`;
+  return Array.isArray(E) ? E.length === 0 ? r`false` : r`${e} in ${E.map((T) => b(T, e))}` : r`${e} in ${b(E, e)}`;
 }
 function nT(e, E) {
-  return Array.isArray(E) ? E.length === 0 ? O`true` : O`${e} not in ${E.map((T) => b(T, e))}` : O`${e} not in ${b(E, e)}`;
+  return Array.isArray(E) ? E.length === 0 ? r`true` : r`${e} not in ${E.map((T) => b(T, e))}` : r`${e} not in ${b(E, e)}`;
 }
 function CT(e) {
-  return O`${e} is null`;
+  return r`${e} is null`;
 }
 function iT(e) {
-  return O`${e} is not null`;
+  return r`${e} is not null`;
 }
 function Be(e, E) {
   if (Array.isArray(E)) {
     if (E.length === 0)
       throw new Error("arrayContains requires at least one value");
-    const T = O`${b(E, e)}`;
-    return O`${e} @> ${T}`;
+    const T = r`${b(E, e)}`;
+    return r`${e} @> ${T}`;
   }
-  return O`${e} @> ${b(E, e)}`;
+  return r`${e} @> ${b(E, e)}`;
 }
 function He(e, E) {
   if (Array.isArray(E)) {
     if (E.length === 0)
       throw new Error("arrayContained requires at least one value");
-    const T = O`${b(E, e)}`;
-    return O`${e} <@ ${T}`;
+    const T = r`${b(E, e)}`;
+    return r`${e} <@ ${T}`;
   }
-  return O`${e} <@ ${b(E, e)}`;
+  return r`${e} <@ ${b(E, e)}`;
 }
 function fe(e, E) {
   if (Array.isArray(E)) {
     if (E.length === 0)
       throw new Error("arrayOverlaps requires at least one value");
-    const T = O`${b(E, e)}`;
-    return O`${e} && ${T}`;
+    const T = r`${b(E, e)}`;
+    return r`${e} && ${T}`;
   }
-  return O`${e} && ${b(E, e)}`;
+  return r`${e} && ${b(E, e)}`;
 }
 function LT(e) {
-  return O`${e} asc`;
+  return r`${e} asc`;
 }
 function Fe(e) {
-  return O`${e} desc`;
+  return r`${e} desc`;
 }
 function kE(e) {
-  return O`count(${e || O.raw("*")})`.mapWith(Number);
+  return r`count(${e || r.raw("*")})`.mapWith(Number);
 }
 function he(e) {
-  return O`count(distinct ${e})`.mapWith(Number);
+  return r`count(distinct ${e})`.mapWith(Number);
 }
 function $(e) {
-  return O`sum(${e})`.mapWith(String);
+  return r`sum(${e})`.mapWith(String);
 }
 function SE(e) {
-  return O`max(${e})`.mapWith(H(e, AE) ? e : String);
+  return r`max(${e})`.mapWith(H(e, AE) ? e : String);
 }
 function sE(e) {
-  return O`min(${e})`.mapWith(H(e, AE) ? e : String);
+  return r`min(${e})`.mapWith(H(e, AE) ? e : String);
 }
 class RT {
   /**
@@ -537,21 +537,21 @@ class Ye extends RT {
   buildTimeDimension(E, T) {
     switch (E) {
       case "year":
-        return O`DATE_TRUNC('year', ${T}::timestamp)`;
+        return r`DATE_TRUNC('year', ${T}::timestamp)`;
       case "quarter":
-        return O`DATE_TRUNC('quarter', ${T}::timestamp)`;
+        return r`DATE_TRUNC('quarter', ${T}::timestamp)`;
       case "month":
-        return O`DATE_TRUNC('month', ${T}::timestamp)`;
+        return r`DATE_TRUNC('month', ${T}::timestamp)`;
       case "week":
-        return O`DATE_TRUNC('week', ${T}::timestamp)`;
+        return r`DATE_TRUNC('week', ${T}::timestamp)`;
       case "day":
-        return O`DATE_TRUNC('day', ${T}::timestamp)::timestamp`;
+        return r`DATE_TRUNC('day', ${T}::timestamp)::timestamp`;
       case "hour":
-        return O`DATE_TRUNC('hour', ${T}::timestamp)`;
+        return r`DATE_TRUNC('hour', ${T}::timestamp)`;
       case "minute":
-        return O`DATE_TRUNC('minute', ${T}::timestamp)`;
+        return r`DATE_TRUNC('minute', ${T}::timestamp)`;
       case "second":
-        return O`DATE_TRUNC('second', ${T}::timestamp)`;
+        return r`DATE_TRUNC('second', ${T}::timestamp)`;
       default:
         return T;
     }
@@ -563,23 +563,23 @@ class Ye extends RT {
   buildStringCondition(E, T, R) {
     switch (T) {
       case "contains":
-        return O`${E} ILIKE ${`%${R}%`}`;
+        return r`${E} ILIKE ${`%${R}%`}`;
       case "notContains":
-        return O`${E} NOT ILIKE ${`%${R}%`}`;
+        return r`${E} NOT ILIKE ${`%${R}%`}`;
       case "startsWith":
-        return O`${E} ILIKE ${`${R}%`}`;
+        return r`${E} ILIKE ${`${R}%`}`;
       case "endsWith":
-        return O`${E} ILIKE ${`%${R}`}`;
+        return r`${E} ILIKE ${`%${R}`}`;
       case "like":
-        return O`${E} LIKE ${R}`;
+        return r`${E} LIKE ${R}`;
       case "notLike":
-        return O`${E} NOT LIKE ${R}`;
+        return r`${E} NOT LIKE ${R}`;
       case "ilike":
-        return O`${E} ILIKE ${R}`;
+        return r`${E} ILIKE ${R}`;
       case "regex":
-        return O`${E} ~* ${R}`;
+        return r`${E} ~* ${R}`;
       case "notRegex":
-        return O`${E} !~* ${R}`;
+        return r`${E} !~* ${R}`;
       default:
         throw new Error(`Unsupported string operator: ${T}`);
     }
@@ -591,11 +591,11 @@ class Ye extends RT {
   castToType(E, T) {
     switch (T) {
       case "timestamp":
-        return O`${E}::timestamp`;
+        return r`${E}::timestamp`;
       case "decimal":
-        return O`${E}::decimal`;
+        return r`${E}::decimal`;
       case "integer":
-        return O`${E}::integer`;
+        return r`${E}::integer`;
       default:
         throw new Error(`Unsupported cast type: ${T}`);
     }
@@ -606,21 +606,21 @@ class Ye extends RT {
    * Extracted from multi-cube-builder.ts:284
    */
   buildAvg(E) {
-    return O`COALESCE(AVG(${E}), 0)`;
+    return r`COALESCE(AVG(${E}), 0)`;
   }
   /**
    * Build PostgreSQL CASE WHEN conditional expression
    */
   buildCaseWhen(E, T) {
-    const R = E.map((A) => O`WHEN ${A.when} THEN ${A.then}`).reduce((A, t) => O`${A} ${t}`);
-    return T !== void 0 ? O`CASE ${R} ELSE ${T} END` : O`CASE ${R} END`;
+    const R = E.map((A) => r`WHEN ${A.when} THEN ${A.then}`).reduce((A, t) => r`${A} ${t}`);
+    return T !== void 0 ? r`CASE ${R} ELSE ${T} END` : r`CASE ${R} END`;
   }
   /**
    * Build PostgreSQL boolean literal
    * PostgreSQL uses TRUE/FALSE keywords
    */
   buildBooleanLiteral(E) {
-    return E ? O`TRUE` : O`FALSE`;
+    return E ? r`TRUE` : r`FALSE`;
   }
   /**
    * Convert filter values - PostgreSQL uses native types
@@ -670,7 +670,7 @@ class Ye extends RT {
    */
   buildStddev(E, T = !1) {
     const R = T ? "STDDEV_SAMP" : "STDDEV_POP";
-    return O`COALESCE(${O.raw(R)}(${E}), 0)`;
+    return r`COALESCE(${r.raw(R)}(${E}), 0)`;
   }
   /**
    * Build PostgreSQL VARIANCE aggregation
@@ -678,7 +678,7 @@ class Ye extends RT {
    */
   buildVariance(E, T = !1) {
     const R = T ? "VAR_SAMP" : "VAR_POP";
-    return O`COALESCE(${O.raw(R)}(${E}), 0)`;
+    return r`COALESCE(${r.raw(R)}(${E}), 0)`;
   }
   /**
    * Build PostgreSQL PERCENTILE_CONT aggregation
@@ -686,45 +686,45 @@ class Ye extends RT {
    */
   buildPercentile(E, T) {
     const R = T / 100;
-    return O`PERCENTILE_CONT(${R}) WITHIN GROUP (ORDER BY ${E})`;
+    return r`PERCENTILE_CONT(${R}) WITHIN GROUP (ORDER BY ${E})`;
   }
   /**
    * Build PostgreSQL window function expression
    * PostgreSQL has full window function support
    */
   buildWindowFunction(E, T, R, A, t) {
-    const S = R && R.length > 0 ? O`PARTITION BY ${O.join(R, O`, `)}` : O``, r = A && A.length > 0 ? O`ORDER BY ${O.join(A.map(
-      (n) => n.direction === "desc" ? O`${n.field} DESC` : O`${n.field} ASC`
-    ), O`, `)}` : O``;
-    let C = O``;
+    const S = R && R.length > 0 ? r`PARTITION BY ${r.join(R, r`, `)}` : r``, O = A && A.length > 0 ? r`ORDER BY ${r.join(A.map(
+      (n) => n.direction === "desc" ? r`${n.field} DESC` : r`${n.field} ASC`
+    ), r`, `)}` : r``;
+    let C = r``;
     if (t?.frame) {
       const { type: n, start: i, end: L } = t.frame, M = n.toUpperCase(), D = i === "unbounded" ? "UNBOUNDED PRECEDING" : typeof i == "number" ? `${i} PRECEDING` : "CURRENT ROW", l = L === "unbounded" ? "UNBOUNDED FOLLOWING" : L === "current" ? "CURRENT ROW" : typeof L == "number" ? `${L} FOLLOWING` : "CURRENT ROW";
-      C = O`${O.raw(M)} BETWEEN ${O.raw(D)} AND ${O.raw(l)}`;
+      C = r`${r.raw(M)} BETWEEN ${r.raw(D)} AND ${r.raw(l)}`;
     }
     const N = [];
-    R && R.length > 0 && N.push(S), A && A.length > 0 && N.push(r), t?.frame && N.push(C);
-    const s = N.length > 0 ? O.join(N, O` `) : O``, I = O`OVER (${s})`;
+    R && R.length > 0 && N.push(S), A && A.length > 0 && N.push(O), t?.frame && N.push(C);
+    const s = N.length > 0 ? r.join(N, r` `) : r``, I = r`OVER (${s})`;
     switch (E) {
       case "lag":
-        return O`LAG(${T}, ${t?.offset ?? 1}${t?.defaultValue !== void 0 ? O`, ${t.defaultValue}` : O``}) ${I}`;
+        return r`LAG(${T}, ${t?.offset ?? 1}${t?.defaultValue !== void 0 ? r`, ${t.defaultValue}` : r``}) ${I}`;
       case "lead":
-        return O`LEAD(${T}, ${t?.offset ?? 1}${t?.defaultValue !== void 0 ? O`, ${t.defaultValue}` : O``}) ${I}`;
+        return r`LEAD(${T}, ${t?.offset ?? 1}${t?.defaultValue !== void 0 ? r`, ${t.defaultValue}` : r``}) ${I}`;
       case "rank":
-        return O`RANK() ${I}`;
+        return r`RANK() ${I}`;
       case "denseRank":
-        return O`DENSE_RANK() ${I}`;
+        return r`DENSE_RANK() ${I}`;
       case "rowNumber":
-        return O`ROW_NUMBER() ${I}`;
+        return r`ROW_NUMBER() ${I}`;
       case "ntile":
-        return O`NTILE(${t?.nTile ?? 4}) ${I}`;
+        return r`NTILE(${t?.nTile ?? 4}) ${I}`;
       case "firstValue":
-        return O`FIRST_VALUE(${T}) ${I}`;
+        return r`FIRST_VALUE(${T}) ${I}`;
       case "lastValue":
-        return O`LAST_VALUE(${T}) ${I}`;
+        return r`LAST_VALUE(${T}) ${I}`;
       case "movingAvg":
-        return O`AVG(${T}) ${I}`;
+        return r`AVG(${T}) ${I}`;
       case "movingSum":
-        return O`SUM(${T}) ${I}`;
+        return r`SUM(${T}) ${I}`;
       default:
         throw new Error(`Unsupported window function: ${E}`);
     }
@@ -753,12 +753,12 @@ class Re extends RT {
     };
     switch (E) {
       case "quarter":
-        return O`DATE_ADD(MAKEDATE(YEAR(${T}), 1), INTERVAL (QUARTER(${T}) - 1) * 3 MONTH)`;
+        return r`DATE_ADD(MAKEDATE(YEAR(${T}), 1), INTERVAL (QUARTER(${T}) - 1) * 3 MONTH)`;
       case "week":
-        return O`DATE_SUB(${T}, INTERVAL WEEKDAY(${T}) DAY)`;
+        return r`DATE_SUB(${T}, INTERVAL WEEKDAY(${T}) DAY)`;
       default: {
         const A = R[E];
-        return A ? O`STR_TO_DATE(DATE_FORMAT(${T}, ${A}), '%Y-%m-%d %H:%i:%s')` : T;
+        return A ? r`STR_TO_DATE(DATE_FORMAT(${T}, ${A}), '%Y-%m-%d %H:%i:%s')` : T;
       }
     }
   }
@@ -770,23 +770,23 @@ class Re extends RT {
   buildStringCondition(E, T, R) {
     switch (T) {
       case "contains":
-        return O`LOWER(${E}) LIKE ${`%${R.toLowerCase()}%`}`;
+        return r`LOWER(${E}) LIKE ${`%${R.toLowerCase()}%`}`;
       case "notContains":
-        return O`LOWER(${E}) NOT LIKE ${`%${R.toLowerCase()}%`}`;
+        return r`LOWER(${E}) NOT LIKE ${`%${R.toLowerCase()}%`}`;
       case "startsWith":
-        return O`LOWER(${E}) LIKE ${`${R.toLowerCase()}%`}`;
+        return r`LOWER(${E}) LIKE ${`${R.toLowerCase()}%`}`;
       case "endsWith":
-        return O`LOWER(${E}) LIKE ${`%${R.toLowerCase()}`}`;
+        return r`LOWER(${E}) LIKE ${`%${R.toLowerCase()}`}`;
       case "like":
-        return O`${E} LIKE ${R}`;
+        return r`${E} LIKE ${R}`;
       case "notLike":
-        return O`${E} NOT LIKE ${R}`;
+        return r`${E} NOT LIKE ${R}`;
       case "ilike":
-        return O`LOWER(${E}) LIKE ${R.toLowerCase()}`;
+        return r`LOWER(${E}) LIKE ${R.toLowerCase()}`;
       case "regex":
-        return O`${E} REGEXP ${R}`;
+        return r`${E} REGEXP ${R}`;
       case "notRegex":
-        return O`${E} NOT REGEXP ${R}`;
+        return r`${E} NOT REGEXP ${R}`;
       default:
         throw new Error(`Unsupported string operator: ${T}`);
     }
@@ -798,11 +798,11 @@ class Re extends RT {
   castToType(E, T) {
     switch (T) {
       case "timestamp":
-        return O`CAST(${E} AS DATETIME)`;
+        return r`CAST(${E} AS DATETIME)`;
       case "decimal":
-        return O`CAST(${E} AS DECIMAL(10,2))`;
+        return r`CAST(${E} AS DECIMAL(10,2))`;
       case "integer":
-        return O`CAST(${E} AS SIGNED INTEGER)`;
+        return r`CAST(${E} AS SIGNED INTEGER)`;
       default:
         throw new Error(`Unsupported cast type: ${T}`);
     }
@@ -812,21 +812,21 @@ class Re extends RT {
    * MySQL AVG returns NULL for empty sets, using IFNULL for consistency
    */
   buildAvg(E) {
-    return O`IFNULL(AVG(${E}), 0)`;
+    return r`IFNULL(AVG(${E}), 0)`;
   }
   /**
    * Build MySQL CASE WHEN conditional expression
    */
   buildCaseWhen(E, T) {
-    const R = E.map((A) => O`WHEN ${A.when} THEN ${A.then}`).reduce((A, t) => O`${A} ${t}`);
-    return T !== void 0 ? O`CASE ${R} ELSE ${T} END` : O`CASE ${R} END`;
+    const R = E.map((A) => r`WHEN ${A.when} THEN ${A.then}`).reduce((A, t) => r`${A} ${t}`);
+    return T !== void 0 ? r`CASE ${R} ELSE ${T} END` : r`CASE ${R} END`;
   }
   /**
    * Build MySQL boolean literal
    * MySQL uses TRUE/FALSE keywords (equivalent to 1/0)
    */
   buildBooleanLiteral(E) {
-    return E ? O`TRUE` : O`FALSE`;
+    return E ? r`TRUE` : r`FALSE`;
   }
   /**
    * Convert filter values - MySQL uses native types
@@ -878,7 +878,7 @@ class Re extends RT {
    */
   buildStddev(E, T = !1) {
     const R = T ? "STDDEV_SAMP" : "STDDEV_POP";
-    return O`IFNULL(${O.raw(R)}(${E}), 0)`;
+    return r`IFNULL(${r.raw(R)}(${E}), 0)`;
   }
   /**
    * Build MySQL VARIANCE aggregation
@@ -886,7 +886,7 @@ class Re extends RT {
    */
   buildVariance(E, T = !1) {
     const R = T ? "VAR_SAMP" : "VAR_POP";
-    return O`IFNULL(${O.raw(R)}(${E}), 0)`;
+    return r`IFNULL(${r.raw(R)}(${E}), 0)`;
   }
   /**
    * MySQL does not support PERCENTILE_CONT
@@ -900,38 +900,38 @@ class Re extends RT {
    * MySQL 8.0+ has full window function support
    */
   buildWindowFunction(E, T, R, A, t) {
-    const S = R && R.length > 0 ? O`PARTITION BY ${O.join(R, O`, `)}` : O``, r = A && A.length > 0 ? O`ORDER BY ${O.join(A.map(
-      (n) => n.direction === "desc" ? O`${n.field} DESC` : O`${n.field} ASC`
-    ), O`, `)}` : O``;
-    let C = O``;
+    const S = R && R.length > 0 ? r`PARTITION BY ${r.join(R, r`, `)}` : r``, O = A && A.length > 0 ? r`ORDER BY ${r.join(A.map(
+      (n) => n.direction === "desc" ? r`${n.field} DESC` : r`${n.field} ASC`
+    ), r`, `)}` : r``;
+    let C = r``;
     if (t?.frame) {
       const { type: n, start: i, end: L } = t.frame, M = n.toUpperCase(), D = i === "unbounded" ? "UNBOUNDED PRECEDING" : typeof i == "number" ? `${i} PRECEDING` : "CURRENT ROW", l = L === "unbounded" ? "UNBOUNDED FOLLOWING" : L === "current" ? "CURRENT ROW" : typeof L == "number" ? `${L} FOLLOWING` : "CURRENT ROW";
-      C = O`${O.raw(M)} BETWEEN ${O.raw(D)} AND ${O.raw(l)}`;
+      C = r`${r.raw(M)} BETWEEN ${r.raw(D)} AND ${r.raw(l)}`;
     }
     const N = [];
-    R && R.length > 0 && N.push(S), A && A.length > 0 && N.push(r), t?.frame && N.push(C);
-    const s = N.length > 0 ? O.join(N, O` `) : O``, I = O`OVER (${s})`;
+    R && R.length > 0 && N.push(S), A && A.length > 0 && N.push(O), t?.frame && N.push(C);
+    const s = N.length > 0 ? r.join(N, r` `) : r``, I = r`OVER (${s})`;
     switch (E) {
       case "lag":
-        return O`LAG(${T}, ${t?.offset ?? 1}${t?.defaultValue !== void 0 ? O`, ${t.defaultValue}` : O``}) ${I}`;
+        return r`LAG(${T}, ${t?.offset ?? 1}${t?.defaultValue !== void 0 ? r`, ${t.defaultValue}` : r``}) ${I}`;
       case "lead":
-        return O`LEAD(${T}, ${t?.offset ?? 1}${t?.defaultValue !== void 0 ? O`, ${t.defaultValue}` : O``}) ${I}`;
+        return r`LEAD(${T}, ${t?.offset ?? 1}${t?.defaultValue !== void 0 ? r`, ${t.defaultValue}` : r``}) ${I}`;
       case "rank":
-        return O`RANK() ${I}`;
+        return r`RANK() ${I}`;
       case "denseRank":
-        return O`DENSE_RANK() ${I}`;
+        return r`DENSE_RANK() ${I}`;
       case "rowNumber":
-        return O`ROW_NUMBER() ${I}`;
+        return r`ROW_NUMBER() ${I}`;
       case "ntile":
-        return O`NTILE(${t?.nTile ?? 4}) ${I}`;
+        return r`NTILE(${t?.nTile ?? 4}) ${I}`;
       case "firstValue":
-        return O`FIRST_VALUE(${T}) ${I}`;
+        return r`FIRST_VALUE(${T}) ${I}`;
       case "lastValue":
-        return O`LAST_VALUE(${T}) ${I}`;
+        return r`LAST_VALUE(${T}) ${I}`;
       case "movingAvg":
-        return O`AVG(${T}) ${I}`;
+        return r`AVG(${T}) ${I}`;
       case "movingSum":
-        return O`SUM(${T}) ${I}`;
+        return r`SUM(${T}) ${I}`;
       default:
         throw new Error(`Unsupported window function: ${E}`);
     }
@@ -950,32 +950,32 @@ class Ve extends RT {
   buildTimeDimension(E, T) {
     switch (E) {
       case "year":
-        return O`datetime(${T}, 'unixepoch', 'start of year')`;
+        return r`datetime(${T}, 'unixepoch', 'start of year')`;
       case "quarter": {
-        const R = O`datetime(${T}, 'unixepoch')`;
-        return O`datetime(${R}, 'start of year',
+        const R = r`datetime(${T}, 'unixepoch')`;
+        return r`datetime(${R}, 'start of year',
           '+' || (((CAST(strftime('%m', ${R}) AS INTEGER) - 1) / 3) * 3) || ' months')`;
       }
       case "month":
-        return O`datetime(${T}, 'unixepoch', 'start of month')`;
+        return r`datetime(${T}, 'unixepoch', 'start of month')`;
       case "week":
-        return O`date(datetime(${T}, 'unixepoch'), 'weekday 1', '-6 days')`;
+        return r`date(datetime(${T}, 'unixepoch'), 'weekday 1', '-6 days')`;
       case "day":
-        return O`datetime(${T}, 'unixepoch', 'start of day')`;
+        return r`datetime(${T}, 'unixepoch', 'start of day')`;
       case "hour": {
-        const R = O`datetime(${T}, 'unixepoch')`;
-        return O`datetime(strftime('%Y-%m-%d %H:00:00', ${R}))`;
+        const R = r`datetime(${T}, 'unixepoch')`;
+        return r`datetime(strftime('%Y-%m-%d %H:00:00', ${R}))`;
       }
       case "minute": {
-        const R = O`datetime(${T}, 'unixepoch')`;
-        return O`datetime(strftime('%Y-%m-%d %H:%M:00', ${R}))`;
+        const R = r`datetime(${T}, 'unixepoch')`;
+        return r`datetime(strftime('%Y-%m-%d %H:%M:00', ${R}))`;
       }
       case "second": {
-        const R = O`datetime(${T}, 'unixepoch')`;
-        return O`datetime(strftime('%Y-%m-%d %H:%M:%S', ${R}))`;
+        const R = r`datetime(${T}, 'unixepoch')`;
+        return r`datetime(strftime('%Y-%m-%d %H:%M:%S', ${R}))`;
       }
       default:
-        return O`datetime(${T}, 'unixepoch')`;
+        return r`datetime(${T}, 'unixepoch')`;
     }
   }
   /**
@@ -985,23 +985,23 @@ class Ve extends RT {
   buildStringCondition(E, T, R) {
     switch (T) {
       case "contains":
-        return O`LOWER(${E}) LIKE ${`%${R.toLowerCase()}%`}`;
+        return r`LOWER(${E}) LIKE ${`%${R.toLowerCase()}%`}`;
       case "notContains":
-        return O`LOWER(${E}) NOT LIKE ${`%${R.toLowerCase()}%`}`;
+        return r`LOWER(${E}) NOT LIKE ${`%${R.toLowerCase()}%`}`;
       case "startsWith":
-        return O`LOWER(${E}) LIKE ${`${R.toLowerCase()}%`}`;
+        return r`LOWER(${E}) LIKE ${`${R.toLowerCase()}%`}`;
       case "endsWith":
-        return O`LOWER(${E}) LIKE ${`%${R.toLowerCase()}`}`;
+        return r`LOWER(${E}) LIKE ${`%${R.toLowerCase()}`}`;
       case "like":
-        return O`${E} LIKE ${R}`;
+        return r`${E} LIKE ${R}`;
       case "notLike":
-        return O`${E} NOT LIKE ${R}`;
+        return r`${E} NOT LIKE ${R}`;
       case "ilike":
-        return O`LOWER(${E}) LIKE ${R.toLowerCase()}`;
+        return r`LOWER(${E}) LIKE ${R.toLowerCase()}`;
       case "regex":
-        return O`${E} GLOB ${R}`;
+        return r`${E} GLOB ${R}`;
       case "notRegex":
-        return O`${E} NOT GLOB ${R}`;
+        return r`${E} NOT GLOB ${R}`;
       default:
         throw new Error(`Unsupported string operator: ${T}`);
     }
@@ -1013,11 +1013,11 @@ class Ve extends RT {
   castToType(E, T) {
     switch (T) {
       case "timestamp":
-        return O`datetime(${E} / 1000, 'unixepoch')`;
+        return r`datetime(${E} / 1000, 'unixepoch')`;
       case "decimal":
-        return O`CAST(${E} AS REAL)`;
+        return r`CAST(${E} AS REAL)`;
       case "integer":
-        return O`CAST(${E} AS INTEGER)`;
+        return r`CAST(${E} AS INTEGER)`;
       default:
         throw new Error(`Unsupported cast type: ${T}`);
     }
@@ -1027,21 +1027,21 @@ class Ve extends RT {
    * SQLite AVG returns NULL for empty sets, using IFNULL for consistency
    */
   buildAvg(E) {
-    return O`IFNULL(AVG(${E}), 0)`;
+    return r`IFNULL(AVG(${E}), 0)`;
   }
   /**
    * Build SQLite CASE WHEN conditional expression
    */
   buildCaseWhen(E, T) {
-    const R = E.map((A) => A.then && typeof A.then == "object" && (A.then.queryChunks || A.then._ || A.then.sql) ? O`WHEN ${A.when} THEN ${O.raw("(")}${A.then}${O.raw(")")}` : O`WHEN ${A.when} THEN ${A.then}`).reduce((A, t) => O`${A} ${t}`);
-    return T !== void 0 ? T && typeof T == "object" && (T.queryChunks || T._ || T.sql) ? O`CASE ${R} ELSE ${O.raw("(")}${T}${O.raw(")")} END` : O`CASE ${R} ELSE ${T} END` : O`CASE ${R} END`;
+    const R = E.map((A) => A.then && typeof A.then == "object" && (A.then.queryChunks || A.then._ || A.then.sql) ? r`WHEN ${A.when} THEN ${r.raw("(")}${A.then}${r.raw(")")}` : r`WHEN ${A.when} THEN ${A.then}`).reduce((A, t) => r`${A} ${t}`);
+    return T !== void 0 ? T && typeof T == "object" && (T.queryChunks || T._ || T.sql) ? r`CASE ${R} ELSE ${r.raw("(")}${T}${r.raw(")")} END` : r`CASE ${R} ELSE ${T} END` : r`CASE ${R} END`;
   }
   /**
    * Build SQLite boolean literal
    * SQLite uses 1/0 for true/false
    */
   buildBooleanLiteral(E) {
-    return E ? O`1` : O`0`;
+    return E ? r`1` : r`0`;
   }
   /**
    * Preprocess calculated measure templates for SQLite-specific handling
@@ -1138,38 +1138,38 @@ class Ve extends RT {
    * SQLite 3.25+ supports window functions
    */
   buildWindowFunction(E, T, R, A, t) {
-    const S = R && R.length > 0 ? O`PARTITION BY ${O.join(R, O`, `)}` : O``, r = A && A.length > 0 ? O`ORDER BY ${O.join(A.map(
-      (n) => n.direction === "desc" ? O`${n.field} DESC` : O`${n.field} ASC`
-    ), O`, `)}` : O``;
-    let C = O``;
+    const S = R && R.length > 0 ? r`PARTITION BY ${r.join(R, r`, `)}` : r``, O = A && A.length > 0 ? r`ORDER BY ${r.join(A.map(
+      (n) => n.direction === "desc" ? r`${n.field} DESC` : r`${n.field} ASC`
+    ), r`, `)}` : r``;
+    let C = r``;
     if (t?.frame) {
       const { type: n, start: i, end: L } = t.frame, M = n.toUpperCase(), D = i === "unbounded" ? "UNBOUNDED PRECEDING" : typeof i == "number" ? `${i} PRECEDING` : "CURRENT ROW", l = L === "unbounded" ? "UNBOUNDED FOLLOWING" : L === "current" ? "CURRENT ROW" : typeof L == "number" ? `${L} FOLLOWING` : "CURRENT ROW";
-      C = O`${O.raw(M)} BETWEEN ${O.raw(D)} AND ${O.raw(l)}`;
+      C = r`${r.raw(M)} BETWEEN ${r.raw(D)} AND ${r.raw(l)}`;
     }
     const N = [];
-    R && R.length > 0 && N.push(S), A && A.length > 0 && N.push(r), t?.frame && N.push(C);
-    const s = N.length > 0 ? O.join(N, O` `) : O``, I = O`OVER (${s})`;
+    R && R.length > 0 && N.push(S), A && A.length > 0 && N.push(O), t?.frame && N.push(C);
+    const s = N.length > 0 ? r.join(N, r` `) : r``, I = r`OVER (${s})`;
     switch (E) {
       case "lag":
-        return O`LAG(${T}, ${t?.offset ?? 1}${t?.defaultValue !== void 0 ? O`, ${t.defaultValue}` : O``}) ${I}`;
+        return r`LAG(${T}, ${t?.offset ?? 1}${t?.defaultValue !== void 0 ? r`, ${t.defaultValue}` : r``}) ${I}`;
       case "lead":
-        return O`LEAD(${T}, ${t?.offset ?? 1}${t?.defaultValue !== void 0 ? O`, ${t.defaultValue}` : O``}) ${I}`;
+        return r`LEAD(${T}, ${t?.offset ?? 1}${t?.defaultValue !== void 0 ? r`, ${t.defaultValue}` : r``}) ${I}`;
       case "rank":
-        return O`RANK() ${I}`;
+        return r`RANK() ${I}`;
       case "denseRank":
-        return O`DENSE_RANK() ${I}`;
+        return r`DENSE_RANK() ${I}`;
       case "rowNumber":
-        return O`ROW_NUMBER() ${I}`;
+        return r`ROW_NUMBER() ${I}`;
       case "ntile":
-        return O`NTILE(${t?.nTile ?? 4}) ${I}`;
+        return r`NTILE(${t?.nTile ?? 4}) ${I}`;
       case "firstValue":
-        return O`FIRST_VALUE(${T}) ${I}`;
+        return r`FIRST_VALUE(${T}) ${I}`;
       case "lastValue":
-        return O`LAST_VALUE(${T}) ${I}`;
+        return r`LAST_VALUE(${T}) ${I}`;
       case "movingAvg":
-        return O`AVG(${T}) ${I}`;
+        return r`AVG(${T}) ${I}`;
       case "movingSum":
-        return O`SUM(${T}) ${I}`;
+        return r`SUM(${T}) ${I}`;
       default:
         throw new Error(`Unsupported window function: ${E}`);
     }
@@ -1406,7 +1406,7 @@ function zE(e, E) {
   }
 }
 function ET(e) {
-  return e && typeof e == "object" ? O`${O`${e}`}` : e;
+  return e && typeof e == "object" ? r`${r`${e}`}` : e;
 }
 function y(e, E) {
   const T = typeof e == "function" ? e(E) : e;
@@ -1420,10 +1420,10 @@ function we(e, E) {
     const I = s.as || v;
     S.push(I(s.source, s.target));
   }
-  const r = [];
+  const O = [];
   for (const s of A) {
     const I = s.as || v;
-    r.push(I(s.source, s.target));
+    O.push(I(s.source, s.target));
   }
   let C;
   if (t) {
@@ -1442,7 +1442,7 @@ function we(e, E) {
         joinType: N,
         table: T,
         // This will be replaced with target cube table in query planner
-        condition: F(...r)
+        condition: F(...O)
       }
     ],
     junctionSecurityConditions: C
@@ -1533,7 +1533,7 @@ class ve {
    */
   buildTimeDimensionExpression(E, T, R) {
     const A = y(E, R);
-    return T ? this.databaseAdapter.buildTimeDimension(T, A) : A instanceof p ? A : O`${A}`;
+    return T ? this.databaseAdapter.buildTimeDimension(T, A) : A instanceof p ? A : r`${A}`;
   }
   /**
    * Build date range condition for time dimensions
@@ -1566,10 +1566,10 @@ class ve {
       if (!A) return null;
       const t = typeof A == "number" ? new Date(A * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(A), S = new Date(t);
       S.setUTCHours(0, 0, 0, 0);
-      const r = new Date(t);
-      r.setUTCHours(23, 59, 59, 999);
+      const O = new Date(t);
+      O.setUTCHours(23, 59, 59, 999);
       let C, N;
-      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (C = Math.floor(S.getTime() / 1e3), N = Math.floor(r.getTime() / 1e3)) : (C = S.getTime(), N = r.getTime()) : (C = S.toISOString(), N = r.toISOString()), F(
+      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (C = Math.floor(S.getTime() / 1e3), N = Math.floor(O.getTime() / 1e3)) : (C = S.getTime(), N = O.getTime()) : (C = S.toISOString(), N = O.toISOString()), F(
         k(E, C),
         z(E, N)
       );
@@ -1581,7 +1581,7 @@ class ve {
    * Handles all 14 DATE_RANGE_OPTIONS from the client
    */
   parseRelativeDateRange(E) {
-    const T = /* @__PURE__ */ new Date(), R = E.toLowerCase().trim(), A = T.getUTCFullYear(), t = T.getUTCMonth(), S = T.getUTCDate(), r = T.getUTCDay();
+    const T = /* @__PURE__ */ new Date(), R = E.toLowerCase().trim(), A = T.getUTCFullYear(), t = T.getUTCMonth(), S = T.getUTCDate(), O = T.getUTCDay();
     if (R === "today") {
       const n = new Date(T);
       n.setUTCHours(0, 0, 0, 0);
@@ -1595,7 +1595,7 @@ class ve {
       return i.setUTCDate(S - 1), i.setUTCHours(23, 59, 59, 999), { start: n, end: i };
     }
     if (R === "this week") {
-      const n = r === 0 ? -6 : 1 - r, i = new Date(T);
+      const n = O === 0 ? -6 : 1 - O, i = new Date(T);
       i.setUTCDate(S + n), i.setUTCHours(0, 0, 0, 0);
       const L = new Date(i);
       return L.setUTCDate(i.getUTCDate() + 6), L.setUTCHours(23, 59, 59, 999), { start: i, end: L };
@@ -1627,7 +1627,7 @@ class ve {
       return M.setUTCHours(23, 59, 59, 999), { start: L, end: M };
     }
     if (R === "last week") {
-      const n = r === 0 ? -13 : -6 - r, i = new Date(T);
+      const n = O === 0 ? -13 : -6 - O, i = new Date(T);
       i.setUTCDate(S + n), i.setUTCHours(0, 0, 0, 0);
       const L = new Date(i);
       return L.setUTCDate(i.getUTCDate() + 6), L.setUTCHours(23, 59, 59, 999), { start: i, end: L };
@@ -1709,7 +1709,7 @@ class xe {
     const S = R.filter((C) => !(C == null || C === "" || typeof C == "string" && C.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
     if (S.length === 0 && !["set", "notSet"].includes(T))
       return T === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const r = S[0];
+    const O = S[0];
     switch (T) {
       case "equals":
         if (S.length > 1) {
@@ -1719,28 +1719,28 @@ class xe {
           }
           return GE(E, S);
         } else if (S.length === 1) {
-          const C = A?.type === "time" && this.dateTimeBuilder.normalizeDate(r) || r;
+          const C = A?.type === "time" && this.dateTimeBuilder.normalizeDate(O) || O;
           return v(E, C);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return S.length > 1 ? nT(E, S) : S.length === 1 ? rT(E, r) : null;
+        return S.length > 1 ? nT(E, S) : S.length === 1 ? rT(E, O) : null;
       case "contains":
-        return this.databaseAdapter.buildStringCondition(E, "contains", r);
+        return this.databaseAdapter.buildStringCondition(E, "contains", O);
       case "notContains":
-        return this.databaseAdapter.buildStringCondition(E, "notContains", r);
+        return this.databaseAdapter.buildStringCondition(E, "notContains", O);
       case "startsWith":
-        return this.databaseAdapter.buildStringCondition(E, "startsWith", r);
+        return this.databaseAdapter.buildStringCondition(E, "startsWith", O);
       case "endsWith":
-        return this.databaseAdapter.buildStringCondition(E, "endsWith", r);
+        return this.databaseAdapter.buildStringCondition(E, "endsWith", O);
       case "gt":
-        return uE(E, r);
+        return uE(E, O);
       case "gte":
-        return k(E, r);
+        return k(E, O);
       case "lt":
-        return cE(E, r);
+        return cE(E, O);
       case "lte":
-        return z(E, r);
+        return z(E, O);
       case "set":
         return iT(E);
       case "notSet":
@@ -1763,11 +1763,11 @@ class xe {
         }
         return null;
       case "beforeDate": {
-        const C = this.dateTimeBuilder.normalizeDate(r);
+        const C = this.dateTimeBuilder.normalizeDate(O);
         return C ? cE(E, C) : null;
       }
       case "afterDate": {
-        const C = this.dateTimeBuilder.normalizeDate(r);
+        const C = this.dateTimeBuilder.normalizeDate(O);
         return C ? uE(E, C) : null;
       }
       case "between":
@@ -1785,15 +1785,15 @@ class xe {
       case "notIn":
         return S.length > 0 ? nT(E, S) : null;
       case "like":
-        return this.databaseAdapter.buildStringCondition(E, "like", r);
+        return this.databaseAdapter.buildStringCondition(E, "like", O);
       case "notLike":
-        return this.databaseAdapter.buildStringCondition(E, "notLike", r);
+        return this.databaseAdapter.buildStringCondition(E, "notLike", O);
       case "ilike":
-        return this.databaseAdapter.buildStringCondition(E, "ilike", r);
+        return this.databaseAdapter.buildStringCondition(E, "ilike", O);
       case "regex":
-        return this.databaseAdapter.buildStringCondition(E, "regex", r);
+        return this.databaseAdapter.buildStringCondition(E, "regex", O);
       case "notRegex":
-        return this.databaseAdapter.buildStringCondition(E, "notRegex", r);
+        return this.databaseAdapter.buildStringCondition(E, "notRegex", O);
       case "isEmpty":
         return tE(
           CT(E),
@@ -1838,9 +1838,9 @@ class xe {
   buildSingleFilter(E, T, R) {
     if ("and" in E || "or" in E)
       return this.buildLogicalFilter(E, T, R);
-    const A = E, [t, S] = A.member.split("."), r = T.get(t);
-    if (!r) return null;
-    const C = r.dimensions?.[S];
+    const A = E, [t, S] = A.member.split("."), O = T.get(t);
+    if (!O) return null;
+    const C = O.dimensions?.[S];
     if (!C) return null;
     const N = y(C.sql, R);
     return this.buildFilterCondition(
@@ -1903,17 +1903,17 @@ class Qe {
    */
   buildGroupByFields(E, T, R, A) {
     const t = [], S = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
-    let r = !1, C = !1;
+    let O = !1, C = !1;
     for (const N of T.measures || []) {
       const [s, I] = N.split("."), n = S.get(s);
       if (n && n.measures && n.measures[I]) {
         const i = n.measures[I];
-        (this.isAggregateFunctionType(i.type) || i.type === "calculated") && (r = !0), this.isWindowFunctionType(i.type) && (C = !0);
+        (this.isAggregateFunctionType(i.type) || i.type === "calculated") && (O = !0), this.isWindowFunctionType(i.type) && (C = !0);
       }
     }
-    if (r && C && console.warn(
+    if (O && C && console.warn(
       "[drizzle-cube] Warning: Mixing aggregate measures (count, sum, avg, etc.) with window functions (lag, lead, rank, etc.) in the same query may produce incorrect results. Window functions will operate on raw rows before aggregation. Consider separating these into different queries or using CTE pattern."
-    ), !r)
+    ), !O)
       return [];
     if (T.dimensions)
       for (const N of T.dimensions) {
@@ -1924,7 +1924,7 @@ class Qe {
             if (M && M.sourceColumnObj)
               t.push(M.sourceColumnObj);
             else {
-              const D = O`${O.identifier(L.cteAlias)}.${O.identifier(I)}`;
+              const D = r`${r.identifier(L.cteAlias)}.${r.identifier(I)}`;
               t.push(D);
             }
           } else {
@@ -1946,7 +1946,7 @@ class Qe {
               );
               t.push(D);
             } else {
-              const D = O`${O.identifier(L.cteAlias)}.${O.identifier(I)}`;
+              const D = r`${r.identifier(L.cteAlias)}.${r.identifier(I)}`;
               t.push(D);
             }
           } else {
@@ -1979,10 +1979,10 @@ class J {
     for (const t of R) {
       const S = t[1].trim();
       if (S.includes(".")) {
-        const [r, C] = S.split(".");
+        const [O, C] = S.split(".");
         A.push({
           measureName: S,
-          cubeName: r.trim(),
+          cubeName: O.trim(),
           fieldName: C.trim()
         });
       } else
@@ -2003,8 +2003,8 @@ class J {
     for (const [T, R] of Object.entries(E.measures))
       if (R.type === "calculated" && R.calculatedSql) {
         const A = `${E.name}.${T}`, t = this.extractDependencies(R.calculatedSql), S = /* @__PURE__ */ new Set();
-        for (const r of t) {
-          const N = `${r.cubeName || E.name}.${r.fieldName}`;
+        for (const O of t) {
+          const N = `${O.cubeName || E.name}.${O.fieldName}`;
           S.add(N);
         }
         this.dependencyGraph.set(A, {
@@ -2057,8 +2057,8 @@ class J {
     }
     for (const t of T.values()) {
       let S = 0;
-      for (const r of t.dependencies)
-        T.has(r) && S++;
+      for (const O of t.dependencies)
+        T.has(O) && S++;
       t.inDegree = S;
     }
     for (const [t, S] of T)
@@ -2066,8 +2066,8 @@ class J {
     for (; R.length > 0; ) {
       const t = R.shift();
       A.push(t);
-      for (const [S, r] of T)
-        r.dependencies.has(t) && (r.inDegree--, r.inDegree === 0 && R.push(S));
+      for (const [S, O] of T)
+        O.dependencies.has(t) && (O.inDegree--, O.inDegree === 0 && R.push(S));
     }
     if (A.length < T.size) {
       const t = this.detectCycle();
@@ -2104,13 +2104,13 @@ class J {
     for (const S of t.dependencies)
       if (T.has(S)) {
         if (R.has(S)) {
-          const r = A.indexOf(S);
-          return [...A.slice(r), S];
+          const O = A.indexOf(S);
+          return [...A.slice(O), S];
         }
       } else {
-        const r = this.dfs(S, T, R, A);
-        if (r)
-          return r;
+        const O = this.dfs(S, T, R, A);
+        if (O)
+          return O;
       }
     return A.pop(), R.delete(E), null;
   }
@@ -2126,8 +2126,8 @@ class J {
       R.add(t);
       const S = this.dependencyGraph.get(t);
       if (S)
-        for (const r of S.dependencies)
-          T.add(r), A(r);
+        for (const O of S.dependencies)
+          T.add(O), A(O);
     };
     return A(E), T;
   }
@@ -2142,12 +2142,12 @@ class J {
       if (R.type === "calculated" && R.calculatedSql) {
         const A = this.extractDependencies(R.calculatedSql);
         for (const t of A) {
-          const S = t.cubeName || E.name, r = this.cubes.get(S);
-          if (!r)
+          const S = t.cubeName || E.name, O = this.cubes.get(S);
+          if (!O)
             throw new Error(
               `Calculated measure '${E.name}.${T}' references unknown cube '${S}'`
             );
-          if (!r.measures[t.fieldName])
+          if (!O.measures[t.fieldName])
             throw new Error(
               `Calculated measure '${E.name}.${T}' references unknown measure '${t.measureName}'`
             );
@@ -2194,36 +2194,36 @@ function Ze(e, E) {
       throw new Error(
         `Cannot substitute {${n}}: measure '${l}' not resolved yet. Ensure measures are resolved in dependency order.`
       );
-    const u = P(), U = O`${u}`;
+    const u = P(), U = r`${u}`;
     S.set(n, U);
   }
-  const r = [], C = [];
+  const O = [], C = [];
   let N = 0;
   for (const I of t) {
     const n = `{${I.originalRef}}`, i = e.indexOf(n, N);
     if (i >= 0) {
-      r.push(e.substring(N, i));
+      O.push(e.substring(N, i));
       const L = S.get(I.originalRef);
       L && C.push(L), N = i + n.length;
     }
   }
-  if (r.push(e.substring(N)), C.length === 0)
-    return O.raw(e);
+  if (O.push(e.substring(N)), C.length === 0)
+    return r.raw(e);
   const s = [];
-  for (let I = 0; I < r.length; I++)
-    r[I] && s.push(new V(r[I])), I < C.length && s.push(C[I]);
-  return O.join(s, O.raw(""));
+  for (let I = 0; I < O.length; I++)
+    O[I] && s.push(new V(O[I])), I < C.length && s.push(C[I]);
+  return r.join(s, r.raw(""));
 }
 function tT(e) {
   const E = /\{([^}]+)\}/g, T = e.matchAll(E), R = [];
   for (const A of T) {
     const t = A[1].trim();
     if (t.includes(".")) {
-      const [S, r] = t.split(".").map((C) => C.trim());
+      const [S, O] = t.split(".").map((C) => C.trim());
       R.push({
         originalRef: t,
         cubeName: S,
-        fieldName: r
+        fieldName: O
       });
     } else
       R.push({
@@ -2247,10 +2247,10 @@ function qe(e) {
   T > 0 && E.push("Unmatched opening brace in template"), /\{\s*\}/.test(e) && E.push("Empty member reference {} found in template"), /\{[^}]*\{/.test(e) && E.push("Nested braces are not allowed in member references");
   const t = tT(e);
   for (const S of t) {
-    const r = S.cubeName ? `${S.cubeName}.${S.fieldName}` : S.fieldName;
-    /^[a-zA-Z_][a-zA-Z0-9_.]*$/.test(r) || E.push(
+    const O = S.cubeName ? `${S.cubeName}.${S.fieldName}` : S.fieldName;
+    /^[a-zA-Z_][a-zA-Z0-9_.]*$/.test(O) || E.push(
       `Invalid member reference {${S.originalRef}}: must start with letter or underscore, and contain only letters, numbers, underscores, and dots`
-    ), r.split(".").length > 2 && E.push(
+    ), O.split(".").length > 2 && E.push(
       `Invalid member reference {${S.originalRef}}: only one dot allowed (Cube.measure format)`
     );
   }
@@ -2283,14 +2283,14 @@ class je {
    * @returns Map of measure names to SQL builder functions
    */
   buildResolvedMeasures(E, T, R, A) {
-    const t = /* @__PURE__ */ new Map(), S = [], r = [], C = new Set(E), N = new J(T);
+    const t = /* @__PURE__ */ new Map(), S = [], O = [], C = new Set(E), N = new J(T);
     for (const s of T.values())
       N.buildGraph(s);
     for (const s of E) {
       const [I, n] = s.split("."), i = T.get(I);
       if (i && i.measures && i.measures[n]) {
         const L = i.measures[n];
-        J.isCalculatedMeasure(L) ? (r.push(s), dE(L.calculatedSql, I).forEach((l) => C.add(l)), N.getAllDependencies(s).forEach((l) => {
+        J.isCalculatedMeasure(L) ? (O.push(s), dE(L.calculatedSql, I).forEach((l) => C.add(l)), N.getAllDependencies(s).forEach((l) => {
           const [P, u] = l.split("."), U = T.get(P);
           if (U && U.measures[u]) {
             const d = U.measures[u];
@@ -2303,7 +2303,7 @@ class je {
       const [I, n] = s.split("."), i = T.get(I);
       if (i && i.measures && i.measures[n]) {
         const L = i.measures[n];
-        J.isCalculatedMeasure(L) ? r.includes(s) || r.push(s) : S.includes(s) || S.push(s);
+        J.isCalculatedMeasure(L) ? O.includes(s) || O.push(s) : S.includes(s) || S.push(s);
       }
     }
     for (const s of S) {
@@ -2314,8 +2314,8 @@ class je {
       } else
         t.set(s, () => this.buildMeasureExpression(L, R, i));
     }
-    if (r.length > 0) {
-      const s = N.topologicalSort(r);
+    if (O.length > 0) {
+      const s = N.topologicalSort(O);
       for (const I of s) {
         const [n, i] = I.split("."), L = T.get(n), M = L.measures[i];
         t.set(I, () => this.buildCalculatedMeasure(
@@ -2364,13 +2364,13 @@ class je {
       throw new Error(
         `Calculated measure '${T.name}.${E.name || "unknown"}' missing calculatedSql property`
       );
-    const S = /* @__PURE__ */ new Map(), r = dE(E.calculatedSql, T.name);
-    for (const C of r) {
+    const S = /* @__PURE__ */ new Map(), O = dE(E.calculatedSql, T.name);
+    for (const C of O) {
       const [N, s] = C.split("."), I = A.get(N);
       if (I && I.measures[s]) {
         const n = I.measures[s];
         if (R.measures.includes(C)) {
-          const i = O`${O.identifier(R.cteAlias)}.${O.identifier(s)}`;
+          const i = r`${r.identifier(R.cteAlias)}.${r.identifier(s)}`;
           let L;
           switch (n.type) {
             case "count":
@@ -2410,11 +2410,11 @@ class je {
    */
   buildHavingMeasureExpression(E, T, R, A, t) {
     if (t && t.preAggregationCTEs) {
-      const S = t.preAggregationCTEs.find((r) => r.cube.name === E);
+      const S = t.preAggregationCTEs.find((O) => O.cube.name === E);
       if (S && S.measures.includes(`${E}.${T}`))
         if (R.type === "calculated" && R.calculatedSql) {
-          const r = t.primaryCube.name === E ? t.primaryCube : t.joinCubes?.find((N) => N.cube.name === E)?.cube;
-          if (!r)
+          const O = t.primaryCube.name === E ? t.primaryCube : t.joinCubes?.find((N) => N.cube.name === E)?.cube;
+          if (!O)
             throw new Error(`Cube ${E} not found in query plan`);
           const C = /* @__PURE__ */ new Map([[t.primaryCube.name, t.primaryCube]]);
           if (t.joinCubes)
@@ -2422,28 +2422,28 @@ class je {
               C.set(N.cube.name, N.cube);
           return this.buildCTECalculatedMeasure(
             R,
-            r,
+            O,
             S,
             C,
             A
           );
         } else {
-          const r = O`${O.identifier(S.cteAlias)}.${O.identifier(T)}`;
+          const O = r`${r.identifier(S.cteAlias)}.${r.identifier(T)}`;
           switch (R.type) {
             case "count":
             case "countDistinct":
             case "sum":
-              return $(r);
+              return $(O);
             case "avg":
-              return this.databaseAdapter.buildAvg(r);
+              return this.databaseAdapter.buildAvg(O);
             case "min":
-              return sE(r);
+              return sE(O);
             case "max":
-              return SE(r);
+              return SE(O);
             case "number":
-              return $(r);
+              return $(O);
             default:
-              return $(r);
+              return $(O);
           }
         }
     }
@@ -2469,8 +2469,8 @@ class je {
     let A = y(E.sql, T);
     if (E.filters && E.filters.length > 0) {
       const t = E.filters.map((S) => {
-        const r = S(T);
-        return r ? O`(${r})` : void 0;
+        const O = S(T);
+        return O ? r`(${O})` : void 0;
       }).filter(Boolean);
       if (t.length > 0) {
         const S = t.length === 1 ? t[0] : F(...t);
@@ -2498,12 +2498,12 @@ class je {
       case "stddev":
       case "stddevSamp": {
         const t = E.type === "stddevSamp" || E.statisticalConfig?.useSample, S = this.databaseAdapter.buildStddev(A, t);
-        return S === null ? (console.warn(`[drizzle-cube] ${E.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), O`MAX(NULL)`) : S;
+        return S === null ? (console.warn(`[drizzle-cube] ${E.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), r`MAX(NULL)`) : S;
       }
       case "variance":
       case "varianceSamp": {
         const t = E.type === "varianceSamp" || E.statisticalConfig?.useSample, S = this.databaseAdapter.buildVariance(A, t);
-        return S === null ? (console.warn(`[drizzle-cube] ${E.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), O`MAX(NULL)`) : S;
+        return S === null ? (console.warn(`[drizzle-cube] ${E.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), r`MAX(NULL)`) : S;
       }
       case "percentile":
       case "median":
@@ -2524,7 +2524,7 @@ class je {
             t = E.statisticalConfig?.percentile ?? 50;
         }
         const S = this.databaseAdapter.buildPercentile(A, t);
-        return S === null ? (console.warn(`[drizzle-cube] ${E.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), O`MAX(NULL)`) : S;
+        return S === null ? (console.warn(`[drizzle-cube] ${E.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), r`MAX(NULL)`) : S;
       }
       // Window functions (Phase 2) - now with dimension resolution
       case "lag":
@@ -2546,7 +2546,7 @@ class je {
           }).filter((s) => s !== null);
           N.length > 0 && (S = N);
         }
-        let r;
+        let O;
         if (t.orderBy && t.orderBy.length > 0 && R) {
           const N = t.orderBy.map((s) => {
             const I = s.field.includes(".") ? s.field.split(".")[1] : s.field, n = R.dimensions?.[I];
@@ -2561,13 +2561,13 @@ class je {
               direction: s.direction
             } : (console.warn(`[drizzle-cube] Window function order field '${s.field}' not found in cube '${R.name}'`), null);
           }).filter((s) => s !== null);
-          N.length > 0 && (r = N);
+          N.length > 0 && (O = N);
         }
         const C = this.databaseAdapter.buildWindowFunction(
           E.type,
           ["rank", "denseRank", "rowNumber"].includes(E.type) ? null : A,
           S,
-          r,
+          O,
           {
             offset: t.offset,
             defaultValue: t.defaultValue,
@@ -2575,7 +2575,7 @@ class je {
             frame: t.frame
           }
         );
-        return C === null ? (console.warn(`[drizzle-cube] ${E.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), O`NULL`) : C;
+        return C === null ? (console.warn(`[drizzle-cube] ${E.type} not supported on ${this.databaseAdapter.getEngineType()}, returning NULL`), r`NULL`) : C;
       }
       default:
         return kE(A);
@@ -2606,10 +2606,10 @@ class ke {
     const A = {}, t = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (T.dimensions)
       for (const S of T.dimensions) {
-        const [r, C] = S.split("."), N = t.get(r);
+        const [O, C] = S.split("."), N = t.get(O);
         if (N && N.dimensions && N.dimensions[C]) {
           const s = N.dimensions[C], I = y(s.sql, R);
-          A[S] = O`${I}`.as(S);
+          A[S] = r`${I}`.as(S);
         }
       }
     if (T.measures) {
@@ -2618,24 +2618,24 @@ class ke {
         t,
         R
       );
-      for (const r of T.measures) {
-        const C = S.get(r);
+      for (const O of T.measures) {
+        const C = S.get(O);
         if (C) {
           const N = C();
-          A[r] = O`${N}`.as(r);
+          A[O] = r`${N}`.as(O);
         }
       }
     }
     if (T.timeDimensions)
       for (const S of T.timeDimensions) {
-        const [r, C] = S.dimension.split("."), N = t.get(r);
+        const [O, C] = S.dimension.split("."), N = t.get(O);
         if (N && N.dimensions && N.dimensions[C]) {
           const s = N.dimensions[C], I = this.buildTimeDimensionExpression(
             s.sql,
             S.granularity,
             R
           );
-          A[S.dimension] = O`${I}`.as(S.dimension);
+          A[S.dimension] = r`${I}`.as(S.dimension);
         }
       }
     return Object.keys(A).length === 0 && (A.count = kE()), A;
@@ -2681,24 +2681,24 @@ class ke {
    * @param preBuiltFilters - Optional map of cube name to pre-built filter SQL for parameter deduplication
    */
   buildWhereConditions(E, T, R, A, t) {
-    const S = [], r = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]), C = /* @__PURE__ */ new Set();
+    const S = [], O = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]), C = /* @__PURE__ */ new Set();
     if (T.filters && T.filters.length > 0)
       for (const N of T.filters) {
         if (t && "member" in N) {
           const [I] = N.member.split(".");
-          if (r.has(I) && t.has(I) && !C.has(I)) {
+          if (O.has(I) && t.has(I) && !C.has(I)) {
             const i = t.get(I);
             S.push(...i), C.add(I);
             continue;
           } else if (C.has(I))
             continue;
         }
-        const s = this.processFilter(N, r, R, "where", A);
+        const s = this.processFilter(N, O, R, "where", A);
         s && S.push(s);
       }
     if (T.timeDimensions)
       for (const N of T.timeDimensions) {
-        const [s, I] = N.dimension.split("."), n = r.get(s);
+        const [s, I] = N.dimension.split("."), n = O.get(s);
         if (n && n.dimensions[I] && N.dateRange) {
           if (A?.preAggregationCTEs && A.preAggregationCTEs.some((l) => l.cube.name === s))
             continue;
@@ -2722,8 +2722,8 @@ class ke {
   buildHavingConditions(E, T, R, A) {
     const t = [], S = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (T.filters && T.filters.length > 0)
-      for (const r of T.filters) {
-        const C = this.processFilter(r, S, R, "having", A);
+      for (const O of T.filters) {
+        const C = this.processFilter(O, S, R, "having", A);
         C && t.push(C);
       }
     return t;
@@ -2744,12 +2744,12 @@ class ke {
         return L.length > 0 ? tE(...L) : null;
       }
     }
-    const S = E, [r, C] = S.member.split("."), N = T.get(r);
+    const S = E, [O, C] = S.member.split("."), N = T.get(O);
     if (!N) return null;
     const s = N.dimensions[C], I = N.measures[C], n = s || I;
     if (!n) return null;
     if (A === "where" && s) {
-      if (t?.preAggregationCTEs && t.preAggregationCTEs.some((D) => D.cube.name === r))
+      if (t?.preAggregationCTEs && t.preAggregationCTEs.some((D) => D.cube.name === O))
         return null;
       const i = ["arrayContains", "arrayOverlaps", "arrayContained"].includes(S.operator);
       if (!i && R.filterCache) {
@@ -2769,7 +2769,7 @@ class ke {
       if (A === "where" && I)
         return null;
       if (A === "having" && I) {
-        const i = this.buildHavingMeasureExpression(r, C, I, R, t);
+        const i = this.buildHavingMeasureExpression(O, C, I, R, t);
         return this.buildFilterCondition(
           i,
           S.operator,
@@ -2815,15 +2815,15 @@ class ke {
       for (const [t, S] of Object.entries(E.order)) {
         if (!A.includes(t))
           throw new Error(`Cannot order by '${t}': field is not selected in the query`);
-        const r = S === "desc" ? Fe(O.identifier(t)) : LT(O.identifier(t));
-        R.push(r);
+        const O = S === "desc" ? Fe(r.identifier(t)) : LT(r.identifier(t));
+        R.push(O);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
       const t = new Set(Object.keys(E.order || {})), S = [...E.timeDimensions].sort(
-        (r, C) => r.dimension.localeCompare(C.dimension)
+        (O, C) => O.dimension.localeCompare(C.dimension)
       );
-      for (const r of S)
-        t.has(r.dimension) || R.push(LT(O.identifier(r.dimension)));
+      for (const O of S)
+        t.has(O.dimension) || R.push(LT(r.identifier(O.dimension)));
     }
     return R;
   }
@@ -2835,9 +2835,9 @@ class ke {
     const R = [], A = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (T.measures && R.push(...T.measures), T.dimensions)
       for (const t of T.dimensions) {
-        const [S, r] = t.split("."), C = A.get(S);
+        const [S, O] = t.split("."), C = A.get(S);
         if (C) {
-          const N = C.dimensions[r];
+          const N = C.dimensions[O];
           N && N.type === "number" && R.push(t);
         }
       }
@@ -2905,13 +2905,13 @@ class ze {
       return t;
     const S = [
       { cube: E, path: [] }
-    ], r = /* @__PURE__ */ new Set([E, ...R]);
+    ], O = /* @__PURE__ */ new Set([E, ...R]);
     for (; S.length > 0; ) {
       const { cube: C, path: N } = S.shift(), s = this.cubes.get(C);
       if (s?.joins)
         for (const [, I] of Object.entries(s.joins)) {
           const i = LE(I.targetCube).name;
-          if (r.has(i))
+          if (O.has(i))
             continue;
           const L = [
             ...N,
@@ -2923,7 +2923,7 @@ class ze {
           ];
           if (i === T)
             return this.setInCache(A, L), L;
-          r.add(i), S.push({ cube: i, path: L });
+          O.add(i), S.push({ cube: i, path: L });
         }
     }
     return this.setInCache(A, null), null;
@@ -2955,8 +2955,8 @@ class ze {
   buildJoinCondition(E, T, R) {
     const A = [];
     for (const t of E.on) {
-      const S = T ? O`${O.identifier(T)}.${O.identifier(t.source.name)}` : ET(t.source), r = R ? O`${O.identifier(R)}.${O.identifier(t.target.name)}` : ET(t.target), C = t.as || v;
-      A.push(C(S, r));
+      const S = T ? r`${r.identifier(T)}.${r.identifier(t.source.name)}` : ET(t.source), O = R ? r`${r.identifier(R)}.${r.identifier(t.target.name)}` : ET(t.target), C = t.as || v;
+      A.push(C(S, O));
     }
     return F(...A);
   }
@@ -3077,12 +3077,12 @@ class Se {
     const A = this.analyzeCubeUsage(T), t = Array.from(A);
     if (t.length === 0)
       throw new Error("No cubes found in query");
-    const S = this.choosePrimaryCube(t, T, E), r = E.get(S);
-    if (!r)
+    const S = this.choosePrimaryCube(t, T, E), O = E.get(S);
+    if (!O)
       throw new Error(`Primary cube '${S}' not found`);
     if (t.length === 1)
       return {
-        primaryCube: r,
+        primaryCube: O,
         joinCubes: [],
         // Empty for single cube
         selections: {},
@@ -3092,9 +3092,9 @@ class Se {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const C = this.buildJoinPlan(E, r, t, R), N = this.planPreAggregationCTEs(E, r, C, T);
+    const C = this.buildJoinPlan(E, O, t, R), N = this.planPreAggregationCTEs(E, O, C, T);
     return {
-      primaryCube: r,
+      primaryCube: O,
       joinCubes: C,
       selections: {},
       // Will be built by QueryBuilder
@@ -3120,15 +3120,15 @@ class Se {
    * Supports both direct joins and transitive joins through intermediate cubes
    */
   buildJoinPlan(E, T, R, A) {
-    const t = this.getResolver(E), S = [], r = /* @__PURE__ */ new Set([T.name]), C = R.filter((N) => N !== T.name);
+    const t = this.getResolver(E), S = [], O = /* @__PURE__ */ new Set([T.name]), C = R.filter((N) => N !== T.name);
     for (const N of C) {
-      if (r.has(N))
+      if (O.has(N))
         continue;
-      const s = t.findPath(T.name, N, r);
+      const s = t.findPath(T.name, N, O);
       if (!s || s.length === 0)
         throw new Error(`No join path found from '${T.name}' to '${N}'`);
       for (const { toCube: I, joinDef: n } of s) {
-        if (r.has(I))
+        if (O.has(I))
           continue;
         const i = E.get(I);
         if (!i)
@@ -3165,7 +3165,7 @@ class Se {
             joinCondition: L
           });
         }
-        r.add(I);
+        O.add(I);
       }
     }
     return S;
@@ -3180,8 +3180,8 @@ class Se {
     if (!A.measures || A.measures.length === 0)
       return t;
     for (const S of R) {
-      const r = this.findHasManyJoinDef(T, S.cube.name);
-      if (!r)
+      const O = this.findHasManyJoinDef(T, S.cube.name);
+      if (!O)
         continue;
       const C = A.measures ? A.measures.filter(
         (L) => L.startsWith(S.cube.name + ".")
@@ -3191,7 +3191,7 @@ class Se {
       const I = this.expandCalculatedMeasureDependencies(
         S.cube,
         s
-      ), n = r.on.map((L) => ({
+      ), n = O.on.map((L) => ({
         sourceColumn: L.source.name,
         targetColumn: L.target.name,
         sourceColumnObj: L.source,
@@ -3221,9 +3221,9 @@ class Se {
       const [, S] = t.split(".");
       if (!E.measures || !E.measures[S])
         continue;
-      const r = E.measures[S];
-      if (r.type === "calculated" && r.calculatedSql) {
-        const C = this.extractDependenciesFromTemplate(r.calculatedSql, E.name);
+      const O = E.measures[S];
+      if (O.type === "calculated" && O.calculatedSql) {
+        const C = this.extractDependenciesFromTemplate(O.calculatedSql, E.name);
         for (const N of C)
           R.has(N) || A.push(N);
       }
@@ -3236,8 +3236,8 @@ class Se {
   extractDependenciesFromTemplate(E, T) {
     const R = /\{([^}]+)\}/g, A = E.matchAll(R), t = [];
     for (const S of A) {
-      const r = S[1].trim();
-      r.includes(".") ? t.push(r) : t.push(`${T}.${r}`);
+      const O = S[1].trim();
+      O.includes(".") ? t.push(O) : t.push(`${T}.${O}`);
     }
     return t;
   }
@@ -3267,19 +3267,19 @@ class Se {
     if (this.extractFilterCubeNamesToSet(E.filters, t), E.timeDimensions) {
       for (const S of E.timeDimensions)
         if (S.dateRange) {
-          const [r] = S.dimension.split(".");
-          r && t.add(r);
+          const [O] = S.dimension.split(".");
+          O && t.add(O);
         }
     }
     for (const S of t) {
       if (S === T.name) continue;
-      const r = R.get(S);
-      if (r?.joins) {
-        for (const [, C] of Object.entries(r.joins))
+      const O = R.get(S);
+      if (O?.joins) {
+        for (const [, C] of Object.entries(O.joins))
           if (LE(C.targetCube).name === T.name && C.relationship === "hasMany") {
             const s = this.extractFiltersForCube(E.filters, S), I = this.extractTimeDimensionFiltersForCube(E, S), n = [...s, ...I];
             n.length > 0 && C.on.length > 0 && A.push({
-              sourceCube: r,
+              sourceCube: O,
               filters: n,
               // Map all join keys for composite key support
               // source = filterCube PK (e.g., employees.id)
@@ -3330,8 +3330,8 @@ class Se {
       if ("or" in A) {
         const t = A.or || [];
         if (this.allFiltersFromCube(t, T)) {
-          const r = this.extractFiltersForCube(t, T);
-          r.length > 0 && R.push({ or: r });
+          const O = this.extractFiltersForCube(t, T);
+          O.length > 0 && R.push({ or: O });
         }
         continue;
       }
@@ -3409,7 +3409,7 @@ class Se {
         },
         warnings: ["No cubes found in query - add measures or dimensions"]
       };
-    const S = this.analyzePrimaryCubeSelection(t, T, E), r = S.selectedCube, C = {
+    const S = this.analyzePrimaryCubeSelection(t, T, E), O = S.selectedCube, C = {
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       cubeCount: t.length,
       cubesInvolved: t.sort(),
@@ -3425,12 +3425,12 @@ class Se {
       warnings: []
     };
     if (t.length > 1) {
-      const N = t.filter((i) => i !== r);
+      const N = t.filter((i) => i !== O);
       for (const i of N)
         C.joinPaths.push(
-          this.analyzeJoinPath(E, r, i)
+          this.analyzeJoinPath(E, O, i)
         );
-      const s = E.get(r);
+      const s = E.get(O);
       s && (C.preAggregations = this.analyzePreAggregations(
         E,
         s,
@@ -3459,9 +3459,9 @@ class Se {
     const A = [], t = (T.dimensions || []).map((s) => s.split(".")[0]), S = /* @__PURE__ */ new Map();
     for (const s of t)
       S.set(s, (S.get(s) || 0) + 1);
-    const r = this.getResolver(R);
+    const O = this.getResolver(R);
     for (const s of E) {
-      const I = R.get(s), n = S.get(s) || 0, i = I?.joins ? Object.keys(I.joins).length : 0, L = r.canReachAll(s, E);
+      const I = R.get(s), n = S.get(s) || 0, i = I?.joins ? Object.keys(I.joins).length : 0, L = O.canReachAll(s, E);
       A.push({
         cubeName: s,
         dimensionCount: n,
@@ -3518,7 +3518,7 @@ class Se {
         error: `No join path found from '${T}' to '${R}'. Ensure the target cube has a relationship defined (belongsTo, hasOne, hasMany, or belongsToMany).`,
         visitedCubes: S
       };
-    const r = t.map((C) => {
+    const O = t.map((C) => {
       const N = zE(C.joinDef.relationship, C.joinDef.sqlJoinType), s = C.joinDef.on.map((n) => ({
         sourceColumn: n.source.name,
         targetColumn: n.target.name
@@ -3542,8 +3542,8 @@ class Se {
     return {
       targetCube: R,
       pathFound: !0,
-      path: r,
-      pathLength: r.length,
+      path: O,
+      pathLength: O.length,
       visitedCubes: S
     };
   }
@@ -3556,8 +3556,8 @@ class Se {
     if (!A.measures || A.measures.length === 0)
       return t;
     for (const S of R) {
-      const r = this.findHasManyJoinDef(T, S);
-      if (!r)
+      const O = this.findHasManyJoinDef(T, S);
+      if (!O)
         continue;
       const C = E.get(S);
       if (!C)
@@ -3567,7 +3567,7 @@ class Se {
       ), s = this.extractMeasuresFromFilters(A, C), I = [.../* @__PURE__ */ new Set([...N, ...s])];
       if (I.length === 0)
         continue;
-      const n = r.on.map((i) => ({
+      const n = O.on.map((i) => ({
         sourceColumn: i.source.name,
         targetColumn: i.target.name
       }));
@@ -3596,12 +3596,12 @@ class ER {
    * 4. Handles propagating filters from related cubes
    */
   buildPreAggregationCTE(E, T, R, A, t) {
-    const S = E.cube, r = S.sql(R), C = {};
+    const S = E.cube, O = S.sql(R), C = {};
     for (const P of E.joinKeys)
       if (P.targetColumnObj) {
         C[P.targetColumn] = P.targetColumnObj;
         for (const [u, U] of Object.entries(S.dimensions || {}))
-          U.sql === P.targetColumnObj && u !== P.targetColumn && (C[u] = O`${P.targetColumnObj}`.as(u));
+          U.sql === P.targetColumnObj && u !== P.targetColumn && (C[u] = r`${P.targetColumnObj}`.as(u));
       }
     const N = S.name, s = /* @__PURE__ */ new Map([[N, S]]), I = this.queryBuilder.buildResolvedMeasures(
       E.measures,
@@ -3612,7 +3612,7 @@ class ER {
       const [, u] = P.split("."), U = I.get(P);
       if (U) {
         const d = U();
-        C[u] = O`${d}`.as(u);
+        C[u] = r`${d}`.as(u);
       }
     }
     if (T.dimensions)
@@ -3620,7 +3620,7 @@ class ER {
         const [u, U] = P.split(".");
         if (u === N && S.dimensions && S.dimensions[U]) {
           const d = S.dimensions[U], m = this.queryBuilder.buildMeasureExpression({ sql: d.sql, type: "number" }, R);
-          C[U] = O`${m}`.as(U);
+          C[U] = r`${m}`.as(U);
         }
       }
     if (T.timeDimensions)
@@ -3628,12 +3628,12 @@ class ER {
         const [u, U] = P.dimension.split(".");
         if (u === N && S.dimensions && S.dimensions[U]) {
           const d = S.dimensions[U], m = this.queryBuilder.buildTimeDimensionExpression(d.sql, P.granularity, R);
-          C[U] = O`${m}`.as(U);
+          C[U] = r`${m}`.as(U);
         }
       }
     if (Object.keys(C).length === 0)
       return null;
-    let n = R.db.select(C).from(r.from);
+    let n = R.db.select(C).from(O.from);
     const i = A ? {
       ...A,
       preAggregationCTEs: A.preAggregationCTEs?.filter((P) => P.cube.name !== S.name)
@@ -3668,7 +3668,7 @@ class ER {
         u && M.push(u);
       }
     const D = [];
-    if (r.where && D.push(r.where), D.push(...L, ...M), D.length > 0) {
+    if (O.where && D.push(O.where), D.push(...L, ...M), D.length > 0) {
       const P = D.length === 1 ? D[0] : F(...D);
       n = n.where(P);
     }
@@ -3705,8 +3705,8 @@ class ER {
       throw new Error(`CTE info not found for cube ${E.cube.name}`);
     const t = [];
     for (const S of A.joinKeys) {
-      const r = S.sourceColumnObj || O.identifier(S.sourceColumn), C = O`${O.identifier(T)}.${O.identifier(S.targetColumn)}`;
-      t.push(v(r, C));
+      const O = S.sourceColumnObj || r.identifier(S.sourceColumn), C = r`${r.identifier(T)}.${r.identifier(S.targetColumn)}`;
+      t.push(v(O, C));
     }
     return t.length === 1 ? t[0] : F(...t);
   }
@@ -3737,16 +3737,16 @@ class ER {
     }
     if (t.length === 0)
       return null;
-    const S = t.length === 1 ? t[0] : F(...t), r = E.joinConditions;
-    if (r.length === 1) {
-      const { source: C, target: N } = r[0], s = T.db.select({ pk: C }).from(A.from).where(S);
-      return O`${N} IN ${s}`;
+    const S = t.length === 1 ? t[0] : F(...t), O = E.joinConditions;
+    if (O.length === 1) {
+      const { source: C, target: N } = O[0], s = T.db.select({ pk: C }).from(A.from).where(S);
+      return r`${N} IN ${s}`;
     } else {
-      const C = r.map((I) => v(I.source, I.target)), N = F(
+      const C = O.map((I) => v(I.source, I.target)), N = F(
         ...C,
         S
-      ), s = T.db.select({ one: O`1` }).from(A.from).where(N);
-      return O`EXISTS ${s}`;
+      ), s = T.db.select({ one: r`1` }).from(A.from).where(N);
+      return r`EXISTS ${s}`;
     }
   }
 }
@@ -3836,15 +3836,15 @@ function AR(e, E) {
   return E.length === 0 ? "__all__" : E.map((T) => String(e[T] ?? "")).join("|||");
 }
 function tR(e, E) {
-  const { timeDimensionKey: T, granularity: R, dateRange: A, fillValue: t, measures: S, dimensions: r } = E, C = TR(A[0], A[1], R);
+  const { timeDimensionKey: T, granularity: R, dateRange: A, fillValue: t, measures: S, dimensions: O } = E, C = TR(A[0], A[1], R);
   if (C.length === 0)
     return e;
   const N = /* @__PURE__ */ new Map();
   for (const I of e) {
-    const n = AR(I, r), i = RR(I[T]);
+    const n = AR(I, O), i = RR(I[T]);
     N.has(n) || N.set(n, /* @__PURE__ */ new Map()), N.get(n).set(i, I);
   }
-  N.size === 0 && r.length === 0 && N.set("__all__", /* @__PURE__ */ new Map());
+  N.size === 0 && O.length === 0 && N.set("__all__", /* @__PURE__ */ new Map());
   const s = [];
   for (const [I, n] of N) {
     const i = n.size > 0 ? n.values().next().value : null;
@@ -3857,7 +3857,7 @@ function tR(e, E) {
           [T]: M
         };
         if (i)
-          for (const P of r)
+          for (const P of O)
             l[P] = i[P];
         for (const P of S)
           l[P] = t;
@@ -3889,7 +3889,7 @@ function sR(e, E, T) {
   if (R.length === 0)
     return e;
   const A = E.fillMissingDatesValue === void 0 ? 0 : E.fillMissingDatesValue, t = new Set(E.timeDimensions.map((C) => C.dimension)), S = (E.dimensions || []).filter((C) => !t.has(C));
-  let r = e;
+  let O = e;
   for (const C of R) {
     const N = SR(C.dateRange);
     if (!N)
@@ -3902,9 +3902,9 @@ function sR(e, E, T) {
       measures: T,
       dimensions: S
     };
-    r = tR(r, s);
+    O = tR(O, s);
   }
-  return r;
+  return O;
 }
 class mE {
   constructor(E) {
@@ -3931,9 +3931,9 @@ class mE {
         filterCache: t
       };
       this.preloadFilterCache(T, t, E, S);
-      const r = this.queryPlanner.createQueryPlan(E, T, S);
-      this.validateSecurityContext(r, S);
-      const C = this.buildUnifiedQuery(r, T, S), N = this.queryBuilder.collectNumericFields(E, T), s = await this.dbExecutor.execute(C, N), I = Array.isArray(s) ? s.map((M) => {
+      const O = this.queryPlanner.createQueryPlan(E, T, S);
+      this.validateSecurityContext(O, S);
+      const C = this.buildUnifiedQuery(O, T, S), N = this.queryBuilder.collectNumericFields(E, T), s = await this.dbExecutor.execute(C, N), I = Array.isArray(s) ? s.map((M) => {
         const D = { ...M };
         if (T.timeDimensions) {
           for (const l of T.timeDimensions)
@@ -3947,7 +3947,7 @@ class mE {
             }
         }
         return D;
-      }) : [s], n = T.measures || [], i = sR(I, T, n), L = this.generateAnnotations(r, T);
+      }) : [s], n = T.measures || [], i = sR(I, T, n), L = this.generateAnnotations(O, T);
       return {
         data: i,
         annotation: L
@@ -3971,20 +3971,21 @@ class mE {
    * detect cubes that may leak data across tenants.
    */
   validateSecurityContext(E, T) {
-    if (process.env.NODE_ENV !== "development" && !process.env.DRIZZLE_CUBE_WARN_SECURITY)
+    const R = typeof process < "u" ? process.env?.NODE_ENV : void 0, A = typeof process < "u" ? process.env?.DRIZZLE_CUBE_WARN_SECURITY : void 0;
+    if (R !== "development" && !A)
       return;
-    const R = [E.primaryCube];
-    for (const t of E.joinCubes || [])
-      R.push(t.cube);
-    for (const t of E.preAggregationCTEs || [])
-      R.push(t.cube);
-    const A = /* @__PURE__ */ new Set();
-    for (const t of R)
-      if (!A.has(t.name)) {
-        A.add(t.name);
+    const t = [E.primaryCube];
+    for (const O of E.joinCubes || [])
+      t.push(O.cube);
+    for (const O of E.preAggregationCTEs || [])
+      t.push(O.cube);
+    const S = /* @__PURE__ */ new Set();
+    for (const O of t)
+      if (!S.has(O.name)) {
+        S.add(O.name);
         try {
-          t.sql(T).where || console.warn(
-            `[drizzle-cube] WARNING: Cube '${t.name}' may not have proper security filtering. The sql() function returned no 'where' clause. Ensure it returns a filter like: { from: table, where: eq(table.organisationId, ctx.securityContext.organisationId) }`
+          O.sql(T).where || console.warn(
+            `[drizzle-cube] WARNING: Cube '${O.name}' may not have proper security filtering. The sql() function returned no 'where' clause. Ensure it returns a filter like: { from: table, where: eq(table.organisationId, ctx.securityContext.organisationId) }`
           );
         } catch {
         }
@@ -4020,7 +4021,7 @@ class mE {
         const l = this.cteBuilder.buildPreAggregationCTE(D, T, R, E, A);
         l && (t.push(l), S.set(D.cube.name, D.cteAlias));
       }
-    const r = E.primaryCube.sql(R), N = { ...this.queryBuilder.buildSelections(
+    const O = E.primaryCube.sql(R), N = { ...this.queryBuilder.buildSelections(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       T,
@@ -4045,7 +4046,7 @@ class mE {
                   R
                 );
               } else {
-                const B = O`${O.identifier(D.cteAlias)}.${O.identifier(u)}`;
+                const B = r`${r.identifier(D.cteAlias)}.${r.identifier(u)}`;
                 switch (d.type) {
                   case "count":
                   case "countDistinct":
@@ -4068,7 +4069,7 @@ class mE {
                     m = $(B);
                 }
               }
-              N[P] = O`${m}`.as(P);
+              N[P] = r`${m}`.as(P);
             }
           }
         for (const P in N) {
@@ -4081,15 +4082,15 @@ class mE {
                 const DE = d.dimensions[U].sql;
                 Z = D.joinKeys.find((le) => le.targetColumnObj === DE);
               }
-              Z ? N[P] = O`${O.identifier(D.cteAlias)}.${O.identifier(U)}`.as(P) : B && d?.dimensions?.[U] && (N[P] = O`${O.identifier(D.cteAlias)}.${O.identifier(U)}`.as(P));
+              Z ? N[P] = r`${r.identifier(D.cteAlias)}.${r.identifier(U)}`.as(P) : B && d?.dimensions?.[U] && (N[P] = r`${r.identifier(D.cteAlias)}.${r.identifier(U)}`.as(P));
             }
           }
         }
       }
     const s = [];
-    let I = R.db.select(N).from(r.from);
-    if (t.length > 0 && (I = R.db.with(...t).select(N).from(r.from)), r.joins)
-      for (const D of r.joins)
+    let I = R.db.select(N).from(O.from);
+    if (t.length > 0 && (I = R.db.with(...t).select(N).from(O.from)), O.joins)
+      for (const D of O.joins)
         switch (D.type || "left") {
           case "left":
             I = I.leftJoin(D.table, D.on);
@@ -4133,7 +4134,7 @@ class mE {
           }
         }
         let P, u;
-        l ? (P = O`${O.identifier(l)}`, u = this.cteBuilder.buildCTEJoinCondition(D, l, E)) : (P = D.cube.sql(R).from, u = D.joinCondition);
+        l ? (P = r`${r.identifier(l)}`, u = this.cteBuilder.buildCTEJoinCondition(D, l, E)) : (P = D.cube.sql(R).from, u = D.joinCondition);
         try {
           switch (D.joinType || "left") {
             case "left":
@@ -4152,7 +4153,7 @@ class mE {
         } catch {
         }
       }
-    if (r.where && s.push(r.where), E.joinCubes && E.joinCubes.length > 0)
+    if (O.where && s.push(O.where), E.joinCubes && E.joinCubes.length > 0)
       for (const D of E.joinCubes) {
         if (S.get(D.cube.name))
           continue;
@@ -4228,10 +4229,10 @@ class mE {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: R
-    }, t = this.queryPlanner.createQueryPlan(E, T, A), r = this.buildUnifiedQuery(t, T, A).toSQL();
+    }, t = this.queryPlanner.createQueryPlan(E, T, A), O = this.buildUnifiedQuery(t, T, A).toSQL();
     return {
-      sql: r.sql,
-      params: r.params
+      sql: O.sql,
+      params: O.params
     };
   }
   /**
@@ -4239,12 +4240,12 @@ class mE {
    */
   generateAnnotations(E, T) {
     const R = {}, A = {}, t = {}, S = [E.primaryCube];
-    if (E.joinCubes && E.joinCubes.length > 0 && S.push(...E.joinCubes.map((r) => r.cube)), T.measures)
-      for (const r of T.measures) {
-        const [C, N] = r.split("."), s = S.find((I) => I.name === C);
+    if (E.joinCubes && E.joinCubes.length > 0 && S.push(...E.joinCubes.map((O) => O.cube)), T.measures)
+      for (const O of T.measures) {
+        const [C, N] = O.split("."), s = S.find((I) => I.name === C);
         if (s && s.measures[N]) {
           const I = s.measures[N];
-          R[r] = {
+          R[O] = {
             title: I.title || N,
             shortTitle: I.title || N,
             type: I.type
@@ -4252,11 +4253,11 @@ class mE {
         }
       }
     if (T.dimensions)
-      for (const r of T.dimensions) {
-        const [C, N] = r.split("."), s = S.find((I) => I.name === C);
+      for (const O of T.dimensions) {
+        const [C, N] = O.split("."), s = S.find((I) => I.name === C);
         if (s && s.dimensions[N]) {
           const I = s.dimensions[N];
-          A[r] = {
+          A[O] = {
             title: I.title || N,
             shortTitle: I.title || N,
             type: I.type
@@ -4264,15 +4265,15 @@ class mE {
         }
       }
     if (T.timeDimensions)
-      for (const r of T.timeDimensions) {
-        const [C, N] = r.dimension.split("."), s = S.find((I) => I.name === C);
+      for (const O of T.timeDimensions) {
+        const [C, N] = O.dimension.split("."), s = S.find((I) => I.name === C);
         if (s && s.dimensions && s.dimensions[N]) {
           const I = s.dimensions[N];
-          t[r.dimension] = {
+          t[O.dimension] = {
             title: I.title || N,
             shortTitle: I.title || N,
             type: I.type,
-            granularity: r.granularity
+            granularity: O.granularity
           };
         }
       }
@@ -4292,8 +4293,8 @@ class mE {
     if (E.filters && E.filters.length > 0) {
       const t = TT(E.filters);
       for (const S of t) {
-        const r = aE(S);
-        if (T.has(r)) continue;
+        const O = aE(S);
+        if (T.has(O)) continue;
         const [C, N] = S.member.split("."), s = R.get(C);
         if (!s) continue;
         const I = s.dimensions?.[N];
@@ -4306,7 +4307,7 @@ class mE {
           I,
           S.dateRange
         );
-        L && T.set(r, L);
+        L && T.set(O, L);
       }
     }
     if (E.timeDimensions) {
@@ -4314,7 +4315,7 @@ class mE {
         if (t.dateRange) {
           const S = te(t.dimension, t.dateRange);
           if (T.has(S)) continue;
-          const [r, C] = t.dimension.split("."), N = R.get(r);
+          const [O, C] = t.dimension.split("."), N = R.get(O);
           if (!N) continue;
           const s = N.dimensions?.[C];
           if (!s) continue;
@@ -19865,7 +19866,7 @@ const vt = [
     "[": "]",
     "(": ")",
     "{": "}"
-  }, E = "{left}(?:(?!{right}').)*?{right}", T = Object.entries(e).map(([S, r]) => E.replace(/{left}/g, X(S)).replace(/{right}/g, X(r))), R = X(Object.keys(e).join(""));
+  }, E = "{left}(?:(?!{right}').)*?{right}", T = Object.entries(e).map(([S, O]) => E.replace(/{left}/g, X(S)).replace(/{right}/g, X(O))), R = X(Object.keys(e).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${R}])(?:(?!\k<tag>').)*?\k<tag>`}|${T.join("|")})'`;
 }, KT = {
   // - backtick quoted (using `` to escape)
@@ -19893,7 +19894,7 @@ const vt = [
   // Oracle q'' strings: q'<text>' q'|text|' ...
   "q''": As()
 }, Oe = (e) => typeof e == "string" ? KT[e] : "regex" in e ? e.regex : Ts(e) + KT[e.quote], ts = (e) => Q(e.map((E) => "regex" in E ? E.regex : Oe(E)).join("|")), re = (e) => e.map(Oe).join("|"), wT = (e) => Q(re(e)), Ss = (e = {}) => Q(ne(e)), ne = ({ first: e, rest: E, dashes: T, allowFirstCharNumber: R } = {}) => {
-  const A = "\\p{Alphabetic}\\p{Mark}_", t = "\\p{Decimal_Number}", S = X(e ?? ""), r = X(E ?? ""), C = R ? `[${A}${t}${S}][${A}${t}${r}]*` : `[${A}${S}][${A}${t}${r}]*`;
+  const A = "\\p{Alphabetic}\\p{Mark}_", t = "\\p{Decimal_Number}", S = X(e ?? ""), O = X(E ?? ""), C = R ? `[${A}${t}${S}][${A}${t}${O}]*` : `[${A}${S}][${A}${t}${O}]*`;
   return T ? Es(C) : C;
 };
 function Ce(e, E) {
@@ -20183,13 +20184,13 @@ class rs {
   // These rules can't be blindly cached as the paramTypesOverrides object
   // can differ on each invocation of the format() function.
   buildParamRules(E, T) {
-    var R, A, t, S, r;
+    var R, A, t, S, O;
     const C = {
       named: T?.named || ((R = E.paramTypes) === null || R === void 0 ? void 0 : R.named) || [],
       quoted: T?.quoted || ((A = E.paramTypes) === null || A === void 0 ? void 0 : A.quoted) || [],
       numbered: T?.numbered || ((t = E.paramTypes) === null || t === void 0 ? void 0 : t.numbered) || [],
       positional: typeof T?.positional == "boolean" ? T.positional : (S = E.paramTypes) === null || S === void 0 ? void 0 : S.positional,
-      custom: T?.custom || ((r = E.paramTypes) === null || r === void 0 ? void 0 : r.custom) || []
+      custom: T?.custom || ((O = E.paramTypes) === null || O === void 0 ? void 0 : O.custom) || []
     };
     return this.validRules([
       {
@@ -20485,7 +20486,7 @@ function Ds() {
           M === I ? n++ : (n > 0 && s.push("    ^ " + n + " more lines identical to this"), n = 0, s.push("    " + M)), I = M;
         }
       }, S.prototype.getSymbolDisplay = function(N) {
-        return r(N);
+        return O(N);
       }, S.prototype.buildFirstStateStack = function(N, s) {
         if (s.indexOf(N) !== -1)
           return null;
@@ -20511,7 +20512,7 @@ function Ds() {
           return n.data;
         });
       };
-      function r(N) {
+      function O(N) {
         var s = typeof N;
         if (s === "string")
           return N;
@@ -21729,7 +21730,7 @@ async function zs(e, E, T) {
     const N = Array.from(A)[0];
     S = await T.generateSQL(N, e, E);
   }
-  const r = Array.from(A).map((N) => ({
+  const O = Array.from(A).map((N) => ({
     cube: N,
     query: {
       measures: e.measures?.filter((s) => s.startsWith(N + ".")) || [],
@@ -21749,9 +21750,9 @@ async function zs(e, E, T) {
   }
   return {
     queryType: "regularQuery",
-    normalizedQueries: r,
+    normalizedQueries: O,
     queryOrder: Array.from(A),
-    transformedQueries: r,
+    transformedQueries: O,
     pivotQuery: {
       query: e,
       cubes: Array.from(A)
@@ -21911,9 +21912,9 @@ class AN {
         }
         const S = new Map(this.cubes);
         S.set(E.name, E);
-        const r = new J(S);
+        const O = new J(S);
         try {
-          r.validateDependencies(E);
+          O.validateDependencies(E);
         } catch (C) {
           T.push(C instanceof Error ? C.message : String(C));
         }
@@ -22005,9 +22006,9 @@ ${T.join(`
    */
   generateCubeMetadata(E) {
     const T = Object.keys(E.measures), R = Object.keys(E.dimensions), A = new Array(T.length), t = new Array(R.length);
-    for (let r = 0; r < T.length; r++) {
-      const C = T[r], N = E.measures[C];
-      A[r] = {
+    for (let O = 0; O < T.length; O++) {
+      const C = T[O], N = E.measures[C];
+      A[O] = {
         name: `${E.name}.${C}`,
         title: N.title || C,
         shortTitle: N.title || C,
@@ -22017,9 +22018,9 @@ ${T.join(`
         description: N.description
       };
     }
-    for (let r = 0; r < R.length; r++) {
-      const C = R[r], N = E.dimensions[C];
-      t[r] = {
+    for (let O = 0; O < R.length; O++) {
+      const C = R[O], N = E.dimensions[C];
+      t[O] = {
         name: `${E.name}.${C}`,
         title: N.title || C,
         shortTitle: N.title || C,
@@ -22031,12 +22032,12 @@ ${T.join(`
     }
     const S = [];
     if (E.joins)
-      for (const [, r] of Object.entries(E.joins)) {
-        const C = typeof r.targetCube == "function" ? r.targetCube() : r.targetCube;
+      for (const [, O] of Object.entries(E.joins)) {
+        const C = typeof O.targetCube == "function" ? O.targetCube() : O.targetCube;
         S.push({
           targetCube: C.name,
-          relationship: r.relationship,
-          joinFields: r.on.map((N) => ({
+          relationship: O.relationship,
+          joinFields: O.on.map((N) => ({
             sourceField: this.getColumnName(N.source),
             targetField: this.getColumnName(N.target)
           }))
@@ -22062,9 +22063,9 @@ ${T.join(`
       throw new Error(`Cube '${E}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const S = await new mE(this.dbExecutor).generateSQL(A, T, R), r = this.dbExecutor.getEngineType();
+    const S = await new mE(this.dbExecutor).generateSQL(A, T, R), O = this.dbExecutor.getEngineType();
     return {
-      sql: jT(S.sql, r),
+      sql: jT(S.sql, O),
       params: S.params
     };
   }
@@ -22145,12 +22146,12 @@ function Me(e, E) {
         continue;
       }
       R.add(t);
-      const r = e.get(t);
-      if (!r) {
+      const O = e.get(t);
+      if (!O) {
         T.push(`Cube '${t}' not found (referenced in measure '${A}')`);
         continue;
       }
-      r.measures[S] || T.push(`Measure '${S}' not found on cube '${t}'`);
+      O.measures[S] || T.push(`Measure '${S}' not found on cube '${t}'`);
     }
   if (E.dimensions)
     for (const A of E.dimensions) {
@@ -22160,12 +22161,12 @@ function Me(e, E) {
         continue;
       }
       R.add(t);
-      const r = e.get(t);
-      if (!r) {
+      const O = e.get(t);
+      if (!O) {
         T.push(`Cube '${t}' not found (referenced in dimension '${A}')`);
         continue;
       }
-      r.dimensions[S] || T.push(`Dimension '${S}' not found on cube '${t}'`);
+      O.dimensions[S] || T.push(`Dimension '${S}' not found on cube '${t}'`);
     }
   if (E.timeDimensions)
     for (const A of E.timeDimensions) {
@@ -22175,12 +22176,12 @@ function Me(e, E) {
         continue;
       }
       R.add(t);
-      const r = e.get(t);
-      if (!r) {
+      const O = e.get(t);
+      if (!O) {
         T.push(`Cube '${t}' not found (referenced in timeDimension '${A.dimension}')`);
         continue;
       }
-      r.dimensions[S] || T.push(`TimeDimension '${S}' not found on cube '${t}' (must be a dimension with time type)`);
+      O.dimensions[S] || T.push(`TimeDimension '${S}' not found on cube '${t}' (must be a dimension with time type)`);
     }
   if (E.filters)
     for (const A of E.filters)
@@ -22192,8 +22193,8 @@ function Me(e, E) {
 }
 function Ue(e, E, T, R) {
   if ("and" in e || "or" in e) {
-    const r = e.and || e.or || [];
-    for (const C of r)
+    const O = e.and || e.or || [];
+    for (const C of O)
       Ue(C, E, T, R);
     return;
   }