drizzle-cube 0.1.17 → 0.1.19

package/dist/server/index.js

@@ -1,7 +1,7 @@
 var XT = Object.defineProperty;
 var bT = (T, E, R) => E in T ? XT(T, E, { enumerable: !0, configurable: !0, writable: !0, value: R }) : T[E] = R;
 var f = (T, E, R) => bT(T, typeof E != "symbol" ? E + "" : E, R);
-import { sql as n, count as SE, sum as y, max as uE, min as FE, and as d, countDistinct as KT, SQL as yT, or as $T, gt as fE, lt as WE, gte as Q, lte as Z, isNull as gT, isNotNull as JT, notInArray as xT, ne as wT, inArray as XE, eq as mE, desc as vT, asc as bE } from "drizzle-orm";
+import { sql as r, count as SE, sum as y, max as uE, min as FE, and as d, countDistinct as KT, SQL as yT, or as $T, gt as fE, lt as WE, gte as Q, lte as Z, isNull as gT, isNotNull as JT, notInArray as xT, ne as wT, inArray as XE, eq as mE, desc as vT, asc as bE } from "drizzle-orm";
 class pE {
   /**
    * Helper method to build pattern for string matching
@@ -32,21 +32,21 @@ class QT extends pE {
   buildTimeDimension(E, R) {
     switch (E) {
       case "year":
-        return n`DATE_TRUNC('year', ${R}::timestamp)`;
+        return r`DATE_TRUNC('year', ${R}::timestamp)`;
       case "quarter":
-        return n`DATE_TRUNC('quarter', ${R}::timestamp)`;
+        return r`DATE_TRUNC('quarter', ${R}::timestamp)`;
       case "month":
-        return n`DATE_TRUNC('month', ${R}::timestamp)`;
+        return r`DATE_TRUNC('month', ${R}::timestamp)`;
       case "week":
-        return n`DATE_TRUNC('week', ${R}::timestamp)`;
+        return r`DATE_TRUNC('week', ${R}::timestamp)`;
       case "day":
-        return n`DATE_TRUNC('day', ${R}::timestamp)::timestamp`;
+        return r`DATE_TRUNC('day', ${R}::timestamp)::timestamp`;
       case "hour":
-        return n`DATE_TRUNC('hour', ${R}::timestamp)`;
+        return r`DATE_TRUNC('hour', ${R}::timestamp)`;
       case "minute":
-        return n`DATE_TRUNC('minute', ${R}::timestamp)`;
+        return r`DATE_TRUNC('minute', ${R}::timestamp)`;
       case "second":
-        return n`DATE_TRUNC('second', ${R}::timestamp)`;
+        return r`DATE_TRUNC('second', ${R}::timestamp)`;
       default:
         return R;
     }
@@ -59,13 +59,13 @@ class QT extends pE {
     const S = this.buildPattern(R, A);
     switch (R) {
       case "contains":
-        return n`${E} ILIKE ${S}`;
+        return r`${E} ILIKE ${S}`;
       case "notContains":
-        return n`${E} NOT ILIKE ${S}`;
+        return r`${E} NOT ILIKE ${S}`;
       case "startsWith":
-        return n`${E} ILIKE ${S}`;
+        return r`${E} ILIKE ${S}`;
       case "endsWith":
-        return n`${E} ILIKE ${S}`;
+        return r`${E} ILIKE ${S}`;
       default:
         throw new Error(`Unsupported string operator: ${R}`);
     }
@@ -77,11 +77,11 @@ class QT extends pE {
   castToType(E, R) {
     switch (R) {
       case "timestamp":
-        return n`${E}::timestamp`;
+        return r`${E}::timestamp`;
       case "decimal":
-        return n`${E}::decimal`;
+        return r`${E}::decimal`;
       case "integer":
-        return n`${E}::integer`;
+        return r`${E}::integer`;
       default:
         throw new Error(`Unsupported cast type: ${R}`);
     }
@@ -92,21 +92,21 @@ class QT extends pE {
    * Extracted from multi-cube-builder.ts:284
    */
   buildAvg(E) {
-    return n`COALESCE(AVG(${E}), 0)`;
+    return r`COALESCE(AVG(${E}), 0)`;
   }
   /**
    * Build PostgreSQL CASE WHEN conditional expression
    */
   buildCaseWhen(E, R) {
-    const A = E.map((S) => n`WHEN ${S.when} THEN ${S.then}`).reduce((S, I) => n`${S} ${I}`);
-    return R !== void 0 ? n`CASE ${A} ELSE ${R} END` : n`CASE ${A} END`;
+    const A = E.map((S) => r`WHEN ${S.when} THEN ${S.then}`).reduce((S, I) => r`${S} ${I}`);
+    return R !== void 0 ? r`CASE ${A} ELSE ${R} END` : r`CASE ${A} END`;
   }
   /**
    * Build PostgreSQL boolean literal
    * PostgreSQL uses TRUE/FALSE keywords
    */
   buildBooleanLiteral(E) {
-    return E ? n`TRUE` : n`FALSE`;
+    return E ? r`TRUE` : r`FALSE`;
   }
   /**
    * Convert filter values - PostgreSQL uses native types
@@ -159,12 +159,12 @@ class ZT extends pE {
     };
     switch (E) {
       case "quarter":
-        return n`DATE_ADD(MAKEDATE(YEAR(${R}), 1), INTERVAL (QUARTER(${R}) - 1) * 3 MONTH)`;
+        return r`DATE_ADD(MAKEDATE(YEAR(${R}), 1), INTERVAL (QUARTER(${R}) - 1) * 3 MONTH)`;
       case "week":
-        return n`DATE_SUB(${R}, INTERVAL WEEKDAY(${R}) DAY)`;
+        return r`DATE_SUB(${R}, INTERVAL WEEKDAY(${R}) DAY)`;
       default:
         const S = A[E];
-        return S ? n`STR_TO_DATE(DATE_FORMAT(${R}, ${S}), '%Y-%m-%d %H:%i:%s')` : R;
+        return S ? r`STR_TO_DATE(DATE_FORMAT(${R}, ${S}), '%Y-%m-%d %H:%i:%s')` : R;
     }
   }
   /**
@@ -176,13 +176,13 @@ class ZT extends pE {
     const S = this.buildPattern(R, A.toLowerCase());
     switch (R) {
       case "contains":
-        return n`LOWER(${E}) LIKE ${S}`;
+        return r`LOWER(${E}) LIKE ${S}`;
       case "notContains":
-        return n`LOWER(${E}) NOT LIKE ${S}`;
+        return r`LOWER(${E}) NOT LIKE ${S}`;
       case "startsWith":
-        return n`LOWER(${E}) LIKE ${S}`;
+        return r`LOWER(${E}) LIKE ${S}`;
       case "endsWith":
-        return n`LOWER(${E}) LIKE ${S}`;
+        return r`LOWER(${E}) LIKE ${S}`;
       default:
         throw new Error(`Unsupported string operator: ${R}`);
     }
@@ -194,11 +194,11 @@ class ZT extends pE {
   castToType(E, R) {
     switch (R) {
       case "timestamp":
-        return n`CAST(${E} AS DATETIME)`;
+        return r`CAST(${E} AS DATETIME)`;
       case "decimal":
-        return n`CAST(${E} AS DECIMAL(10,2))`;
+        return r`CAST(${E} AS DECIMAL(10,2))`;
       case "integer":
-        return n`CAST(${E} AS SIGNED INTEGER)`;
+        return r`CAST(${E} AS SIGNED INTEGER)`;
       default:
         throw new Error(`Unsupported cast type: ${R}`);
     }
@@ -208,21 +208,21 @@ class ZT extends pE {
    * MySQL AVG returns NULL for empty sets, using IFNULL for consistency
    */
   buildAvg(E) {
-    return n`IFNULL(AVG(${E}), 0)`;
+    return r`IFNULL(AVG(${E}), 0)`;
   }
   /**
    * Build MySQL CASE WHEN conditional expression
    */
   buildCaseWhen(E, R) {
-    const A = E.map((S) => n`WHEN ${S.when} THEN ${S.then}`).reduce((S, I) => n`${S} ${I}`);
-    return R !== void 0 ? n`CASE ${A} ELSE ${R} END` : n`CASE ${A} END`;
+    const A = E.map((S) => r`WHEN ${S.when} THEN ${S.then}`).reduce((S, I) => r`${S} ${I}`);
+    return R !== void 0 ? r`CASE ${A} ELSE ${R} END` : r`CASE ${A} END`;
   }
   /**
    * Build MySQL boolean literal
    * MySQL uses TRUE/FALSE keywords (equivalent to 1/0)
    */
   buildBooleanLiteral(E) {
-    return E ? n`TRUE` : n`FALSE`;
+    return E ? r`TRUE` : r`FALSE`;
   }
   /**
    * Convert filter values - MySQL uses native types
@@ -265,28 +265,28 @@ class qT extends pE {
   buildTimeDimension(E, R) {
     switch (E) {
       case "year":
-        return n`datetime(${R}, 'unixepoch', 'start of year')`;
+        return r`datetime(${R}, 'unixepoch', 'start of year')`;
       case "quarter":
-        const A = n`datetime(${R}, 'unixepoch')`;
-        return n`datetime(${A}, 'start of year', 
+        const A = r`datetime(${R}, 'unixepoch')`;
+        return r`datetime(${A}, 'start of year', 
           '+' || (((CAST(strftime('%m', ${A}) AS INTEGER) - 1) / 3) * 3) || ' months')`;
       case "month":
-        return n`datetime(${R}, 'unixepoch', 'start of month')`;
+        return r`datetime(${R}, 'unixepoch', 'start of month')`;
       case "week":
-        return n`date(datetime(${R}, 'unixepoch'), 'weekday 1', '-6 days')`;
+        return r`date(datetime(${R}, 'unixepoch'), 'weekday 1', '-6 days')`;
       case "day":
-        return n`datetime(${R}, 'unixepoch', 'start of day')`;
+        return r`datetime(${R}, 'unixepoch', 'start of day')`;
       case "hour":
-        const S = n`datetime(${R}, 'unixepoch')`;
-        return n`datetime(strftime('%Y-%m-%d %H:00:00', ${S}))`;
+        const S = r`datetime(${R}, 'unixepoch')`;
+        return r`datetime(strftime('%Y-%m-%d %H:00:00', ${S}))`;
       case "minute":
-        const I = n`datetime(${R}, 'unixepoch')`;
-        return n`datetime(strftime('%Y-%m-%d %H:%M:00', ${I}))`;
+        const I = r`datetime(${R}, 'unixepoch')`;
+        return r`datetime(strftime('%Y-%m-%d %H:%M:00', ${I}))`;
       case "second":
-        const N = n`datetime(${R}, 'unixepoch')`;
-        return n`datetime(strftime('%Y-%m-%d %H:%M:%S', ${N}))`;
+        const N = r`datetime(${R}, 'unixepoch')`;
+        return r`datetime(strftime('%Y-%m-%d %H:%M:%S', ${N}))`;
       default:
-        return n`datetime(${R}, 'unixepoch')`;
+        return r`datetime(${R}, 'unixepoch')`;
     }
   }
   /**
@@ -297,13 +297,13 @@ class qT extends pE {
     const S = this.buildPattern(R, A.toLowerCase());
     switch (R) {
       case "contains":
-        return n`LOWER(${E}) LIKE ${S}`;
+        return r`LOWER(${E}) LIKE ${S}`;
       case "notContains":
-        return n`LOWER(${E}) NOT LIKE ${S}`;
+        return r`LOWER(${E}) NOT LIKE ${S}`;
       case "startsWith":
-        return n`LOWER(${E}) LIKE ${S}`;
+        return r`LOWER(${E}) LIKE ${S}`;
       case "endsWith":
-        return n`LOWER(${E}) LIKE ${S}`;
+        return r`LOWER(${E}) LIKE ${S}`;
       default:
         throw new Error(`Unsupported string operator: ${R}`);
     }
@@ -315,11 +315,11 @@ class qT extends pE {
   castToType(E, R) {
     switch (R) {
       case "timestamp":
-        return n`datetime(${E} / 1000, 'unixepoch')`;
+        return r`datetime(${E} / 1000, 'unixepoch')`;
       case "decimal":
-        return n`CAST(${E} AS REAL)`;
+        return r`CAST(${E} AS REAL)`;
       case "integer":
-        return n`CAST(${E} AS INTEGER)`;
+        return r`CAST(${E} AS INTEGER)`;
       default:
         throw new Error(`Unsupported cast type: ${R}`);
     }
@@ -329,21 +329,21 @@ class qT extends pE {
    * SQLite AVG returns NULL for empty sets, using IFNULL for consistency
    */
   buildAvg(E) {
-    return n`IFNULL(AVG(${E}), 0)`;
+    return r`IFNULL(AVG(${E}), 0)`;
   }
   /**
    * Build SQLite CASE WHEN conditional expression
    */
   buildCaseWhen(E, R) {
-    const A = E.map((S) => S.then && typeof S.then == "object" && (S.then.queryChunks || S.then._ || S.then.sql) ? n`WHEN ${S.when} THEN ${n.raw("(")}${S.then}${n.raw(")")}` : n`WHEN ${S.when} THEN ${S.then}`).reduce((S, I) => n`${S} ${I}`);
-    return R !== void 0 ? R && typeof R == "object" && (R.queryChunks || R._ || R.sql) ? n`CASE ${A} ELSE ${n.raw("(")}${R}${n.raw(")")} END` : n`CASE ${A} ELSE ${R} END` : n`CASE ${A} END`;
+    const A = E.map((S) => S.then && typeof S.then == "object" && (S.then.queryChunks || S.then._ || S.then.sql) ? r`WHEN ${S.when} THEN ${r.raw("(")}${S.then}${r.raw(")")}` : r`WHEN ${S.when} THEN ${S.then}`).reduce((S, I) => r`${S} ${I}`);
+    return R !== void 0 ? R && typeof R == "object" && (R.queryChunks || R._ || R.sql) ? r`CASE ${A} ELSE ${r.raw("(")}${R}${r.raw(")")} END` : r`CASE ${A} ELSE ${R} END` : r`CASE ${A} END`;
   }
   /**
    * Build SQLite boolean literal
    * SQLite uses 1/0 for true/false
    */
   buildBooleanLiteral(E) {
-    return E ? n`1` : n`0`;
+    return E ? r`1` : r`0`;
   }
   /**
    * Convert filter values to SQLite-compatible types
@@ -391,12 +391,6 @@ function kT(T) {
       throw new Error(`Unsupported database engine: ${T}`);
   }
 }
-function uO(T, E) {
-  return {
-    ...E,
-    name: E.name
-  };
-}
 class dE {
   constructor(E, R, A) {
     f(this, "databaseAdapter");
@@ -419,7 +413,7 @@ class jT extends dE {
         } catch (S) {
           if (typeof E.getSQL == "function") {
             const I = E.getSQL(), N = await this.db.execute(I);
-            return Array.isArray(N) ? N.map((C) => this.convertNumericFields(C, R)) : N;
+            return Array.isArray(N) ? N.map((e) => this.convertNumericFields(e, R)) : N;
           }
           throw S;
         }
@@ -470,27 +464,22 @@ class jT extends dE {
     return "postgres";
   }
 }
+function KE(T, E) {
+  return new jT(T, E, "postgres");
+}
 class zT extends dE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
-      const A = await E.execute();
-      return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
-    }
-    try {
-      if (this.db.all) {
-        const A = this.db.all(E);
-        return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
-      } else {
-        if (this.db.run)
-          return this.db.run(E);
-        throw new Error("SQLite database instance must have an all() or run() method");
-      }
-    } catch (A) {
-      throw new Error(`SQLite execution failed: ${A instanceof Error ? A.message : "Unknown error"}`);
+      const S = await E.execute();
+      return Array.isArray(S) ? S.map((I) => this.convertNumericFields(I, R)) : S;
     }
+    if (!this.db.execute)
+      throw new Error("MySQL database instance must have an execute method");
+    const A = await this.db.execute(E);
+    return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
   }
   /**
-   * Convert numeric string fields to numbers (only for measure fields)
+   * Convert numeric string fields to numbers (measure fields + numeric dimensions)
    */
   convertNumericFields(E, R) {
     if (!E || typeof E != "object") return E;
@@ -513,22 +502,33 @@ class zT extends dE {
     return E;
   }
   getEngineType() {
-    return "sqlite";
+    return "mysql";
   }
 }
-class ER extends dE {
+function ER(T, E) {
+  return new zT(T, E, "mysql");
+}
+class TR extends dE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
-      const S = await E.execute();
-      return Array.isArray(S) ? S.map((I) => this.convertNumericFields(I, R)) : S;
+      const A = await E.execute();
+      return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
+    }
+    try {
+      if (this.db.all) {
+        const A = this.db.all(E);
+        return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
+      } else {
+        if (this.db.run)
+          return this.db.run(E);
+        throw new Error("SQLite database instance must have an all() or run() method");
+      }
+    } catch (A) {
+      throw new Error(`SQLite execution failed: ${A instanceof Error ? A.message : "Unknown error"}`);
     }
-    if (!this.db.execute)
-      throw new Error("MySQL database instance must have an execute method");
-    const A = await this.db.execute(E);
-    return Array.isArray(A) ? A.map((S) => this.convertNumericFields(S, R)) : A;
   }
   /**
-   * Convert numeric string fields to numbers (measure fields + numeric dimensions)
+   * Convert numeric string fields to numbers (only for measure fields)
    */
   convertNumericFields(E, R) {
     if (!E || typeof E != "object") return E;
@@ -551,17 +551,11 @@ class ER extends dE {
     return E;
   }
   getEngineType() {
-    return "mysql";
+    return "sqlite";
   }
 }
-function KE(T, E) {
-  return new jT(T, E, "postgres");
-}
 function yE(T, E) {
-  return new zT(T, E, "sqlite");
-}
-function TR(T, E) {
-  return new ER(T, E, "mysql");
+  return new TR(T, E, "sqlite");
 }
 function $E(T, E, R) {
   if (R)
@@ -569,7 +563,7 @@ function $E(T, E, R) {
       case "postgres":
         return KE(T, E);
       case "mysql":
-        return TR(T, E);
+        return ER(T, E);
       case "sqlite":
         return yE(T, E);
     }
@@ -579,12 +573,6 @@ function $E(T, E, R) {
     return KE(T, E);
   throw new Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
-function FO(T, E) {
-  return {
-    name: T,
-    ...E
-  };
-}
 function gE(T) {
   return typeof T == "function" ? T() : T;
 }
@@ -604,13 +592,19 @@ function RR(T, E) {
 function K(T, E) {
   return typeof T == "function" ? T(E) : T;
 }
-function YO(T, E, R) {
+function uO(T, E, R) {
   return {
     ...T,
     cubes: E,
     currentCube: R
   };
 }
+function FO(T, E) {
+  return {
+    name: T,
+    ...E
+  };
+}
 class AR {
   constructor(E) {
     this.databaseAdapter = E;
@@ -623,30 +617,30 @@ class AR {
     const S = {}, I = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
       for (const N of R.dimensions) {
-        const [C, r] = N.split("."), O = I.get(C);
-        if (O && O.dimensions && O.dimensions[r]) {
-          const t = O.dimensions[r], e = K(t.sql, A);
-          S[N] = n`${e}`.as(N);
+        const [e, n] = N.split("."), O = I.get(e);
+        if (O && O.dimensions && O.dimensions[n]) {
+          const s = O.dimensions[n], C = K(s.sql, A);
+          S[N] = r`${C}`.as(N);
         }
       }
     if (R.measures)
       for (const N of R.measures) {
-        const [C, r] = N.split("."), O = I.get(C);
-        if (O && O.measures && O.measures[r]) {
-          const t = O.measures[r], e = this.buildMeasureExpression(t, A);
-          S[N] = n`${e}`.as(N);
+        const [e, n] = N.split("."), O = I.get(e);
+        if (O && O.measures && O.measures[n]) {
+          const s = O.measures[n], C = this.buildMeasureExpression(s, A);
+          S[N] = r`${C}`.as(N);
         }
       }
     if (R.timeDimensions)
       for (const N of R.timeDimensions) {
-        const [C, r] = N.dimension.split("."), O = I.get(C);
-        if (O && O.dimensions && O.dimensions[r]) {
-          const t = O.dimensions[r], e = this.buildTimeDimensionExpression(
-            t.sql,
+        const [e, n] = N.dimension.split("."), O = I.get(e);
+        if (O && O.dimensions && O.dimensions[n]) {
+          const s = O.dimensions[n], C = this.buildTimeDimensionExpression(
+            s.sql,
             N.granularity,
             A
           );
-          S[N.dimension] = n`${e}`.as(N.dimension);
+          S[N.dimension] = r`${C}`.as(N.dimension);
         }
       }
     return Object.keys(S).length === 0 && (S.count = SE()), S;
@@ -656,24 +650,24 @@ class AR {
    */
   buildHavingMeasureExpression(E, R, A, S, I) {
     if (I && I.preAggregationCTEs) {
-      const N = I.preAggregationCTEs.find((C) => C.cube.name === E);
+      const N = I.preAggregationCTEs.find((e) => e.cube.name === E);
       if (N && N.measures.includes(`${E}.${R}`)) {
-        const C = n`${n.identifier(N.cteAlias)}.${n.identifier(R)}`;
+        const e = r`${r.identifier(N.cteAlias)}.${r.identifier(R)}`;
         switch (A.type) {
           case "count":
           case "countDistinct":
           case "sum":
-            return y(C);
+            return y(e);
           case "avg":
-            return this.databaseAdapter.buildAvg(C);
+            return this.databaseAdapter.buildAvg(e);
           case "min":
-            return FE(C);
+            return FE(e);
           case "max":
-            return uE(C);
+            return uE(e);
           case "number":
-            return y(C);
+            return y(e);
           default:
-            return y(C);
+            return y(e);
         }
       }
     }
@@ -717,7 +711,7 @@ class AR {
    */
   buildTimeDimensionExpression(E, R, A) {
     const S = K(E, A);
-    return R ? this.databaseAdapter.buildTimeDimension(R, S) : S instanceof yT ? S : n`${S}`;
+    return R ? this.databaseAdapter.buildTimeDimension(R, S) : S instanceof yT ? S : r`${S}`;
   }
   /**
    * Build WHERE conditions from semantic query filters (dimensions only)
@@ -726,17 +720,17 @@ class AR {
   buildWhereConditions(E, R, A, S) {
     const I = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.filters && R.filters.length > 0)
-      for (const C of R.filters) {
-        const r = this.processFilter(C, N, A, "where", S);
-        r && I.push(r);
+      for (const e of R.filters) {
+        const n = this.processFilter(e, N, A, "where", S);
+        n && I.push(n);
       }
     if (R.timeDimensions)
-      for (const C of R.timeDimensions) {
-        const [r, O] = C.dimension.split("."), t = N.get(r);
-        if (t && t.dimensions[O] && C.dateRange) {
-          if (S != null && S.preAggregationCTEs && S.preAggregationCTEs.some((M) => M.cube.name === r))
+      for (const e of R.timeDimensions) {
+        const [n, O] = e.dimension.split("."), s = N.get(n);
+        if (s && s.dimensions[O] && e.dateRange) {
+          if (S != null && S.preAggregationCTEs && S.preAggregationCTEs.some((U) => U.cube.name === n))
             continue;
-          const e = t.dimensions[O], s = K(e.sql, A), i = this.buildDateRangeCondition(s, C.dateRange);
+          const C = s.dimensions[O], t = K(C.sql, A), i = this.buildDateRangeCondition(t, e.dateRange);
           i && I.push(i);
         }
       }
@@ -749,9 +743,9 @@ class AR {
   buildHavingConditions(E, R, A, S) {
     const I = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.filters && R.filters.length > 0)
-      for (const C of R.filters) {
-        const r = this.processFilter(C, N, A, "having", S);
-        r && I.push(r);
+      for (const e of R.filters) {
+        const n = this.processFilter(e, N, A, "having", S);
+        n && I.push(n);
       }
     return I;
   }
@@ -763,29 +757,29 @@ class AR {
     if ("and" in E || "or" in E) {
       const i = E;
       if (i.and) {
-        const a = i.and.map((M) => this.processFilter(M, R, A, S, I)).filter((M) => M !== null);
+        const a = i.and.map((U) => this.processFilter(U, R, A, S, I)).filter((U) => U !== null);
         return a.length > 0 ? d(...a) : null;
       }
       if (i.or) {
-        const a = i.or.map((M) => this.processFilter(M, R, A, S, I)).filter((M) => M !== null);
+        const a = i.or.map((U) => this.processFilter(U, R, A, S, I)).filter((U) => U !== null);
         return a.length > 0 ? $T(...a) : null;
       }
     }
-    const N = E, [C, r] = N.member.split("."), O = R.get(C);
+    const N = E, [e, n] = N.member.split("."), O = R.get(e);
     if (!O) return null;
-    const t = O.dimensions[r], e = O.measures[r], s = t || e;
-    if (!s) return null;
-    if (S === "where" && t) {
-      if (I != null && I.preAggregationCTEs && I.preAggregationCTEs.some((M) => M.cube.name === C))
+    const s = O.dimensions[n], C = O.measures[n], t = s || C;
+    if (!t) return null;
+    if (S === "where" && s) {
+      if (I != null && I.preAggregationCTEs && I.preAggregationCTEs.some((U) => U.cube.name === e))
         return null;
-      const i = K(t.sql, A);
-      return this.buildFilterCondition(i, N.operator, N.values, s);
+      const i = K(s.sql, A);
+      return this.buildFilterCondition(i, N.operator, N.values, t);
     } else {
-      if (S === "where" && e)
+      if (S === "where" && C)
         return null;
-      if (S === "having" && e) {
-        const i = this.buildHavingMeasureExpression(C, r, e, A, I);
-        return this.buildFilterCondition(i, N.operator, N.values, s);
+      if (S === "having" && C) {
+        const i = this.buildHavingMeasureExpression(e, n, C, A, I);
+        return this.buildFilterCondition(i, N.operator, N.values, t);
       }
     }
     return null;
@@ -796,7 +790,7 @@ class AR {
   buildFilterCondition(E, R, A, S) {
     if (!A || A.length === 0)
       return R === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const I = A.filter((C) => !(C == null || C === "" || typeof C == "string" && C.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
+    const I = A.filter((e) => !(e == null || e === "" || typeof e == "string" && e.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
     if (I.length === 0 && !["set", "notSet"].includes(R))
       return R === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
     const N = I[0];
@@ -804,13 +798,13 @@ class AR {
       case "equals":
         if (I.length > 1) {
           if ((S == null ? void 0 : S.type) === "time") {
-            const C = I.map((r) => this.normalizeDate(r) || r);
-            return XE(E, C);
+            const e = I.map((n) => this.normalizeDate(n) || n);
+            return XE(E, e);
           }
           return XE(E, I);
         } else if (I.length === 1) {
-          const C = (S == null ? void 0 : S.type) === "time" && this.normalizeDate(N) || N;
-          return mE(E, C);
+          const e = (S == null ? void 0 : S.type) === "time" && this.normalizeDate(N) || N;
+          return mE(E, e);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
@@ -837,21 +831,21 @@ class AR {
         return gT(E);
       case "inDateRange":
         if (I.length >= 2) {
-          const C = this.normalizeDate(I[0]), r = this.normalizeDate(I[1]);
-          if (C && r)
+          const e = this.normalizeDate(I[0]), n = this.normalizeDate(I[1]);
+          if (e && n)
             return d(
-              Q(E, C),
-              Z(E, r)
+              Q(E, e),
+              Z(E, n)
             );
         }
         return null;
       case "beforeDate": {
-        const C = this.normalizeDate(N);
-        return C ? WE(E, C) : null;
+        const e = this.normalizeDate(N);
+        return e ? WE(E, e) : null;
       }
       case "afterDate": {
-        const C = this.normalizeDate(N);
-        return C ? fE(E, C) : null;
+        const e = this.normalizeDate(N);
+        return e ? fE(E, e) : null;
       }
       default:
         return null;
@@ -893,75 +887,75 @@ class AR {
    * Handles all 14 DATE_RANGE_OPTIONS from the client
    */
   parseRelativeDateRange(E) {
-    const R = /* @__PURE__ */ new Date(), A = E.toLowerCase().trim(), S = R.getUTCFullYear(), I = R.getUTCMonth(), N = R.getUTCDate(), C = R.getUTCDay();
+    const R = /* @__PURE__ */ new Date(), A = E.toLowerCase().trim(), S = R.getUTCFullYear(), I = R.getUTCMonth(), N = R.getUTCDate(), e = R.getUTCDay();
     if (A === "today") {
-      const e = new Date(R);
-      e.setUTCHours(0, 0, 0, 0);
-      const s = new Date(R);
-      return s.setUTCHours(23, 59, 59, 999), { start: e, end: s };
+      const C = new Date(R);
+      C.setUTCHours(0, 0, 0, 0);
+      const t = new Date(R);
+      return t.setUTCHours(23, 59, 59, 999), { start: C, end: t };
     }
     if (A === "yesterday") {
-      const e = new Date(R);
-      e.setUTCDate(N - 1), e.setUTCHours(0, 0, 0, 0);
-      const s = new Date(R);
-      return s.setUTCDate(N - 1), s.setUTCHours(23, 59, 59, 999), { start: e, end: s };
+      const C = new Date(R);
+      C.setUTCDate(N - 1), C.setUTCHours(0, 0, 0, 0);
+      const t = new Date(R);
+      return t.setUTCDate(N - 1), t.setUTCHours(23, 59, 59, 999), { start: C, end: t };
     }
     if (A === "this week") {
-      const e = C === 0 ? -6 : 1 - C, s = new Date(R);
-      s.setUTCDate(N + e), s.setUTCHours(0, 0, 0, 0);
-      const i = new Date(s);
-      return i.setUTCDate(s.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: s, end: i };
+      const C = e === 0 ? -6 : 1 - e, t = new Date(R);
+      t.setUTCDate(N + C), t.setUTCHours(0, 0, 0, 0);
+      const i = new Date(t);
+      return i.setUTCDate(t.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
     if (A === "this month") {
-      const e = new Date(Date.UTC(S, I, 1, 0, 0, 0, 0)), s = new Date(Date.UTC(S, I + 1, 0, 23, 59, 59, 999));
-      return { start: e, end: s };
+      const C = new Date(Date.UTC(S, I, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, I + 1, 0, 23, 59, 59, 999));
+      return { start: C, end: t };
     }
     if (A === "this quarter") {
-      const e = Math.floor(I / 3), s = new Date(Date.UTC(S, e * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(S, e * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: s, end: i };
+      const C = Math.floor(I / 3), t = new Date(Date.UTC(S, C * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(S, C * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: t, end: i };
     }
     if (A === "this year") {
-      const e = new Date(Date.UTC(S, 0, 1, 0, 0, 0, 0)), s = new Date(Date.UTC(S, 11, 31, 23, 59, 59, 999));
-      return { start: e, end: s };
+      const C = new Date(Date.UTC(S, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, 11, 31, 23, 59, 59, 999));
+      return { start: C, end: t };
     }
-    const r = A.match(/^last\s+(\d+)\s+days?$/);
-    if (r) {
-      const e = parseInt(r[1], 10), s = new Date(R);
-      s.setUTCDate(N - e + 1), s.setUTCHours(0, 0, 0, 0);
+    const n = A.match(/^last\s+(\d+)\s+days?$/);
+    if (n) {
+      const C = parseInt(n[1], 10), t = new Date(R);
+      t.setUTCDate(N - C + 1), t.setUTCHours(0, 0, 0, 0);
       const i = new Date(R);
-      return i.setUTCHours(23, 59, 59, 999), { start: s, end: i };
+      return i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
     if (A === "last week") {
-      const e = C === 0 ? -13 : -6 - C, s = new Date(R);
-      s.setUTCDate(N + e), s.setUTCHours(0, 0, 0, 0);
-      const i = new Date(s);
-      return i.setUTCDate(s.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: s, end: i };
+      const C = e === 0 ? -13 : -6 - e, t = new Date(R);
+      t.setUTCDate(N + C), t.setUTCHours(0, 0, 0, 0);
+      const i = new Date(t);
+      return i.setUTCDate(t.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
     if (A === "last month") {
-      const e = new Date(Date.UTC(S, I - 1, 1, 0, 0, 0, 0)), s = new Date(Date.UTC(S, I, 0, 23, 59, 59, 999));
-      return { start: e, end: s };
+      const C = new Date(Date.UTC(S, I - 1, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, I, 0, 23, 59, 59, 999));
+      return { start: C, end: t };
     }
     if (A === "last quarter") {
-      const e = Math.floor(I / 3), s = e === 0 ? 3 : e - 1, i = e === 0 ? S - 1 : S, a = new Date(Date.UTC(i, s * 3, 1, 0, 0, 0, 0)), M = new Date(Date.UTC(i, s * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: a, end: M };
+      const C = Math.floor(I / 3), t = C === 0 ? 3 : C - 1, i = C === 0 ? S - 1 : S, a = new Date(Date.UTC(i, t * 3, 1, 0, 0, 0, 0)), U = new Date(Date.UTC(i, t * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: a, end: U };
     }
     if (A === "last year") {
-      const e = new Date(Date.UTC(S - 1, 0, 1, 0, 0, 0, 0)), s = new Date(Date.UTC(S - 1, 11, 31, 23, 59, 59, 999));
-      return { start: e, end: s };
+      const C = new Date(Date.UTC(S - 1, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S - 1, 11, 31, 23, 59, 59, 999));
+      return { start: C, end: t };
     }
     if (A === "last 12 months") {
-      const e = new Date(Date.UTC(S, I - 11, 1, 0, 0, 0, 0)), s = new Date(R);
-      return s.setUTCHours(23, 59, 59, 999), { start: e, end: s };
+      const C = new Date(Date.UTC(S, I - 11, 1, 0, 0, 0, 0)), t = new Date(R);
+      return t.setUTCHours(23, 59, 59, 999), { start: C, end: t };
     }
     const O = A.match(/^last\s+(\d+)\s+months?$/);
     if (O) {
-      const e = parseInt(O[1], 10), s = new Date(Date.UTC(S, I - e + 1, 1, 0, 0, 0, 0)), i = new Date(R);
-      return i.setUTCHours(23, 59, 59, 999), { start: s, end: i };
+      const C = parseInt(O[1], 10), t = new Date(Date.UTC(S, I - C + 1, 1, 0, 0, 0, 0)), i = new Date(R);
+      return i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
-    const t = A.match(/^last\s+(\d+)\s+years?$/);
-    if (t) {
-      const e = parseInt(t[1], 10), s = new Date(Date.UTC(S - e, 0, 1, 0, 0, 0, 0)), i = new Date(R);
-      return i.setUTCHours(23, 59, 59, 999), { start: s, end: i };
+    const s = A.match(/^last\s+(\d+)\s+years?$/);
+    if (s) {
+      const C = parseInt(s[1], 10), t = new Date(Date.UTC(S - C, 0, 1, 0, 0, 0, 0)), i = new Date(R);
+      return i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
     }
     return null;
   }
@@ -990,49 +984,49 @@ class AR {
    * Works for both single and multi-cube queries
    */
   buildGroupByFields(E, R, A, S) {
-    var r, O;
+    var n, O;
     const I = [];
     if (!(R.measures && R.measures.length > 0))
       return [];
-    const C = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const e = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
-      for (const t of R.dimensions) {
-        const [e, s] = t.split("."), i = C.get(e);
-        if (i && i.dimensions && i.dimensions[s])
-          if ((r = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : r.some((M) => M.cube.name === e)) {
-            const M = S.preAggregationCTEs.find((G) => G.cube.name === e), o = M.joinKeys.find((G) => G.targetColumn === s);
+      for (const s of R.dimensions) {
+        const [C, t] = s.split("."), i = e.get(C);
+        if (i && i.dimensions && i.dimensions[t])
+          if ((n = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : n.some((U) => U.cube.name === C)) {
+            const U = S.preAggregationCTEs.find((G) => G.cube.name === C), o = U.joinKeys.find((G) => G.targetColumn === t);
             if (o && o.sourceColumnObj)
               I.push(o.sourceColumnObj);
             else {
-              const G = n`${n.identifier(M.cteAlias)}.${n.identifier(s)}`;
+              const G = r`${r.identifier(U.cteAlias)}.${r.identifier(t)}`;
               I.push(G);
             }
           } else {
-            const M = i.dimensions[s], o = K(M.sql, A);
+            const U = i.dimensions[t], o = K(U.sql, A);
             I.push(o);
           }
       }
     if (R.timeDimensions)
-      for (const t of R.timeDimensions) {
-        const [e, s] = t.dimension.split("."), i = C.get(e);
-        if (i && i.dimensions && i.dimensions[s])
-          if ((O = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : O.some((M) => M.cube.name === e)) {
-            const M = S.preAggregationCTEs.find((G) => G.cube.name === e), o = M.joinKeys.find((G) => G.targetColumn === s);
+      for (const s of R.timeDimensions) {
+        const [C, t] = s.dimension.split("."), i = e.get(C);
+        if (i && i.dimensions && i.dimensions[t])
+          if ((O = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : O.some((U) => U.cube.name === C)) {
+            const U = S.preAggregationCTEs.find((G) => G.cube.name === C), o = U.joinKeys.find((G) => G.targetColumn === t);
             if (o && o.sourceColumnObj) {
               const G = this.buildTimeDimensionExpression(
                 o.sourceColumnObj,
-                t.granularity,
+                s.granularity,
                 A
               );
               I.push(G);
             } else {
-              const G = n`${n.identifier(M.cteAlias)}.${n.identifier(s)}`;
+              const G = r`${r.identifier(U.cteAlias)}.${r.identifier(t)}`;
               I.push(G);
             }
           } else {
-            const M = i.dimensions[s], o = this.buildTimeDimensionExpression(
-              M.sql,
-              t.granularity,
+            const U = i.dimensions[t], o = this.buildTimeDimensionExpression(
+              U.sql,
+              s.granularity,
               A
             );
             I.push(o);
@@ -1051,18 +1045,18 @@ class AR {
       ...((I = E.timeDimensions) == null ? void 0 : I.map((N) => N.dimension)) || []
     ];
     if (E.order && Object.keys(E.order).length > 0)
-      for (const [N, C] of Object.entries(E.order)) {
+      for (const [N, e] of Object.entries(E.order)) {
         if (!S.includes(N))
           throw new Error(`Cannot order by '${N}': field is not selected in the query`);
-        const r = C === "desc" ? vT(n.identifier(N)) : bE(n.identifier(N));
-        A.push(r);
+        const n = e === "desc" ? vT(r.identifier(N)) : bE(r.identifier(N));
+        A.push(n);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
-      const N = new Set(Object.keys(E.order || {})), C = [...E.timeDimensions].sort(
-        (r, O) => r.dimension.localeCompare(O.dimension)
+      const N = new Set(Object.keys(E.order || {})), e = [...E.timeDimensions].sort(
+        (n, O) => n.dimension.localeCompare(O.dimension)
       );
-      for (const r of C)
-        N.has(r.dimension) || A.push(bE(n.identifier(r.dimension)));
+      for (const n of e)
+        N.has(n.dimension) || A.push(bE(r.identifier(n.dimension)));
     }
     return A;
   }
@@ -1074,9 +1068,9 @@ class AR {
     const A = [], S = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.measures && A.push(...R.measures), R.dimensions)
       for (const I of R.dimensions) {
-        const [N, C] = I.split("."), r = S.get(N);
-        if (r) {
-          const O = r.dimensions[C];
+        const [N, e] = I.split("."), n = S.get(N);
+        if (n) {
+          const O = n.dimensions[e];
           O && O.type === "number" && A.push(I);
         }
       }
@@ -1177,12 +1171,12 @@ class SR {
     const S = this.analyzeCubeUsage(R), I = Array.from(S);
     if (I.length === 0)
       throw new Error("No cubes found in query");
-    const N = this.choosePrimaryCube(I, R, E), C = E.get(N);
-    if (!C)
+    const N = this.choosePrimaryCube(I, R, E), e = E.get(N);
+    if (!e)
       throw new Error(`Primary cube '${N}' not found`);
     if (I.length === 1)
       return {
-        primaryCube: C,
+        primaryCube: e,
         joinCubes: [],
         // Empty for single cube
         selections: {},
@@ -1192,10 +1186,10 @@ class SR {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const r = this.buildJoinPlan(E, C, I, A), O = this.planPreAggregationCTEs(E, C, r, R);
+    const n = this.buildJoinPlan(E, e, I), O = this.planPreAggregationCTEs(E, e, n, R);
     return {
-      primaryCube: C,
-      joinCubes: r,
+      primaryCube: e,
+      joinCubes: n,
       selections: {},
       // Will be built by QueryBuilder
       whereConditions: [],
@@ -1215,22 +1209,22 @@ class SR {
       for (const N of S)
         I.set(N, (I.get(N) || 0) + 1);
       if (I.size > 0) {
-        const N = Math.max(...I.values()), C = [...I.entries()].filter(([r, O]) => O === N).map(([r, O]) => r).sort();
-        for (const r of C)
-          if (this.canReachAllCubes(r, E, A))
-            return r;
+        const N = Math.max(...I.values()), e = [...I.entries()].filter(([, n]) => n === N).map(([n]) => n).sort();
+        for (const n of e)
+          if (this.canReachAllCubes(n, E, A))
+            return n;
       }
     }
     if (A) {
       const S = /* @__PURE__ */ new Map();
       for (const I of E)
         if (this.canReachAllCubes(I, E, A)) {
-          const N = A.get(I), C = N != null && N.joins ? Object.keys(N.joins).length : 0;
-          S.set(I, C);
+          const N = A.get(I), e = N != null && N.joins ? Object.keys(N.joins).length : 0;
+          S.set(I, e);
         }
       if (S.size > 0) {
         const I = Math.max(...S.values());
-        return [...S.entries()].filter(([C, r]) => r === I).map(([C, r]) => C).sort()[0];
+        return [...S.entries()].filter(([, e]) => e === I).map(([e]) => e).sort()[0];
       }
     }
     return [...E].sort()[0];
@@ -1251,48 +1245,47 @@ class SR {
    * Build join plan for multi-cube query
    * Supports both direct joins and transitive joins through intermediate cubes
    */
-  buildJoinPlan(E, R, A, S) {
-    const I = [], N = /* @__PURE__ */ new Set([R.name]), C = A.filter((r) => r !== R.name);
-    for (const r of C) {
-      if (N.has(r))
+  buildJoinPlan(E, R, A) {
+    const S = [], I = /* @__PURE__ */ new Set([R.name]), N = A.filter((e) => e !== R.name);
+    for (const e of N) {
+      if (I.has(e))
         continue;
-      const O = this.findJoinPath(E, R.name, r, N);
-      if (!O || O.length === 0)
-        throw new Error(`No join path found from '${R.name}' to '${r}'`);
-      for (const { fromCube: t, toCube: e, joinDef: s } of O) {
-        if (N.has(e))
+      const n = this.findJoinPath(E, R.name, e, I);
+      if (!n || n.length === 0)
+        throw new Error(`No join path found from '${R.name}' to '${e}'`);
+      for (const { toCube: O, joinDef: s } of n) {
+        if (I.has(O))
           continue;
-        const i = E.get(e);
-        if (!i)
-          throw new Error(`Cube '${e}' not found`);
-        const a = this.buildJoinCondition(
+        const C = E.get(O);
+        if (!C)
+          throw new Error(`Cube '${O}' not found`);
+        const t = this.buildJoinCondition(
           s,
           null,
           // No source alias needed - use the actual column
-          null,
+          null
           // No target alias needed - use the actual column 
-          S
-        ), M = RR(s.relationship, s.sqlJoinType);
-        I.push({
-          cube: i,
-          alias: `${e.toLowerCase()}_cube`,
-          joinType: M,
-          joinCondition: a
-        }), N.add(e);
+        ), i = RR(s.relationship, s.sqlJoinType);
+        S.push({
+          cube: C,
+          alias: `${O.toLowerCase()}_cube`,
+          joinType: i,
+          joinCondition: t
+        }), I.add(O);
       }
     }
-    return I;
+    return S;
   }
   /**
    * Build join condition from new array-based join definition
    */
-  buildJoinCondition(E, R, A, S) {
-    const I = [];
-    for (const N of E.on) {
-      const C = R ? n`${n.identifier(R)}.${n.identifier(N.source.name)}` : N.source, r = A ? n`${n.identifier(A)}.${n.identifier(N.target.name)}` : N.target, O = N.as || mE;
-      I.push(O(C, r));
+  buildJoinCondition(E, R, A) {
+    const S = [];
+    for (const I of E.on) {
+      const N = R ? r`${r.identifier(R)}.${r.identifier(I.source.name)}` : I.source, e = A ? r`${r.identifier(A)}.${r.identifier(I.target.name)}` : I.target, n = I.as || mE;
+      S.push(n(N, e));
     }
-    return d(...I);
+    return d(...S);
   }
   /**
    * Find join path from source cube to target cube
@@ -1305,20 +1298,20 @@ class SR {
       { cube: R, path: [] }
     ], N = /* @__PURE__ */ new Set([R, ...S]);
     for (; I.length > 0; ) {
-      const { cube: C, path: r } = I.shift(), O = E.get(C);
+      const { cube: e, path: n } = I.shift(), O = E.get(e);
       if (O != null && O.joins)
-        for (const [t, e] of Object.entries(O.joins)) {
-          const i = gE(e.targetCube).name;
-          if (N.has(i))
+        for (const [, s] of Object.entries(O.joins)) {
+          const t = gE(s.targetCube).name;
+          if (N.has(t))
             continue;
-          const a = [...r, {
-            fromCube: C,
-            toCube: i,
-            joinDef: e
+          const i = [...n, {
+            fromCube: e,
+            toCube: t,
+            joinDef: s
           }];
-          if (i === A)
-            return a;
-          N.add(i), I.push({ cube: i, path: a });
+          if (t === A)
+            return i;
+          N.add(t), I.push({ cube: t, path: i });
         }
     }
     return null;
@@ -1331,26 +1324,26 @@ class SR {
     if (!S.measures || S.measures.length === 0)
       return I;
     for (const N of A) {
-      const C = this.findHasManyJoinDef(R, N.cube.name);
-      if (!C)
+      const e = this.findHasManyJoinDef(R, N.cube.name);
+      if (!e)
         continue;
-      const r = S.measures ? S.measures.filter(
-        (s) => s.startsWith(N.cube.name + ".")
-      ) : [], O = this.extractMeasuresFromFilters(S, N.cube.name), t = [.../* @__PURE__ */ new Set([...r, ...O])];
-      if (t.length === 0)
+      const n = S.measures ? S.measures.filter(
+        (t) => t.startsWith(N.cube.name + ".")
+      ) : [], O = this.extractMeasuresFromFilters(S, N.cube.name), s = [.../* @__PURE__ */ new Set([...n, ...O])];
+      if (s.length === 0)
         continue;
-      const e = C.on.map((s) => ({
-        sourceColumn: s.source.name,
-        targetColumn: s.target.name,
-        sourceColumnObj: s.source,
-        targetColumnObj: s.target
+      const C = e.on.map((t) => ({
+        sourceColumn: t.source.name,
+        targetColumn: t.target.name,
+        sourceColumnObj: t.source,
+        targetColumnObj: t.target
       }));
       I.push({
         cube: N.cube,
         alias: N.alias,
         cteAlias: `${N.cube.name.toLowerCase()}_agg`,
-        joinKeys: e,
-        measures: t
+        joinKeys: C,
+        measures: s
       });
     }
     return I;
@@ -1361,9 +1354,9 @@ class SR {
   findHasManyJoinDef(E, R) {
     if (!E.joins)
       return null;
-    for (const [A, S] of Object.entries(E.joins))
-      if (gE(S.targetCube).name === R && S.relationship === "hasMany")
-        return S;
+    for (const [, A] of Object.entries(E.joins))
+      if (gE(A.targetCube).name === R && A.relationship === "hasMany")
+        return A;
     return null;
   }
 }
@@ -1388,24 +1381,24 @@ class IE {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: A
-      }, N = this.queryPlanner.createQueryPlan(E, R, I), C = this.buildUnifiedQuery(N, R, I), r = this.queryBuilder.collectNumericFields(E, R), O = await this.dbExecutor.execute(C, r), t = Array.isArray(O) ? O.map((s) => {
-        const i = { ...s };
+      }, N = this.queryPlanner.createQueryPlan(E, R, I), e = this.buildUnifiedQuery(N, R, I), n = this.queryBuilder.collectNumericFields(E, R), O = await this.dbExecutor.execute(e, n), s = Array.isArray(O) ? O.map((t) => {
+        const i = { ...t };
         if (R.timeDimensions) {
           for (const a of R.timeDimensions)
             if (a.dimension in i) {
-              let M = i[a.dimension];
-              if (typeof M == "string" && M.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-                const o = M.replace(" ", "T"), G = !o.endsWith("Z") && !o.includes("+") ? o + "Z" : o;
-                M = new Date(G);
+              let U = i[a.dimension];
+              if (typeof U == "string" && U.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
+                const o = U.replace(" ", "T"), G = !o.endsWith("Z") && !o.includes("+") ? o + "Z" : o;
+                U = new Date(G);
               }
-              M = this.databaseAdapter.convertTimeDimensionResult(M), i[a.dimension] = M;
+              U = this.databaseAdapter.convertTimeDimensionResult(U), i[a.dimension] = U;
             }
         }
         return i;
-      }) : [O], e = this.generateAnnotations(N, R);
+      }) : [O], C = this.generateAnnotations(N, R);
       return {
-        data: t,
-        annotation: e
+        data: s,
+        annotation: C
       };
     } catch (S) {
       throw new Error(`Query execution failed: ${S instanceof Error ? S.message : "Unknown error"}`);
@@ -1422,68 +1415,68 @@ class IE {
    * Build pre-aggregation CTE for hasMany relationships
    */
   buildPreAggregationCTE(E, R, A, S) {
-    var M;
-    const I = E.cube, N = I.sql(A), C = {};
+    var U;
+    const I = E.cube, N = I.sql(A), e = {};
     for (const o of E.joinKeys)
       if (o.targetColumnObj) {
-        C[o.targetColumn] = o.targetColumnObj;
+        e[o.targetColumn] = o.targetColumnObj;
         for (const [G, P] of Object.entries(I.dimensions || {}))
-          P.sql === o.targetColumnObj && G !== o.targetColumn && (C[G] = n`${o.targetColumnObj}`.as(G));
+          P.sql === o.targetColumnObj && G !== o.targetColumn && (e[G] = r`${o.targetColumnObj}`.as(G));
       }
     for (const o of E.measures) {
       const [, G] = o.split(".");
       if (I.measures && I.measures[G]) {
         const P = I.measures[G], H = this.queryBuilder.buildMeasureExpression(P, A);
-        C[G] = n`${H}`.as(G);
+        e[G] = r`${H}`.as(G);
       }
     }
-    const r = I.name;
+    const n = I.name;
     if (R.dimensions)
       for (const o of R.dimensions) {
         const [G, P] = o.split(".");
-        if (G === r && I.dimensions && I.dimensions[P]) {
+        if (G === n && I.dimensions && I.dimensions[P]) {
           const H = I.dimensions[P], l = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A);
-          C[P] = n`${l}`.as(P);
+          e[P] = r`${l}`.as(P);
         }
       }
     if (R.timeDimensions)
       for (const o of R.timeDimensions) {
         const [G, P] = o.dimension.split(".");
-        if (G === r && I.dimensions && I.dimensions[P]) {
+        if (G === n && I.dimensions && I.dimensions[P]) {
           const H = I.dimensions[P], l = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
-          C[P] = n`${l}`.as(P);
+          e[P] = r`${l}`.as(P);
         }
       }
-    if (Object.keys(C).length === 0)
+    if (Object.keys(e).length === 0)
       return null;
-    let O = A.db.select(C).from(N.from);
-    const t = S ? {
+    let O = A.db.select(e).from(N.from);
+    const s = S ? {
       ...S,
-      preAggregationCTEs: (M = S.preAggregationCTEs) == null ? void 0 : M.filter((o) => o.cube.name !== I.name)
-    } : void 0, e = this.queryBuilder.buildWhereConditions(I, R, A, t), s = [];
+      preAggregationCTEs: (U = S.preAggregationCTEs) == null ? void 0 : U.filter((o) => o.cube.name !== I.name)
+    } : void 0, C = this.queryBuilder.buildWhereConditions(I, R, A, s), t = [];
     if (R.timeDimensions)
       for (const o of R.timeDimensions) {
         const [G, P] = o.dimension.split(".");
-        if (G === r && I.dimensions && I.dimensions[P] && o.dateRange) {
+        if (G === n && I.dimensions && I.dimensions[P] && o.dateRange) {
           const H = I.dimensions[P], l = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(l, o.dateRange);
-          B && s.push(B);
+          B && t.push(B);
         }
       }
     if (R.filters) {
       for (const o of R.filters)
         if (!("and" in o) && !("or" in o) && "member" in o && "operator" in o) {
           const G = o, [P, H] = G.member.split(".");
-          if (P === r && I.dimensions && I.dimensions[H]) {
+          if (P === n && I.dimensions && I.dimensions[H]) {
             const l = I.dimensions[H];
             if (G.operator === "inDateRange") {
               const B = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A), u = this.queryBuilder.buildDateRangeCondition(B, G.values);
-              u && s.push(u);
+              u && t.push(u);
             }
           }
         }
     }
     const i = [];
-    if (N.where && i.push(N.where), i.push(...e, ...s), i.length > 0) {
+    if (N.where && i.push(N.where), i.push(...C, ...t), i.length > 0) {
       const o = i.length === 1 ? i[0] : d(...i);
       O = O.where(o);
     }
@@ -1493,7 +1486,7 @@ class IE {
     if (R.dimensions)
       for (const o of R.dimensions) {
         const [G, P] = o.split(".");
-        if (G === r && I.dimensions && I.dimensions[P]) {
+        if (G === n && I.dimensions && I.dimensions[P]) {
           const H = I.dimensions[P], l = K(H.sql, A);
           a.push(l);
         }
@@ -1501,7 +1494,7 @@ class IE {
     if (R.timeDimensions)
       for (const o of R.timeDimensions) {
         const [G, P] = o.dimension.split(".");
-        if (G === r && I.dimensions && I.dimensions[P]) {
+        if (G === n && I.dimensions && I.dimensions[P]) {
           const H = I.dimensions[P], l = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
           a.push(l);
         }
@@ -1514,13 +1507,13 @@ class IE {
    */
   buildCTEJoinCondition(E, R, A) {
     var N;
-    const S = (N = A.preAggregationCTEs) == null ? void 0 : N.find((C) => C.cube.name === E.cube.name);
+    const S = (N = A.preAggregationCTEs) == null ? void 0 : N.find((e) => e.cube.name === E.cube.name);
     if (!S)
       throw new Error(`CTE info not found for cube ${E.cube.name}`);
     const I = [];
-    for (const C of S.joinKeys) {
-      const r = C.sourceColumnObj || n.identifier(C.sourceColumn), O = n`${n.identifier(R)}.${n.identifier(C.targetColumn)}`;
-      I.push(mE(r, O));
+    for (const e of S.joinKeys) {
+      const n = e.sourceColumnObj || r.identifier(e.sourceColumn), O = r`${r.identifier(R)}.${r.identifier(e.targetColumn)}`;
+      I.push(mE(n, O));
     }
     return I.length === 1 ? I[0] : d(...I);
   }
@@ -1528,14 +1521,14 @@ class IE {
    * Build unified query that works for both single and multi-cube queries
    */
   buildUnifiedQuery(E, R, A) {
-    var M, o, G;
+    var U, o, G;
     const S = [], I = /* @__PURE__ */ new Map();
     if (E.preAggregationCTEs && E.preAggregationCTEs.length > 0)
       for (const P of E.preAggregationCTEs) {
         const H = this.buildPreAggregationCTE(P, R, A, E);
         H && (S.push(H), I.set(P.cube.name, P.cteAlias));
       }
-    const N = E.primaryCube.sql(A), r = { ...this.queryBuilder.buildSelections(
+    const N = E.primaryCube.sql(A), n = { ...this.queryBuilder.buildSelections(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -1545,10 +1538,10 @@ class IE {
       for (const P of E.preAggregationCTEs) {
         const H = P.cube.name;
         for (const l of P.measures)
-          if (r[l]) {
+          if (n[l]) {
             const [, B] = l.split("."), u = this.getCubesFromPlan(E).get(H);
             if (u && u.measures && u.measures[B]) {
-              const p = u.measures[B], W = n`${n.identifier(P.cteAlias)}.${n.identifier(B)}`;
+              const p = u.measures[B], W = r`${r.identifier(P.cteAlias)}.${r.identifier(B)}`;
               let h;
               switch (p.type) {
                 case "count":
@@ -1571,26 +1564,26 @@ class IE {
                 default:
                   h = y(W);
               }
-              r[l] = n`${h}`.as(l);
+              n[l] = r`${h}`.as(l);
             }
           }
-        for (const l in r) {
+        for (const l in n) {
           const [B, u] = l.split(".");
           if (B === H) {
-            const p = this.getCubesFromPlan(E).get(H), W = p && ((M = p.dimensions) == null ? void 0 : M[u]), h = l.startsWith(H + ".");
+            const p = this.getCubesFromPlan(E).get(H), W = p && ((U = p.dimensions) == null ? void 0 : U[u]), h = l.startsWith(H + ".");
             if (W || h) {
               let RE = P.joinKeys.find((AE) => AE.targetColumn === u);
               if (!RE && ((o = p == null ? void 0 : p.dimensions) != null && o[u])) {
                 const AE = p.dimensions[u].sql;
                 RE = P.joinKeys.find((WT) => WT.targetColumnObj === AE);
               }
-              RE ? r[l] = n`${n.identifier(P.cteAlias)}.${n.identifier(u)}`.as(l) : h && ((G = p == null ? void 0 : p.dimensions) != null && G[u]) && (r[l] = n`${n.identifier(P.cteAlias)}.${n.identifier(u)}`.as(l));
+              RE ? n[l] = r`${r.identifier(P.cteAlias)}.${r.identifier(u)}`.as(l) : h && ((G = p == null ? void 0 : p.dimensions) != null && G[u]) && (n[l] = r`${r.identifier(P.cteAlias)}.${r.identifier(u)}`.as(l));
             }
           }
         }
       }
-    let O = A.db.select(r).from(N.from);
-    if (S.length > 0 && (O = A.db.with(...S).select(r).from(N.from)), N.joins)
+    let O = A.db.select(n).from(N.from);
+    if (S.length > 0 && (O = A.db.with(...S).select(n).from(N.from)), N.joins)
       for (const P of N.joins)
         switch (P.type || "left") {
           case "left":
@@ -1610,7 +1603,7 @@ class IE {
       for (const P of E.joinCubes) {
         const H = I.get(P.cube.name);
         let l, B;
-        H ? (l = n`${n.identifier(H)}`, B = this.buildCTEJoinCondition(P, H, E)) : (l = P.cube.sql(A).from, B = P.joinCondition);
+        H ? (l = r`${r.identifier(H)}`, B = this.buildCTEJoinCondition(P, H, E)) : (l = P.cube.sql(A).from, B = P.joinCondition);
         try {
           switch (P.joinType || "left") {
             case "left":
@@ -1629,15 +1622,15 @@ class IE {
         } catch {
         }
       }
-    const t = [];
-    if (N.where && t.push(N.where), E.joinCubes && E.joinCubes.length > 0)
+    const s = [];
+    if (N.where && s.push(N.where), E.joinCubes && E.joinCubes.length > 0)
       for (const P of E.joinCubes) {
         if (I.get(P.cube.name))
           continue;
         const l = P.cube.sql(A);
-        l.where && t.push(l.where);
+        l.where && s.push(l.where);
       }
-    const e = this.queryBuilder.buildWhereConditions(
+    const C = this.queryBuilder.buildWhereConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -1645,11 +1638,11 @@ class IE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (e.length > 0 && t.push(...e), t.length > 0) {
-      const P = t.length === 1 ? t[0] : d(...t);
+    if (C.length > 0 && s.push(...C), s.length > 0) {
+      const P = s.length === 1 ? s[0] : d(...s);
       O = O.where(P);
     }
-    const s = this.queryBuilder.buildGroupByFields(
+    const t = this.queryBuilder.buildGroupByFields(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -1657,7 +1650,7 @@ class IE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    s.length > 0 && (O = O.groupBy(...s));
+    t.length > 0 && (O = O.groupBy(...t));
     const i = this.queryBuilder.buildHavingConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
@@ -1704,10 +1697,10 @@ class IE {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: A
-    }, I = this.queryPlanner.createQueryPlan(E, R, S), C = this.buildUnifiedQuery(I, R, S).toSQL();
+    }, I = this.queryPlanner.createQueryPlan(E, R, S), e = this.buildUnifiedQuery(I, R, S).toSQL();
     return {
-      sql: C.sql,
-      params: C.params
+      sql: e.sql,
+      params: e.params
     };
   }
   /**
@@ -1715,40 +1708,40 @@ class IE {
    */
   generateAnnotations(E, R) {
     const A = {}, S = {}, I = {}, N = [E.primaryCube];
-    if (E.joinCubes && E.joinCubes.length > 0 && N.push(...E.joinCubes.map((C) => C.cube)), R.measures)
-      for (const C of R.measures) {
-        const [r, O] = C.split("."), t = N.find((e) => e.name === r);
-        if (t && t.measures[O]) {
-          const e = t.measures[O];
-          A[C] = {
-            title: e.title || O,
-            shortTitle: e.title || O,
-            type: e.type
+    if (E.joinCubes && E.joinCubes.length > 0 && N.push(...E.joinCubes.map((e) => e.cube)), R.measures)
+      for (const e of R.measures) {
+        const [n, O] = e.split("."), s = N.find((C) => C.name === n);
+        if (s && s.measures[O]) {
+          const C = s.measures[O];
+          A[e] = {
+            title: C.title || O,
+            shortTitle: C.title || O,
+            type: C.type
           };
         }
       }
     if (R.dimensions)
-      for (const C of R.dimensions) {
-        const [r, O] = C.split("."), t = N.find((e) => e.name === r);
-        if (t && t.dimensions[O]) {
-          const e = t.dimensions[O];
-          S[C] = {
-            title: e.title || O,
-            shortTitle: e.title || O,
-            type: e.type
+      for (const e of R.dimensions) {
+        const [n, O] = e.split("."), s = N.find((C) => C.name === n);
+        if (s && s.dimensions[O]) {
+          const C = s.dimensions[O];
+          S[e] = {
+            title: C.title || O,
+            shortTitle: C.title || O,
+            type: C.type
           };
         }
       }
     if (R.timeDimensions)
-      for (const C of R.timeDimensions) {
-        const [r, O] = C.dimension.split("."), t = N.find((e) => e.name === r);
-        if (t && t.dimensions && t.dimensions[O]) {
-          const e = t.dimensions[O];
-          I[C.dimension] = {
-            title: e.title || O,
-            shortTitle: e.title || O,
-            type: e.type,
-            granularity: C.granularity
+      for (const e of R.timeDimensions) {
+        const [n, O] = e.dimension.split("."), s = N.find((C) => C.name === n);
+        if (s && s.dimensions && s.dimensions[O]) {
+          const C = s.dimensions[O];
+          I[e.dimension] = {
+            title: C.title || O,
+            shortTitle: C.title || O,
+            type: C.type,
+            granularity: e.granularity
           };
         }
       }
@@ -17273,7 +17266,7 @@ const YS = [
     "[": "]",
     "(": ")",
     "{": "}"
-  }, E = "{left}(?:(?!{right}').)*?{right}", R = Object.entries(T).map(([N, C]) => E.replace(/{left}/g, V(N)).replace(/{right}/g, V(C))), A = V(Object.keys(T).join(""));
+  }, E = "{left}(?:(?!{right}').)*?{right}", R = Object.entries(T).map(([N, e]) => E.replace(/{left}/g, V(N)).replace(/{right}/g, V(e))), A = V(Object.keys(T).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${A}])(?:(?!\k<tag>').)*?\k<tag>`}|${R.join("|")})'`;
 }, _T = {
   // - backtick quoted (using `` to escape)
@@ -17301,8 +17294,8 @@ const YS = [
   // Oracle q'' strings: q'<text>' q'|text|' ...
   "q''": fI()
 }, cT = (T) => typeof T == "string" ? _T[T] : "regex" in T ? T.regex : dI(T) + _T[T.quote], WI = (T) => g(T.map((E) => "regex" in E ? E.regex : cT(E)).join("|")), lT = (T) => T.map(cT).join("|"), rT = (T) => g(lT(T)), XI = (T = {}) => g(HT(T)), HT = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
-  const S = "\\p{Alphabetic}\\p{Mark}_", I = "\\p{Decimal_Number}", N = V(T ?? ""), C = V(E ?? ""), r = A ? `[${S}${I}${N}][${S}${I}${C}]*` : `[${S}${N}][${S}${I}${C}]*`;
-  return R ? pI(r) : r;
+  const S = "\\p{Alphabetic}\\p{Mark}_", I = "\\p{Decimal_Number}", N = V(T ?? ""), e = V(E ?? ""), n = A ? `[${S}${I}${N}][${S}${I}${e}]*` : `[${S}${N}][${S}${I}${e}]*`;
+  return R ? pI(n) : n;
 };
 function BT(T, E) {
   const R = T.slice(0, E).split(/\n/);
@@ -17586,43 +17579,43 @@ class gI {
   // These rules can't be blindly cached as the paramTypesOverrides object
   // can differ on each invocation of the format() function.
   buildParamRules(E, R) {
-    var A, S, I, N, C;
-    const r = {
+    var A, S, I, N, e;
+    const n = {
       named: (R == null ? void 0 : R.named) || ((A = E.paramTypes) === null || A === void 0 ? void 0 : A.named) || [],
       quoted: (R == null ? void 0 : R.quoted) || ((S = E.paramTypes) === null || S === void 0 ? void 0 : S.quoted) || [],
       numbered: (R == null ? void 0 : R.numbered) || ((I = E.paramTypes) === null || I === void 0 ? void 0 : I.numbered) || [],
       positional: typeof (R == null ? void 0 : R.positional) == "boolean" ? R.positional : (N = E.paramTypes) === null || N === void 0 ? void 0 : N.positional,
-      custom: (R == null ? void 0 : R.custom) || ((C = E.paramTypes) === null || C === void 0 ? void 0 : C.custom) || []
+      custom: (R == null ? void 0 : R.custom) || ((e = E.paramTypes) === null || e === void 0 ? void 0 : e.custom) || []
     };
     return this.validRules([
       {
         type: D.NAMED_PARAMETER,
-        regex: lE(r.named, HT(E.paramChars || E.identChars)),
+        regex: lE(n.named, HT(E.paramChars || E.identChars)),
         key: (O) => O.slice(1)
       },
       {
         type: D.QUOTED_PARAMETER,
-        regex: lE(r.quoted, lT(E.identTypes)),
-        key: (O) => (({ tokenKey: t, quoteChar: e }) => t.replace(new RegExp(V("\\" + e), "gu"), e))({
+        regex: lE(n.quoted, lT(E.identTypes)),
+        key: (O) => (({ tokenKey: s, quoteChar: C }) => s.replace(new RegExp(V("\\" + C), "gu"), C))({
           tokenKey: O.slice(2, -1),
           quoteChar: O.slice(-1)
         })
       },
       {
         type: D.NUMBERED_PARAMETER,
-        regex: lE(r.numbered, "[0-9]+"),
+        regex: lE(n.numbered, "[0-9]+"),
         key: (O) => O.slice(1)
       },
       {
         type: D.POSITIONAL_PARAMETER,
-        regex: r.positional ? /[?]/y : void 0
+        regex: n.positional ? /[?]/y : void 0
       },
-      ...r.custom.map((O) => {
-        var t;
+      ...n.custom.map((O) => {
+        var s;
         return {
           type: D.CUSTOM_PARAMETER,
           regex: g(O.regex),
-          key: (t = O.key) !== null && t !== void 0 ? t : (e) => e
+          key: (s = O.key) !== null && s !== void 0 ? s : (C) => C
         };
       })
     ]);
@@ -17684,40 +17677,40 @@ var uT = { exports: {} };
   (function(E, R) {
     T.exports ? T.exports = R() : E.nearley = R();
   })(ZI, function() {
-    function E(O, t, e) {
-      return this.id = ++E.highestId, this.name = O, this.symbols = t, this.postprocess = e, this;
+    function E(O, s, C) {
+      return this.id = ++E.highestId, this.name = O, this.symbols = s, this.postprocess = C, this;
     }
     E.highestId = 0, E.prototype.toString = function(O) {
-      var t = typeof O > "u" ? this.symbols.map(r).join(" ") : this.symbols.slice(0, O).map(r).join(" ") + " ● " + this.symbols.slice(O).map(r).join(" ");
-      return this.name + " → " + t;
+      var s = typeof O > "u" ? this.symbols.map(n).join(" ") : this.symbols.slice(0, O).map(n).join(" ") + " ● " + this.symbols.slice(O).map(n).join(" ");
+      return this.name + " → " + s;
     };
-    function R(O, t, e, s) {
-      this.rule = O, this.dot = t, this.reference = e, this.data = [], this.wantedBy = s, this.isComplete = this.dot === O.symbols.length;
+    function R(O, s, C, t) {
+      this.rule = O, this.dot = s, this.reference = C, this.data = [], this.wantedBy = t, this.isComplete = this.dot === O.symbols.length;
     }
     R.prototype.toString = function() {
       return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
     }, R.prototype.nextState = function(O) {
-      var t = new R(this.rule, this.dot + 1, this.reference, this.wantedBy);
-      return t.left = this, t.right = O, t.isComplete && (t.data = t.build(), t.right = void 0), t;
+      var s = new R(this.rule, this.dot + 1, this.reference, this.wantedBy);
+      return s.left = this, s.right = O, s.isComplete && (s.data = s.build(), s.right = void 0), s;
     }, R.prototype.build = function() {
-      var O = [], t = this;
+      var O = [], s = this;
       do
-        O.push(t.right.data), t = t.left;
-      while (t.left);
+        O.push(s.right.data), s = s.left;
+      while (s.left);
       return O.reverse(), O;
     }, R.prototype.finish = function() {
       this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, N.fail));
     };
-    function A(O, t) {
-      this.grammar = O, this.index = t, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
+    function A(O, s) {
+      this.grammar = O, this.index = s, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
     }
     A.prototype.process = function(O) {
-      for (var t = this.states, e = this.wants, s = this.completed, i = 0; i < t.length; i++) {
-        var a = t[i];
+      for (var s = this.states, C = this.wants, t = this.completed, i = 0; i < s.length; i++) {
+        var a = s[i];
         if (a.isComplete) {
           if (a.finish(), a.data !== N.fail) {
-            for (var M = a.wantedBy, o = M.length; o--; ) {
-              var G = M[o];
+            for (var U = a.wantedBy, o = U.length; o--; ) {
+              var G = U[o];
               this.complete(G, a);
             }
             if (a.reference === this.index) {
@@ -17731,45 +17724,45 @@ var uT = { exports: {} };
             this.scannable.push(a);
             continue;
           }
-          if (e[P]) {
-            if (e[P].push(a), s.hasOwnProperty(P))
-              for (var H = s[P], o = 0; o < H.length; o++) {
+          if (C[P]) {
+            if (C[P].push(a), t.hasOwnProperty(P))
+              for (var H = t[P], o = 0; o < H.length; o++) {
                 var l = H[o];
                 this.complete(a, l);
               }
           } else
-            e[P] = [a], this.predict(P);
+            C[P] = [a], this.predict(P);
         }
       }
     }, A.prototype.predict = function(O) {
-      for (var t = this.grammar.byName[O] || [], e = 0; e < t.length; e++) {
-        var s = t[e], i = this.wants[O], a = new R(s, 0, this.index, i);
+      for (var s = this.grammar.byName[O] || [], C = 0; C < s.length; C++) {
+        var t = s[C], i = this.wants[O], a = new R(t, 0, this.index, i);
         this.states.push(a);
       }
-    }, A.prototype.complete = function(O, t) {
-      var e = O.nextState(t);
-      this.states.push(e);
+    }, A.prototype.complete = function(O, s) {
+      var C = O.nextState(s);
+      this.states.push(C);
     };
-    function S(O, t) {
-      this.rules = O, this.start = t || this.rules[0].name;
-      var e = this.byName = {};
-      this.rules.forEach(function(s) {
-        e.hasOwnProperty(s.name) || (e[s.name] = []), e[s.name].push(s);
+    function S(O, s) {
+      this.rules = O, this.start = s || this.rules[0].name;
+      var C = this.byName = {};
+      this.rules.forEach(function(t) {
+        C.hasOwnProperty(t.name) || (C[t.name] = []), C[t.name].push(t);
       });
     }
-    S.fromCompiled = function(s, t) {
-      var e = s.Lexer;
-      s.ParserStart && (t = s.ParserStart, s = s.ParserRules);
-      var s = s.map(function(a) {
+    S.fromCompiled = function(t, s) {
+      var C = t.Lexer;
+      t.ParserStart && (s = t.ParserStart, t = t.ParserRules);
+      var t = t.map(function(a) {
         return new E(a.name, a.symbols, a.postprocess);
-      }), i = new S(s, t);
-      return i.lexer = e, i;
+      }), i = new S(t, s);
+      return i.lexer = C, i;
     };
     function I() {
       this.reset("");
     }
-    I.prototype.reset = function(O, t) {
-      this.buffer = O, this.index = 0, this.line = t ? t.line : 1, this.lastLineBreak = t ? -t.col : 0;
+    I.prototype.reset = function(O, s) {
+      this.buffer = O, this.index = 0, this.line = s ? s.line : 1, this.lastLineBreak = s ? -s.col : 0;
     }, I.prototype.next = function() {
       if (this.index < this.buffer.length) {
         var O = this.buffer[this.index++];
@@ -17781,144 +17774,144 @@ var uT = { exports: {} };
         line: this.line,
         col: this.index - this.lastLineBreak
       };
-    }, I.prototype.formatError = function(O, t) {
-      var e = this.buffer;
-      if (typeof e == "string") {
-        var s = e.split(`
+    }, I.prototype.formatError = function(O, s) {
+      var C = this.buffer;
+      if (typeof C == "string") {
+        var t = C.split(`
 `).slice(
           Math.max(0, this.line - 5),
           this.line
-        ), i = e.indexOf(`
+        ), i = C.indexOf(`
 `, this.index);
-        i === -1 && (i = e.length);
-        var a = this.index - this.lastLineBreak, M = String(this.line).length;
-        return t += " at line " + this.line + " col " + a + `:
+        i === -1 && (i = C.length);
+        var a = this.index - this.lastLineBreak, U = String(this.line).length;
+        return s += " at line " + this.line + " col " + a + `:
 
-`, t += s.map(function(G, P) {
-          return o(this.line - s.length + P + 1, M) + " " + G;
+`, s += t.map(function(G, P) {
+          return o(this.line - t.length + P + 1, U) + " " + G;
         }, this).join(`
-`), t += `
-` + o("", M + a) + `^
-`, t;
+`), s += `
+` + o("", U + a) + `^
+`, s;
       } else
-        return t + " at index " + (this.index - 1);
+        return s + " at index " + (this.index - 1);
       function o(G, P) {
         var H = String(G);
         return Array(P - H.length + 1).join(" ") + H;
       }
     };
-    function N(O, t, e) {
+    function N(O, s, C) {
       if (O instanceof S)
-        var s = O, e = t;
+        var t = O, C = s;
       else
-        var s = S.fromCompiled(O, t);
-      this.grammar = s, this.options = {
+        var t = S.fromCompiled(O, s);
+      this.grammar = t, this.options = {
         keepHistory: !1,
-        lexer: s.lexer || new I()
+        lexer: t.lexer || new I()
       };
-      for (var i in e || {})
-        this.options[i] = e[i];
+      for (var i in C || {})
+        this.options[i] = C[i];
       this.lexer = this.options.lexer, this.lexerState = void 0;
-      var a = new A(s, 0);
-      this.table = [a], a.wants[s.start] = [], a.predict(s.start), a.process(), this.current = 0;
+      var a = new A(t, 0);
+      this.table = [a], a.wants[t.start] = [], a.predict(t.start), a.process(), this.current = 0;
     }
     N.fail = {}, N.prototype.feed = function(O) {
-      var t = this.lexer;
-      t.reset(O, this.lexerState);
-      for (var e; ; ) {
+      var s = this.lexer;
+      s.reset(O, this.lexerState);
+      for (var C; ; ) {
         try {
-          if (e = t.next(), !e)
+          if (C = s.next(), !C)
             break;
         } catch (p) {
-          var M = new A(this.grammar, this.current + 1);
-          this.table.push(M);
-          var s = new Error(this.reportLexerError(p));
-          throw s.offset = this.current, s.token = p.token, s;
+          var U = new A(this.grammar, this.current + 1);
+          this.table.push(U);
+          var t = new Error(this.reportLexerError(p));
+          throw t.offset = this.current, t.token = p.token, t;
         }
         var i = this.table[this.current];
         this.options.keepHistory || delete this.table[this.current - 1];
-        var a = this.current + 1, M = new A(this.grammar, a);
-        this.table.push(M);
-        for (var o = e.text !== void 0 ? e.text : e.value, G = t.constructor === I ? e.value : e, P = i.scannable, H = P.length; H--; ) {
+        var a = this.current + 1, U = new A(this.grammar, a);
+        this.table.push(U);
+        for (var o = C.text !== void 0 ? C.text : C.value, G = s.constructor === I ? C.value : C, P = i.scannable, H = P.length; H--; ) {
           var l = P[H], B = l.rule.symbols[l.dot];
-          if (B.test ? B.test(G) : B.type ? B.type === e.type : B.literal === o) {
-            var u = l.nextState({ data: G, token: e, isToken: !0, reference: a - 1 });
-            M.states.push(u);
+          if (B.test ? B.test(G) : B.type ? B.type === C.type : B.literal === o) {
+            var u = l.nextState({ data: G, token: C, isToken: !0, reference: a - 1 });
+            U.states.push(u);
           }
         }
-        if (M.process(), M.states.length === 0) {
-          var s = new Error(this.reportError(e));
-          throw s.offset = this.current, s.token = e, s;
+        if (U.process(), U.states.length === 0) {
+          var t = new Error(this.reportError(C));
+          throw t.offset = this.current, t.token = C, t;
         }
-        this.options.keepHistory && (i.lexerState = t.save()), this.current++;
+        this.options.keepHistory && (i.lexerState = s.save()), this.current++;
       }
-      return i && (this.lexerState = t.save()), this.results = this.finish(), this;
+      return i && (this.lexerState = s.save()), this.results = this.finish(), this;
     }, N.prototype.reportLexerError = function(O) {
-      var t, e, s = O.token;
-      return s ? (t = "input " + JSON.stringify(s.text[0]) + " (lexer error)", e = this.lexer.formatError(s, "Syntax error")) : (t = "input (lexer error)", e = O.message), this.reportErrorCommon(e, t);
+      var s, C, t = O.token;
+      return t ? (s = "input " + JSON.stringify(t.text[0]) + " (lexer error)", C = this.lexer.formatError(t, "Syntax error")) : (s = "input (lexer error)", C = O.message), this.reportErrorCommon(C, s);
     }, N.prototype.reportError = function(O) {
-      var t = (O.type ? O.type + " token: " : "") + JSON.stringify(O.value !== void 0 ? O.value : O), e = this.lexer.formatError(O, "Syntax error");
-      return this.reportErrorCommon(e, t);
-    }, N.prototype.reportErrorCommon = function(O, t) {
-      var e = [];
-      e.push(O);
-      var s = this.table.length - 2, i = this.table[s], a = i.states.filter(function(o) {
+      var s = (O.type ? O.type + " token: " : "") + JSON.stringify(O.value !== void 0 ? O.value : O), C = this.lexer.formatError(O, "Syntax error");
+      return this.reportErrorCommon(C, s);
+    }, N.prototype.reportErrorCommon = function(O, s) {
+      var C = [];
+      C.push(O);
+      var t = this.table.length - 2, i = this.table[t], a = i.states.filter(function(o) {
         var G = o.rule.symbols[o.dot];
         return G && typeof G != "string";
       });
       if (a.length === 0)
-        e.push("Unexpected " + t + `. I did not expect any more input. Here is the state of my parse table:
-`), this.displayStateStack(i.states, e);
+        C.push("Unexpected " + s + `. I did not expect any more input. Here is the state of my parse table:
+`), this.displayStateStack(i.states, C);
       else {
-        e.push("Unexpected " + t + `. Instead, I was expecting to see one of the following:
+        C.push("Unexpected " + s + `. Instead, I was expecting to see one of the following:
 `);
-        var M = a.map(function(o) {
+        var U = a.map(function(o) {
           return this.buildFirstStateStack(o, []) || [o];
         }, this);
-        M.forEach(function(o) {
+        U.forEach(function(o) {
           var G = o[0], P = G.rule.symbols[G.dot], H = this.getSymbolDisplay(P);
-          e.push("A " + H + " based on:"), this.displayStateStack(o, e);
+          C.push("A " + H + " based on:"), this.displayStateStack(o, C);
         }, this);
       }
-      return e.push(""), e.join(`
+      return C.push(""), C.join(`
 `);
-    }, N.prototype.displayStateStack = function(O, t) {
-      for (var e, s = 0, i = 0; i < O.length; i++) {
-        var a = O[i], M = a.rule.toString(a.dot);
-        M === e ? s++ : (s > 0 && t.push("    ^ " + s + " more lines identical to this"), s = 0, t.push("    " + M)), e = M;
+    }, N.prototype.displayStateStack = function(O, s) {
+      for (var C, t = 0, i = 0; i < O.length; i++) {
+        var a = O[i], U = a.rule.toString(a.dot);
+        U === C ? t++ : (t > 0 && s.push("    ^ " + t + " more lines identical to this"), t = 0, s.push("    " + U)), C = U;
       }
     }, N.prototype.getSymbolDisplay = function(O) {
-      return C(O);
-    }, N.prototype.buildFirstStateStack = function(O, t) {
-      if (t.indexOf(O) !== -1)
+      return e(O);
+    }, N.prototype.buildFirstStateStack = function(O, s) {
+      if (s.indexOf(O) !== -1)
         return null;
       if (O.wantedBy.length === 0)
         return [O];
-      var e = O.wantedBy[0], s = [O].concat(t), i = this.buildFirstStateStack(e, s);
+      var C = O.wantedBy[0], t = [O].concat(s), i = this.buildFirstStateStack(C, t);
       return i === null ? null : [O].concat(i);
     }, N.prototype.save = function() {
       var O = this.table[this.current];
       return O.lexerState = this.lexerState, O;
     }, N.prototype.restore = function(O) {
-      var t = O.index;
-      this.current = t, this.table[t] = O, this.table.splice(t + 1), this.lexerState = O.lexerState, this.results = this.finish();
+      var s = O.index;
+      this.current = s, this.table[s] = O, this.table.splice(s + 1), this.lexerState = O.lexerState, this.results = this.finish();
     }, N.prototype.rewind = function(O) {
       if (!this.options.keepHistory)
         throw new Error("set option `keepHistory` to enable rewinding");
       this.restore(this.table[O]);
     }, N.prototype.finish = function() {
-      var O = [], t = this.grammar.start, e = this.table[this.table.length - 1];
-      return e.states.forEach(function(s) {
-        s.rule.name === t && s.dot === s.rule.symbols.length && s.reference === 0 && s.data !== N.fail && O.push(s);
-      }), O.map(function(s) {
-        return s.data;
+      var O = [], s = this.grammar.start, C = this.table[this.table.length - 1];
+      return C.states.forEach(function(t) {
+        t.rule.name === s && t.dot === t.rule.symbols.length && t.reference === 0 && t.data !== N.fail && O.push(t);
+      }), O.map(function(t) {
+        return t.data;
       });
     };
-    function C(O) {
-      var t = typeof O;
-      if (t === "string")
+    function e(O) {
+      var s = typeof O;
+      if (s === "string")
         return O;
-      if (t === "object") {
+      if (s === "object") {
         if (O.literal)
           return JSON.stringify(O.literal);
         if (O instanceof RegExp)
@@ -17930,11 +17923,11 @@ var uT = { exports: {} };
         throw new Error("Unknown symbol type: " + O);
       }
     }
-    function r(O) {
-      var t = typeof O;
-      if (t === "string")
+    function n(O) {
+      var s = typeof O;
+      if (s === "string")
         return O;
-      if (t === "object") {
+      if (s === "object") {
         if (O.literal)
           return JSON.stringify(O.literal);
         if (O instanceof RegExp)
@@ -18022,20 +18015,20 @@ class mT {
     return E in D;
   }
 }
-var U;
+var M;
 (function(T) {
   T.statement = "statement", T.clause = "clause", T.set_operation = "set_operation", T.function_call = "function_call", T.parameterized_data_type = "parameterized_data_type", T.array_subscript = "array_subscript", T.property_access = "property_access", T.parenthesis = "parenthesis", T.between_predicate = "between_predicate", T.case_expression = "case_expression", T.case_when = "case_when", T.case_else = "case_else", T.limit_clause = "limit_clause", T.all_columns_asterisk = "all_columns_asterisk", T.literal = "literal", T.identifier = "identifier", T.keyword = "keyword", T.data_type = "data_type", T.parameter = "parameter", T.operator = "operator", T.comma = "comma", T.line_comment = "line_comment", T.block_comment = "block_comment", T.disable_comment = "disable_comment";
-})(U = U || (U = {}));
+})(M = M || (M = {}));
 function HE(T) {
   return T[0];
 }
 const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
-  type: U.keyword,
+  type: M.keyword,
   tokenType: T.type,
   text: T.text,
   raw: T.raw
 }), iT = (T) => ({
-  type: U.data_type,
+  type: M.data_type,
   text: T.text,
   raw: T.raw
 }), m = (T, { leading: E, trailing: R }) => (E != null && E.length && (T = Object.assign(Object.assign({}, T), { leadingComments: E })), R != null && R.length && (T = Object.assign(Object.assign({}, T), { trailingComments: R })), T), NO = (T, { leading: E, trailing: R }) => {
@@ -18067,7 +18060,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "statement",
       symbols: ["expressions_or_clauses", "statement$subexpression$1"],
       postprocess: ([T, [E]]) => ({
-        type: U.statement,
+        type: M.statement,
         children: T,
         hasSemicolon: E.type === D.DELIMITER
       })
@@ -18098,14 +18091,14 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
         if (A) {
           const [S, I] = A;
           return {
-            type: U.limit_clause,
+            type: M.limit_clause,
             limitKw: m(Y(T), { trailing: E }),
             offset: R,
             count: I
           };
         } else
           return {
-            type: U.limit_clause,
+            type: M.limit_clause,
             limitKw: m(Y(T), { trailing: E }),
             count: R
           };
@@ -18121,7 +18114,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "select_clause",
       symbols: [c.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT, "select_clause$subexpression$1"],
       postprocess: ([T, [E, R]]) => ({
-        type: U.clause,
+        type: M.clause,
         nameKw: Y(T),
         children: [E, ...R]
       })
@@ -18130,7 +18123,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "select_clause",
       symbols: [c.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT],
       postprocess: ([T]) => ({
-        type: U.clause,
+        type: M.clause,
         nameKw: Y(T),
         children: []
       })
@@ -18138,7 +18131,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
     {
       name: "all_columns_asterisk",
       symbols: [c.has("ASTERISK") ? { type: "ASTERISK" } : ASTERISK],
-      postprocess: () => ({ type: U.all_columns_asterisk })
+      postprocess: () => ({ type: M.all_columns_asterisk })
     },
     { name: "other_clause$ebnf$1", symbols: [] },
     { name: "other_clause$ebnf$1", symbols: ["other_clause$ebnf$1", "free_form_sql"], postprocess: (T) => T[0].concat([T[1]]) },
@@ -18146,7 +18139,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "other_clause",
       symbols: [c.has("RESERVED_CLAUSE") ? { type: "RESERVED_CLAUSE" } : RESERVED_CLAUSE, "other_clause$ebnf$1"],
       postprocess: ([T, E]) => ({
-        type: U.clause,
+        type: M.clause,
         nameKw: Y(T),
         children: E
       })
@@ -18157,7 +18150,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "set_operation",
       symbols: [c.has("RESERVED_SET_OPERATION") ? { type: "RESERVED_SET_OPERATION" } : RESERVED_SET_OPERATION, "set_operation$ebnf$1"],
       postprocess: ([T, E]) => ({
-        type: U.set_operation,
+        type: M.set_operation,
         nameKw: Y(T),
         children: E
       })
@@ -18230,8 +18223,8 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "array_subscript",
       symbols: [c.has("ARRAY_IDENTIFIER") ? { type: "ARRAY_IDENTIFIER" } : ARRAY_IDENTIFIER, "_", "square_brackets"],
       postprocess: ([T, E, R]) => ({
-        type: U.array_subscript,
-        array: m({ type: U.identifier, quoted: !1, text: T.text }, { trailing: E }),
+        type: M.array_subscript,
+        array: m({ type: M.identifier, quoted: !1, text: T.text }, { trailing: E }),
         parenthesis: R
       })
     },
@@ -18239,7 +18232,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "array_subscript",
       symbols: [c.has("ARRAY_KEYWORD") ? { type: "ARRAY_KEYWORD" } : ARRAY_KEYWORD, "_", "square_brackets"],
       postprocess: ([T, E, R]) => ({
-        type: U.array_subscript,
+        type: M.array_subscript,
         array: m(Y(T), { trailing: E }),
         parenthesis: R
       })
@@ -18248,7 +18241,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "function_call",
       symbols: [c.has("RESERVED_FUNCTION_NAME") ? { type: "RESERVED_FUNCTION_NAME" } : RESERVED_FUNCTION_NAME, "_", "parenthesis"],
       postprocess: ([T, E, R]) => ({
-        type: U.function_call,
+        type: M.function_call,
         nameKw: m(Y(T), { trailing: E }),
         parenthesis: R
       })
@@ -18257,7 +18250,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "parenthesis",
       symbols: [{ literal: "(" }, "expressions_or_clauses", { literal: ")" }],
       postprocess: ([T, E, R]) => ({
-        type: U.parenthesis,
+        type: M.parenthesis,
         children: E,
         openParen: "(",
         closeParen: ")"
@@ -18269,7 +18262,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "curly_braces",
       symbols: [{ literal: "{" }, "curly_braces$ebnf$1", { literal: "}" }],
       postprocess: ([T, E, R]) => ({
-        type: U.parenthesis,
+        type: M.parenthesis,
         children: E,
         openParen: "{",
         closeParen: "}"
@@ -18281,7 +18274,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "square_brackets",
       symbols: [{ literal: "[" }, "square_brackets$ebnf$1", { literal: "]" }],
       postprocess: ([T, E, R]) => ({
-        type: U.parenthesis,
+        type: M.parenthesis,
         children: E,
         openParen: "[",
         closeParen: "]"
@@ -18300,7 +18293,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
         // but we currently can't do that because of another hack that requires
         // %ARRAY_IDENTIFIER on the left side of <array_subscript>.
         ([T, E, R, A, [S]]) => ({
-          type: U.property_access,
+          type: M.property_access,
           object: m(T, { trailing: E }),
           operator: R.text,
           property: m(S, { leading: A })
@@ -18311,7 +18304,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "between_predicate",
       symbols: [c.has("BETWEEN") ? { type: "BETWEEN" } : BETWEEN, "_", "andless_expression_chain", "_", c.has("AND") ? { type: "AND" } : AND, "_", "andless_expression"],
       postprocess: ([T, E, R, A, S, I, N]) => ({
-        type: U.between_predicate,
+        type: M.between_predicate,
         betweenKw: Y(T),
         expr1: NO(R, { leading: E, trailing: A }),
         andKw: Y(S),
@@ -18326,7 +18319,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "case_expression",
       symbols: [c.has("CASE") ? { type: "CASE" } : CASE, "_", "case_expression$ebnf$1", "case_expression$ebnf$2", c.has("END") ? { type: "END" } : END],
       postprocess: ([T, E, R, A, S]) => ({
-        type: U.case_expression,
+        type: M.case_expression,
         caseKw: m(Y(T), { trailing: E }),
         endKw: Y(S),
         expr: R || [],
@@ -18337,7 +18330,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "case_clause",
       symbols: [c.has("WHEN") ? { type: "WHEN" } : WHEN, "_", "expression_chain_", c.has("THEN") ? { type: "THEN" } : THEN, "_", "expression_chain_"],
       postprocess: ([T, E, R, A, S, I]) => ({
-        type: U.case_when,
+        type: M.case_when,
         whenKw: m(Y(T), { trailing: E }),
         thenKw: m(Y(A), { trailing: S }),
         condition: R,
@@ -18348,30 +18341,30 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "case_clause",
       symbols: [c.has("ELSE") ? { type: "ELSE" } : ELSE, "_", "expression_chain_"],
       postprocess: ([T, E, R]) => ({
-        type: U.case_else,
+        type: M.case_else,
         elseKw: m(Y(T), { trailing: E }),
         result: R
       })
     },
     { name: "comma$subexpression$1", symbols: [c.has("COMMA") ? { type: "COMMA" } : COMMA] },
-    { name: "comma", symbols: ["comma$subexpression$1"], postprocess: ([[T]]) => ({ type: U.comma }) },
+    { name: "comma", symbols: ["comma$subexpression$1"], postprocess: ([[T]]) => ({ type: M.comma }) },
     { name: "asterisk$subexpression$1", symbols: [c.has("ASTERISK") ? { type: "ASTERISK" } : ASTERISK] },
-    { name: "asterisk", symbols: ["asterisk$subexpression$1"], postprocess: ([[T]]) => ({ type: U.operator, text: T.text }) },
+    { name: "asterisk", symbols: ["asterisk$subexpression$1"], postprocess: ([[T]]) => ({ type: M.operator, text: T.text }) },
     { name: "operator$subexpression$1", symbols: [c.has("OPERATOR") ? { type: "OPERATOR" } : OPERATOR] },
-    { name: "operator", symbols: ["operator$subexpression$1"], postprocess: ([[T]]) => ({ type: U.operator, text: T.text }) },
+    { name: "operator", symbols: ["operator$subexpression$1"], postprocess: ([[T]]) => ({ type: M.operator, text: T.text }) },
     { name: "identifier$subexpression$1", symbols: [c.has("IDENTIFIER") ? { type: "IDENTIFIER" } : IDENTIFIER] },
     { name: "identifier$subexpression$1", symbols: [c.has("QUOTED_IDENTIFIER") ? { type: "QUOTED_IDENTIFIER" } : QUOTED_IDENTIFIER] },
     { name: "identifier$subexpression$1", symbols: [c.has("VARIABLE") ? { type: "VARIABLE" } : VARIABLE] },
-    { name: "identifier", symbols: ["identifier$subexpression$1"], postprocess: ([[T]]) => ({ type: U.identifier, quoted: T.type !== "IDENTIFIER", text: T.text }) },
+    { name: "identifier", symbols: ["identifier$subexpression$1"], postprocess: ([[T]]) => ({ type: M.identifier, quoted: T.type !== "IDENTIFIER", text: T.text }) },
     { name: "parameter$subexpression$1", symbols: [c.has("NAMED_PARAMETER") ? { type: "NAMED_PARAMETER" } : NAMED_PARAMETER] },
     { name: "parameter$subexpression$1", symbols: [c.has("QUOTED_PARAMETER") ? { type: "QUOTED_PARAMETER" } : QUOTED_PARAMETER] },
     { name: "parameter$subexpression$1", symbols: [c.has("NUMBERED_PARAMETER") ? { type: "NUMBERED_PARAMETER" } : NUMBERED_PARAMETER] },
     { name: "parameter$subexpression$1", symbols: [c.has("POSITIONAL_PARAMETER") ? { type: "POSITIONAL_PARAMETER" } : POSITIONAL_PARAMETER] },
     { name: "parameter$subexpression$1", symbols: [c.has("CUSTOM_PARAMETER") ? { type: "CUSTOM_PARAMETER" } : CUSTOM_PARAMETER] },
-    { name: "parameter", symbols: ["parameter$subexpression$1"], postprocess: ([[T]]) => ({ type: U.parameter, key: T.key, text: T.text }) },
+    { name: "parameter", symbols: ["parameter$subexpression$1"], postprocess: ([[T]]) => ({ type: M.parameter, key: T.key, text: T.text }) },
     { name: "literal$subexpression$1", symbols: [c.has("NUMBER") ? { type: "NUMBER" } : NUMBER] },
     { name: "literal$subexpression$1", symbols: [c.has("STRING") ? { type: "STRING" } : STRING] },
-    { name: "literal", symbols: ["literal$subexpression$1"], postprocess: ([[T]]) => ({ type: U.literal, text: T.text }) },
+    { name: "literal", symbols: ["literal$subexpression$1"], postprocess: ([[T]]) => ({ type: M.literal, text: T.text }) },
     { name: "keyword$subexpression$1", symbols: [c.has("RESERVED_KEYWORD") ? { type: "RESERVED_KEYWORD" } : RESERVED_KEYWORD] },
     { name: "keyword$subexpression$1", symbols: [c.has("RESERVED_PHRASE") ? { type: "RESERVED_PHRASE" } : RESERVED_PHRASE] },
     { name: "keyword$subexpression$1", symbols: [c.has("RESERVED_JOIN") ? { type: "RESERVED_JOIN" } : RESERVED_JOIN] },
@@ -18390,7 +18383,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "data_type",
       symbols: [c.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
       postprocess: ([T, E, R]) => ({
-        type: U.parameterized_data_type,
+        type: M.parameterized_data_type,
         dataType: m(iT(T), { trailing: E }),
         parenthesis: R
       })
@@ -18419,7 +18412,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "comment",
       symbols: [c.has("LINE_COMMENT") ? { type: "LINE_COMMENT" } : LINE_COMMENT],
       postprocess: ([T]) => ({
-        type: U.line_comment,
+        type: M.line_comment,
         text: T.text,
         precedingWhitespace: T.precedingWhitespace
       })
@@ -18428,7 +18421,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "comment",
       symbols: [c.has("BLOCK_COMMENT") ? { type: "BLOCK_COMMENT" } : BLOCK_COMMENT],
       postprocess: ([T]) => ({
-        type: U.block_comment,
+        type: M.block_comment,
         text: T.text,
         precedingWhitespace: T.precedingWhitespace
       })
@@ -18437,7 +18430,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
       name: "comment",
       symbols: [c.has("DISABLE_COMMENT") ? { type: "DISABLE_COMMENT" } : DISABLE_COMMENT],
       postprocess: ([T]) => ({
-        type: U.disable_comment,
+        type: M.disable_comment,
         text: T.text,
         precedingWhitespace: T.precedingWhitespace
       })
@@ -18647,51 +18640,51 @@ class EE {
   }
   formatNodeWithoutComments(E) {
     switch (E.type) {
-      case U.function_call:
+      case M.function_call:
         return this.formatFunctionCall(E);
-      case U.parameterized_data_type:
+      case M.parameterized_data_type:
         return this.formatParameterizedDataType(E);
-      case U.array_subscript:
+      case M.array_subscript:
         return this.formatArraySubscript(E);
-      case U.property_access:
+      case M.property_access:
         return this.formatPropertyAccess(E);
-      case U.parenthesis:
+      case M.parenthesis:
         return this.formatParenthesis(E);
-      case U.between_predicate:
+      case M.between_predicate:
         return this.formatBetweenPredicate(E);
-      case U.case_expression:
+      case M.case_expression:
         return this.formatCaseExpression(E);
-      case U.case_when:
+      case M.case_when:
         return this.formatCaseWhen(E);
-      case U.case_else:
+      case M.case_else:
         return this.formatCaseElse(E);
-      case U.clause:
+      case M.clause:
         return this.formatClause(E);
-      case U.set_operation:
+      case M.set_operation:
         return this.formatSetOperation(E);
-      case U.limit_clause:
+      case M.limit_clause:
         return this.formatLimitClause(E);
-      case U.all_columns_asterisk:
+      case M.all_columns_asterisk:
         return this.formatAllColumnsAsterisk(E);
-      case U.literal:
+      case M.literal:
         return this.formatLiteral(E);
-      case U.identifier:
+      case M.identifier:
         return this.formatIdentifier(E);
-      case U.parameter:
+      case M.parameter:
         return this.formatParameter(E);
-      case U.operator:
+      case M.operator:
         return this.formatOperator(E);
-      case U.comma:
+      case M.comma:
         return this.formatComma(E);
-      case U.line_comment:
+      case M.line_comment:
         return this.formatLineComment(E);
-      case U.block_comment:
+      case M.block_comment:
         return this.formatBlockComment(E);
-      case U.disable_comment:
+      case M.disable_comment:
         return this.formatBlockComment(E);
-      case U.data_type:
+      case M.data_type:
         return this.formatDataType(E);
-      case U.keyword:
+      case M.keyword:
         return this.formatKeywordNode(E);
     }
   }
@@ -18708,10 +18701,10 @@ class EE {
   formatArraySubscript(E) {
     let R;
     switch (E.array.type) {
-      case U.data_type:
+      case M.data_type:
         R = this.showDataType(E.array);
         break;
-      case U.keyword:
+      case M.keyword:
         R = this.showKw(E.array);
         break;
       default:
@@ -18787,14 +18780,14 @@ class EE {
   }
   formatComments(E) {
     E && E.forEach((R) => {
-      R.type === U.line_comment ? this.formatLineComment(R) : this.formatBlockComment(R);
+      R.type === M.line_comment ? this.formatLineComment(R) : this.formatBlockComment(R);
     });
   }
   formatLineComment(E) {
     cE(E.precedingWhitespace || "") ? this.layout.add(_.NEWLINE, _.INDENT, E.text, _.MANDATORY_NEWLINE, _.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(_.NO_NEWLINE, _.SPACE, E.text, _.MANDATORY_NEWLINE, _.INDENT) : this.layout.add(E.text, _.MANDATORY_NEWLINE, _.INDENT);
   }
   formatBlockComment(E) {
-    E.type === U.block_comment && this.isMultilineBlockComment(E) ? (this.splitBlockComment(E.text).forEach((R) => {
+    E.type === M.block_comment && this.isMultilineBlockComment(E) ? (this.splitBlockComment(E.text).forEach((R) => {
       this.layout.add(_.NEWLINE, _.INDENT, R);
     }), this.layout.add(_.NEWLINE, _.INDENT)) : this.layout.add(E.text, _.SPACE);
   }
@@ -19171,27 +19164,27 @@ class hE {
   generateCubeMetadata(E) {
     const R = Object.keys(E.measures), A = Object.keys(E.dimensions), S = new Array(R.length), I = new Array(A.length);
     for (let N = 0; N < R.length; N++) {
-      const C = R[N], r = E.measures[C];
+      const e = R[N], n = E.measures[e];
       S[N] = {
-        name: `${E.name}.${C}`,
-        title: r.title || C,
-        shortTitle: r.title || C,
-        type: r.type,
+        name: `${E.name}.${e}`,
+        title: n.title || e,
+        shortTitle: n.title || e,
+        type: n.type,
         format: void 0,
         // Measure doesn't have format field
-        description: r.description
+        description: n.description
       };
     }
     for (let N = 0; N < A.length; N++) {
-      const C = A[N], r = E.dimensions[C];
+      const e = A[N], n = E.dimensions[e];
       I[N] = {
-        name: `${E.name}.${C}`,
-        title: r.title || C,
-        shortTitle: r.title || C,
-        type: r.type,
+        name: `${E.name}.${e}`,
+        title: n.title || e,
+        shortTitle: n.title || e,
+        type: n.type,
         format: void 0,
         // Dimension doesn't have format field
-        description: r.description
+        description: n.description
       };
     }
     return {
@@ -19213,9 +19206,9 @@ class hE {
       throw new Error(`Cube '${E}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const N = await new IE(this.dbExecutor).generateSQL(S, R, A), C = this.dbExecutor.getEngineType();
+    const N = await new IE(this.dbExecutor).generateSQL(S, R, A), e = this.dbExecutor.getEngineType();
     return {
-      sql: aT(N.sql, C),
+      sql: aT(N.sql, e),
       params: N.params
     };
   }
@@ -19281,12 +19274,12 @@ function hT(T, E) {
         continue;
       }
       A.add(I);
-      const C = T.get(I);
-      if (!C) {
+      const e = T.get(I);
+      if (!e) {
         R.push(`Cube '${I}' not found (referenced in measure '${S}')`);
         continue;
       }
-      C.measures[N] || R.push(`Measure '${N}' not found on cube '${I}'`);
+      e.measures[N] || R.push(`Measure '${N}' not found on cube '${I}'`);
     }
   if (E.dimensions)
     for (const S of E.dimensions) {
@@ -19296,12 +19289,12 @@ function hT(T, E) {
         continue;
       }
       A.add(I);
-      const C = T.get(I);
-      if (!C) {
+      const e = T.get(I);
+      if (!e) {
         R.push(`Cube '${I}' not found (referenced in dimension '${S}')`);
         continue;
       }
-      C.dimensions[N] || R.push(`Dimension '${N}' not found on cube '${I}'`);
+      e.dimensions[N] || R.push(`Dimension '${N}' not found on cube '${I}'`);
     }
   if (E.timeDimensions)
     for (const S of E.timeDimensions) {
@@ -19311,12 +19304,12 @@ function hT(T, E) {
         continue;
       }
       A.add(I);
-      const C = T.get(I);
-      if (!C) {
+      const e = T.get(I);
+      if (!e) {
         R.push(`Cube '${I}' not found (referenced in timeDimension '${S.dimension}')`);
         continue;
       }
-      C.dimensions[N] || R.push(`TimeDimension '${N}' not found on cube '${I}' (must be a dimension with time type)`);
+      e.dimensions[N] || R.push(`TimeDimension '${N}' not found on cube '${I}' (must be a dimension with time type)`);
     }
   if (E.filters)
     for (const S of E.filters)
@@ -19328,9 +19321,9 @@ function hT(T, E) {
 }
 function fT(T, E, R, A) {
   if ("and" in T || "or" in T) {
-    const C = T.and || T.or || [];
-    for (const r of C)
-      fT(r, E, R, A);
+    const e = T.and || T.or || [];
+    for (const n of e)
+      fT(n, E, R, A);
     return;
   }
   if (!("member" in T)) {
@@ -19350,17 +19343,17 @@ function fT(T, E, R, A) {
   }
   !N.dimensions[I] && !N.measures[I] && R.push(`Filter field '${I}' not found on cube '${S}' (must be a dimension or measure)`);
 }
-function mO(T) {
+function YO(T) {
   return new hE(T);
 }
-const lO = new hE(), pO = lO;
-function dO(T) {
+const lO = new hE(), mO = lO;
+function pO(T) {
   return new hE({
     drizzle: T.drizzle,
     schema: T.schema
   });
 }
-const VO = {
+const dO = {
   /**
    * Create a simple query builder
    */
@@ -19468,24 +19461,23 @@ const VO = {
 };
 export {
   dE as BaseDatabaseExecutor,
-  ER as MySQLExecutor,
+  zT as MySQLExecutor,
   jT as PostgresExecutor,
   AR as QueryBuilder,
   IE as QueryExecutor,
   SR as QueryPlanner,
-  zT as SQLiteExecutor,
+  TR as SQLiteExecutor,
   hE as SemanticLayerCompiler,
-  VO as SemanticLayerUtils,
+  dO as SemanticLayerUtils,
   $E as createDatabaseExecutor,
-  dO as createDrizzleSemanticLayer,
-  YO as createMultiCubeContext,
-  TR as createMySQLExecutor,
+  pO as createDrizzleSemanticLayer,
+  uO as createMultiCubeContext,
+  ER as createMySQLExecutor,
   KE as createPostgresExecutor,
   yE as createSQLiteExecutor,
-  mO as createSemanticLayer,
-  pO as defaultSemanticLayer,
+  YO as createSemanticLayer,
+  mO as defaultSemanticLayer,
   FO as defineCube,
-  uO as defineLegacyCube,
   RR as getJoinType,
   gE as resolveCubeReference,
   K as resolveSqlExpression,