drizzle-cube 0.1.26 → 0.1.28

package/dist/server/index.js

@@ -1,7 +1,7 @@
-var gT = Object.defineProperty;
-var JT = (T, E, R) => E in T ? gT(T, E, { enumerable: !0, configurable: !0, writable: !0, value: R }) : T[E] = R;
-var W = (T, E, R) => JT(T, typeof E != "symbol" ? E + "" : E, R);
-import { sql as _, count as IE, sum as y, max as dE, min as VE, and as d, countDistinct as wT, SQL as xT, or as OE, isNotNull as KE, ne as yE, isNull as $E, eq as EE, notInArray as gE, inArray as NE, lt as eE, gt as CE, gte as J, lte as w, desc as vT, asc as JE } from "drizzle-orm";
+var wT = Object.defineProperty;
+var xT = (T, E, R) => E in T ? wT(T, E, { enumerable: !0, configurable: !0, writable: !0, value: R }) : T[E] = R;
+var W = (T, E, R) => xT(T, typeof E != "symbol" ? E + "" : E, R);
+import { sql as _, count as IE, sum as y, max as dE, min as VE, and as d, countDistinct as vT, SQL as QT, or as OE, isNotNull as KE, ne as yE, isNull as $E, eq as EE, notInArray as gE, inArray as eE, lt as NE, gt as tE, gte as J, lte as w, desc as ZT, asc as JE } from "drizzle-orm";
 class WE {
   /**
    * Helper method to build pattern for string matching
@@ -21,7 +21,7 @@ class WE {
     }
   }
 }
-class QT extends WE {
+class kT extends WE {
   getEngineType() {
     return "postgres";
   }
@@ -145,7 +145,7 @@ class QT extends WE {
     return E;
   }
 }
-class ZT extends WE {
+class HT extends WE {
   getEngineType() {
     return "mysql";
   }
@@ -270,7 +270,7 @@ class ZT extends WE {
     return E;
   }
 }
-class kT extends WE {
+class qT extends WE {
   getEngineType() {
     return "sqlite";
   }
@@ -301,8 +301,8 @@ class kT extends WE {
         const I = _`datetime(${R}, 'unixepoch')`;
         return _`datetime(strftime('%Y-%m-%d %H:%M:00', ${I}))`;
       case "second":
-        const N = _`datetime(${R}, 'unixepoch')`;
-        return _`datetime(strftime('%Y-%m-%d %H:%M:%S', ${N}))`;
+        const e = _`datetime(${R}, 'unixepoch')`;
+        return _`datetime(strftime('%Y-%m-%d %H:%M:%S', ${e}))`;
       default:
         return _`datetime(${R}, 'unixepoch')`;
     }
@@ -406,14 +406,29 @@ class kT extends WE {
     return E;
   }
 }
-function qT(T) {
+class jT extends HT {
+  getEngineType() {
+    return "singlestore";
+  }
+  // SingleStore inherits most MySQL functionality
+  // Override methods here only if SingleStore-specific behavior is needed
+  // Note: SingleStore has some known limitations:
+  // - ORDER BY and LIMIT cannot be chained together in some contexts
+  // - Nested selects with aggregation functions are not supported
+  // - Serial column type only assures uniqueness (tests may need ORDER BY)
+  // These limitations are typically handled at the query building level
+  // rather than in the adapter, but can be addressed here if needed
+}
+function zT(T) {
   switch (T) {
     case "postgres":
-      return new QT();
+      return new kT();
     case "mysql":
-      return new ZT();
+      return new HT();
     case "sqlite":
-      return new kT();
+      return new qT();
+    case "singlestore":
+      return new jT();
     default:
       throw new Error(`Unsupported database engine: ${T}`);
   }
@@ -423,10 +438,10 @@ class fE {
     W(this, "databaseAdapter");
     this.db = E, this.schema = R;
     const S = A || this.getEngineType();
-    this.databaseAdapter = qT(S);
+    this.databaseAdapter = zT(S);
   }
 }
-class jT extends fE {
+class ER extends fE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const S = await E.execute();
@@ -479,9 +494,9 @@ class jT extends fE {
   }
 }
 function wE(T, E) {
-  return new jT(T, E, "postgres");
+  return new ER(T, E, "postgres");
 }
-class zT extends fE {
+class BT extends fE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const S = await E.execute();
@@ -519,10 +534,10 @@ class zT extends fE {
     return "mysql";
   }
 }
-function ER(T, E) {
-  return new zT(T, E, "mysql");
+function TR(T, E) {
+  return new BT(T, E, "mysql");
 }
-class TR extends fE {
+class RR extends fE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const A = await E.execute();
@@ -569,7 +584,18 @@ class TR extends fE {
   }
 }
 function xE(T, E) {
-  return new TR(T, E, "sqlite");
+  return new RR(T, E, "sqlite");
+}
+class AR extends BT {
+  getEngineType() {
+    return "singlestore";
+  }
+  // SingleStore-specific optimizations can be added here if needed
+  // For now, we inherit all behavior from MySQLExecutor since
+  // SingleStore is largely MySQL-compatible
+}
+function SR(T, E) {
+  return new AR(T, E);
 }
 function vE(T, E, R) {
   if (R)
@@ -577,9 +603,11 @@ function vE(T, E, R) {
       case "postgres":
         return wE(T, E);
       case "mysql":
-        return ER(T, E);
+        return TR(T, E);
       case "sqlite":
         return xE(T, E);
+      case "singlestore":
+        return SR(T, E);
     }
   if (T.all && T.run)
     return xE(T, E);
@@ -590,7 +618,7 @@ function vE(T, E, R) {
 function QE(T) {
   return typeof T == "function" ? T() : T;
 }
-function RR(T, E) {
+function IR(T, E) {
   if (E) return E;
   switch (T) {
     case "belongsTo":
@@ -606,20 +634,20 @@ function RR(T, E) {
 function K(T, E) {
   return typeof T == "function" ? T(E) : T;
 }
-function uO(T, E, R) {
+function mO(T, E, R) {
   return {
     ...T,
     cubes: E,
     currentCube: R
   };
 }
-function FO(T, E) {
+function pO(T, E) {
   return {
     name: T,
     ...E
   };
 }
-class AR {
+class eR {
   constructor(E) {
     this.databaseAdapter = E;
   }
@@ -630,31 +658,31 @@ class AR {
   buildSelections(E, R, A) {
     const S = {}, I = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
-      for (const N of R.dimensions) {
-        const [e, n] = N.split("."), O = I.get(e);
+      for (const e of R.dimensions) {
+        const [N, n] = e.split("."), O = I.get(N);
         if (O && O.dimensions && O.dimensions[n]) {
-          const t = O.dimensions[n], C = K(t.sql, A);
-          S[N] = _`${C}`.as(N);
+          const s = O.dimensions[n], t = K(s.sql, A);
+          S[e] = _`${t}`.as(e);
         }
       }
     if (R.measures)
-      for (const N of R.measures) {
-        const [e, n] = N.split("."), O = I.get(e);
+      for (const e of R.measures) {
+        const [N, n] = e.split("."), O = I.get(N);
         if (O && O.measures && O.measures[n]) {
-          const t = O.measures[n], C = this.buildMeasureExpression(t, A);
-          S[N] = _`${C}`.as(N);
+          const s = O.measures[n], t = this.buildMeasureExpression(s, A);
+          S[e] = _`${t}`.as(e);
         }
       }
     if (R.timeDimensions)
-      for (const N of R.timeDimensions) {
-        const [e, n] = N.dimension.split("."), O = I.get(e);
+      for (const e of R.timeDimensions) {
+        const [N, n] = e.dimension.split("."), O = I.get(N);
         if (O && O.dimensions && O.dimensions[n]) {
-          const t = O.dimensions[n], C = this.buildTimeDimensionExpression(
-            t.sql,
-            N.granularity,
+          const s = O.dimensions[n], t = this.buildTimeDimensionExpression(
+            s.sql,
+            e.granularity,
             A
           );
-          S[N.dimension] = _`${C}`.as(N.dimension);
+          S[e.dimension] = _`${t}`.as(e.dimension);
         }
       }
     return Object.keys(S).length === 0 && (S.count = IE()), S;
@@ -664,24 +692,24 @@ class AR {
    */
   buildHavingMeasureExpression(E, R, A, S, I) {
     if (I && I.preAggregationCTEs) {
-      const N = I.preAggregationCTEs.find((e) => e.cube.name === E);
-      if (N && N.measures.includes(`${E}.${R}`)) {
-        const e = _`${_.identifier(N.cteAlias)}.${_.identifier(R)}`;
+      const e = I.preAggregationCTEs.find((N) => N.cube.name === E);
+      if (e && e.measures.includes(`${E}.${R}`)) {
+        const N = _`${_.identifier(e.cteAlias)}.${_.identifier(R)}`;
         switch (A.type) {
           case "count":
           case "countDistinct":
           case "sum":
-            return y(e);
+            return y(N);
           case "avg":
-            return this.databaseAdapter.buildAvg(e);
+            return this.databaseAdapter.buildAvg(N);
           case "min":
-            return VE(e);
+            return VE(N);
           case "max":
-            return dE(e);
+            return dE(N);
           case "number":
-            return y(e);
+            return y(N);
           default:
-            return y(e);
+            return y(N);
         }
       }
     }
@@ -705,7 +733,7 @@ class AR {
       case "count":
         return IE(A);
       case "countDistinct":
-        return wT(A);
+        return vT(A);
       case "sum":
         return y(A);
       case "avg":
@@ -725,26 +753,26 @@ class AR {
    */
   buildTimeDimensionExpression(E, R, A) {
     const S = K(E, A);
-    return R ? this.databaseAdapter.buildTimeDimension(R, S) : S instanceof xT ? S : _`${S}`;
+    return R ? this.databaseAdapter.buildTimeDimension(R, S) : S instanceof QT ? S : _`${S}`;
   }
   /**
    * Build WHERE conditions from semantic query filters (dimensions only)
    * Works for both single and multi-cube queries
    */
   buildWhereConditions(E, R, A, S) {
-    const I = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const I = [], e = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.filters && R.filters.length > 0)
-      for (const e of R.filters) {
-        const n = this.processFilter(e, N, A, "where", S);
+      for (const N of R.filters) {
+        const n = this.processFilter(N, e, A, "where", S);
         n && I.push(n);
       }
     if (R.timeDimensions)
-      for (const e of R.timeDimensions) {
-        const [n, O] = e.dimension.split("."), t = N.get(n);
-        if (t && t.dimensions[O] && e.dateRange) {
+      for (const N of R.timeDimensions) {
+        const [n, O] = N.dimension.split("."), s = e.get(n);
+        if (s && s.dimensions[O] && N.dateRange) {
           if (S != null && S.preAggregationCTEs && S.preAggregationCTEs.some((U) => U.cube.name === n))
             continue;
-          const C = t.dimensions[O], s = K(C.sql, A), i = this.buildDateRangeCondition(s, e.dateRange);
+          const t = s.dimensions[O], C = K(t.sql, A), i = this.buildDateRangeCondition(C, N.dateRange);
           i && I.push(i);
         }
       }
@@ -755,10 +783,10 @@ class AR {
    * Works for both single and multi-cube queries
    */
   buildHavingConditions(E, R, A, S) {
-    const I = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const I = [], e = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.filters && R.filters.length > 0)
-      for (const e of R.filters) {
-        const n = this.processFilter(e, N, A, "having", S);
+      for (const N of R.filters) {
+        const n = this.processFilter(N, e, A, "having", S);
         n && I.push(n);
       }
     return I;
@@ -779,21 +807,21 @@ class AR {
         return a.length > 0 ? OE(...a) : null;
       }
     }
-    const N = E, [e, n] = N.member.split("."), O = R.get(e);
+    const e = E, [N, n] = e.member.split("."), O = R.get(N);
     if (!O) return null;
-    const t = O.dimensions[n], C = O.measures[n], s = t || C;
-    if (!s) return null;
-    if (S === "where" && t) {
-      if (I != null && I.preAggregationCTEs && I.preAggregationCTEs.some((U) => U.cube.name === e))
+    const s = O.dimensions[n], t = O.measures[n], C = s || t;
+    if (!C) return null;
+    if (S === "where" && s) {
+      if (I != null && I.preAggregationCTEs && I.preAggregationCTEs.some((U) => U.cube.name === N))
         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, e.operator, e.values, C);
     } else {
-      if (S === "where" && C)
+      if (S === "where" && t)
         return null;
-      if (S === "having" && C) {
-        const i = this.buildHavingMeasureExpression(e, n, C, A, I);
-        return this.buildFilterCondition(i, N.operator, N.values, s);
+      if (S === "having" && t) {
+        const i = this.buildHavingMeasureExpression(N, n, t, A, I);
+        return this.buildFilterCondition(i, e.operator, e.values, C);
       }
     }
     return null;
@@ -804,62 +832,62 @@ class AR {
   buildFilterCondition(E, R, A, S) {
     if (!A || A.length === 0)
       return R === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const I = A.filter((e) => !(e == null || e === "" || typeof e == "string" && e.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
+    const I = A.filter((N) => !(N == null || N === "" || typeof N == "string" && N.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];
+    const e = I[0];
     switch (R) {
       case "equals":
         if (I.length > 1) {
           if ((S == null ? void 0 : S.type) === "time") {
-            const e = I.map((n) => this.normalizeDate(n) || n);
-            return NE(E, e);
+            const N = I.map((n) => this.normalizeDate(n) || n);
+            return eE(E, N);
           }
-          return NE(E, I);
+          return eE(E, I);
         } else if (I.length === 1) {
-          const e = (S == null ? void 0 : S.type) === "time" && this.normalizeDate(N) || N;
-          return EE(E, e);
+          const N = (S == null ? void 0 : S.type) === "time" && this.normalizeDate(e) || e;
+          return EE(E, N);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return I.length > 1 ? gE(E, I) : I.length === 1 ? yE(E, N) : null;
+        return I.length > 1 ? gE(E, I) : I.length === 1 ? yE(E, e) : null;
       case "contains":
-        return this.databaseAdapter.buildStringCondition(E, "contains", N);
+        return this.databaseAdapter.buildStringCondition(E, "contains", e);
       case "notContains":
-        return this.databaseAdapter.buildStringCondition(E, "notContains", N);
+        return this.databaseAdapter.buildStringCondition(E, "notContains", e);
       case "startsWith":
-        return this.databaseAdapter.buildStringCondition(E, "startsWith", N);
+        return this.databaseAdapter.buildStringCondition(E, "startsWith", e);
       case "endsWith":
-        return this.databaseAdapter.buildStringCondition(E, "endsWith", N);
+        return this.databaseAdapter.buildStringCondition(E, "endsWith", e);
       case "gt":
-        return CE(E, N);
+        return tE(E, e);
       case "gte":
-        return J(E, N);
+        return J(E, e);
       case "lt":
-        return eE(E, N);
+        return NE(E, e);
       case "lte":
-        return w(E, N);
+        return w(E, e);
       case "set":
         return KE(E);
       case "notSet":
         return $E(E);
       case "inDateRange":
         if (I.length >= 2) {
-          const e = this.normalizeDate(I[0]), n = this.normalizeDate(I[1]);
-          if (e && n)
+          const N = this.normalizeDate(I[0]), n = this.normalizeDate(I[1]);
+          if (N && n)
             return d(
-              J(E, e),
+              J(E, N),
               w(E, n)
             );
         }
         return null;
       case "beforeDate": {
-        const e = this.normalizeDate(N);
-        return e ? eE(E, e) : null;
+        const N = this.normalizeDate(e);
+        return N ? NE(E, N) : null;
       }
       case "afterDate": {
-        const e = this.normalizeDate(N);
-        return e ? CE(E, e) : null;
+        const N = this.normalizeDate(e);
+        return N ? tE(E, N) : null;
       }
       case "between":
         return I.length >= 2 ? d(
@@ -868,23 +896,23 @@ class AR {
         ) : null;
       case "notBetween":
         return I.length >= 2 ? OE(
-          eE(E, I[0]),
-          CE(E, I[1])
+          NE(E, I[0]),
+          tE(E, I[1])
         ) : null;
       case "in":
-        return I.length > 0 ? NE(E, I) : null;
+        return I.length > 0 ? eE(E, I) : null;
       case "notIn":
         return I.length > 0 ? gE(E, I) : null;
       case "like":
-        return this.databaseAdapter.buildStringCondition(E, "like", N);
+        return this.databaseAdapter.buildStringCondition(E, "like", e);
       case "notLike":
-        return this.databaseAdapter.buildStringCondition(E, "notLike", N);
+        return this.databaseAdapter.buildStringCondition(E, "notLike", e);
       case "ilike":
-        return this.databaseAdapter.buildStringCondition(E, "ilike", N);
+        return this.databaseAdapter.buildStringCondition(E, "ilike", e);
       case "regex":
-        return this.databaseAdapter.buildStringCondition(E, "regex", N);
+        return this.databaseAdapter.buildStringCondition(E, "regex", e);
       case "notRegex":
-        return this.databaseAdapter.buildStringCondition(E, "notRegex", N);
+        return this.databaseAdapter.buildStringCondition(E, "notRegex", e);
       case "isEmpty":
         return OE(
           $E(E),
@@ -922,10 +950,10 @@ class AR {
       if (!S) return null;
       const I = new Date(S);
       I.setUTCHours(0, 0, 0, 0);
-      const N = new Date(S);
-      return N.setUTCHours(23, 59, 59, 999), d(
+      const e = new Date(S);
+      return e.setUTCHours(23, 59, 59, 999), d(
         J(E, I),
-        w(E, N)
+        w(E, e)
       );
     }
     return null;
@@ -935,75 +963,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(), e = R.getUTCDay();
+    const R = /* @__PURE__ */ new Date(), A = E.toLowerCase().trim(), S = R.getUTCFullYear(), I = R.getUTCMonth(), e = R.getUTCDate(), N = R.getUTCDay();
     if (A === "today") {
+      const t = new Date(R);
+      t.setUTCHours(0, 0, 0, 0);
       const C = new Date(R);
-      C.setUTCHours(0, 0, 0, 0);
-      const s = new Date(R);
-      return s.setUTCHours(23, 59, 59, 999), { start: C, end: s };
+      return C.setUTCHours(23, 59, 59, 999), { start: t, end: C };
     }
     if (A === "yesterday") {
+      const t = new Date(R);
+      t.setUTCDate(e - 1), t.setUTCHours(0, 0, 0, 0);
       const C = new Date(R);
-      C.setUTCDate(N - 1), C.setUTCHours(0, 0, 0, 0);
-      const s = new Date(R);
-      return s.setUTCDate(N - 1), s.setUTCHours(23, 59, 59, 999), { start: C, end: s };
+      return C.setUTCDate(e - 1), C.setUTCHours(23, 59, 59, 999), { start: t, end: C };
     }
     if (A === "this week") {
-      const C = e === 0 ? -6 : 1 - e, s = new Date(R);
-      s.setUTCDate(N + C), 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 t = N === 0 ? -6 : 1 - N, C = new Date(R);
+      C.setUTCDate(e + t), C.setUTCHours(0, 0, 0, 0);
+      const i = new Date(C);
+      return i.setUTCDate(C.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: C, end: i };
     }
     if (A === "this month") {
-      const C = 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: C, end: s };
+      const t = new Date(Date.UTC(S, I, 1, 0, 0, 0, 0)), C = new Date(Date.UTC(S, I + 1, 0, 23, 59, 59, 999));
+      return { start: t, end: C };
     }
     if (A === "this quarter") {
-      const C = Math.floor(I / 3), s = 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: s, end: i };
+      const t = Math.floor(I / 3), C = new Date(Date.UTC(S, t * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(S, t * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: C, end: i };
     }
     if (A === "this year") {
-      const C = 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: C, end: s };
+      const t = new Date(Date.UTC(S, 0, 1, 0, 0, 0, 0)), C = new Date(Date.UTC(S, 11, 31, 23, 59, 59, 999));
+      return { start: t, end: C };
     }
     const n = A.match(/^last\s+(\d+)\s+days?$/);
     if (n) {
-      const C = parseInt(n[1], 10), s = new Date(R);
-      s.setUTCDate(N - C + 1), s.setUTCHours(0, 0, 0, 0);
+      const t = parseInt(n[1], 10), C = new Date(R);
+      C.setUTCDate(e - t + 1), C.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: C, end: i };
     }
     if (A === "last week") {
-      const C = e === 0 ? -13 : -6 - e, s = new Date(R);
-      s.setUTCDate(N + C), 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 t = N === 0 ? -13 : -6 - N, C = new Date(R);
+      C.setUTCDate(e + t), C.setUTCHours(0, 0, 0, 0);
+      const i = new Date(C);
+      return i.setUTCDate(C.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: C, end: i };
     }
     if (A === "last month") {
-      const C = 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: C, end: s };
+      const t = new Date(Date.UTC(S, I - 1, 1, 0, 0, 0, 0)), C = new Date(Date.UTC(S, I, 0, 23, 59, 59, 999));
+      return { start: t, end: C };
     }
     if (A === "last quarter") {
-      const C = Math.floor(I / 3), s = C === 0 ? 3 : C - 1, i = C === 0 ? S - 1 : S, a = new Date(Date.UTC(i, s * 3, 1, 0, 0, 0, 0)), U = new Date(Date.UTC(i, s * 3 + 3, 0, 23, 59, 59, 999));
+      const t = Math.floor(I / 3), C = t === 0 ? 3 : t - 1, i = t === 0 ? S - 1 : S, a = new Date(Date.UTC(i, C * 3, 1, 0, 0, 0, 0)), U = new Date(Date.UTC(i, C * 3 + 3, 0, 23, 59, 59, 999));
       return { start: a, end: U };
     }
     if (A === "last year") {
-      const C = 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: C, end: s };
+      const t = new Date(Date.UTC(S - 1, 0, 1, 0, 0, 0, 0)), C = new Date(Date.UTC(S - 1, 11, 31, 23, 59, 59, 999));
+      return { start: t, end: C };
     }
     if (A === "last 12 months") {
-      const C = new Date(Date.UTC(S, I - 11, 1, 0, 0, 0, 0)), s = new Date(R);
-      return s.setUTCHours(23, 59, 59, 999), { start: C, end: s };
+      const t = new Date(Date.UTC(S, I - 11, 1, 0, 0, 0, 0)), C = new Date(R);
+      return C.setUTCHours(23, 59, 59, 999), { start: t, end: C };
     }
     const O = A.match(/^last\s+(\d+)\s+months?$/);
     if (O) {
-      const C = parseInt(O[1], 10), s = 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: s, end: i };
+      const t = parseInt(O[1], 10), C = new Date(Date.UTC(S, I - t + 1, 1, 0, 0, 0, 0)), i = new Date(R);
+      return i.setUTCHours(23, 59, 59, 999), { start: C, end: i };
     }
-    const t = A.match(/^last\s+(\d+)\s+years?$/);
-    if (t) {
-      const C = parseInt(t[1], 10), s = new Date(Date.UTC(S - C, 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 t = parseInt(s[1], 10), C = new Date(Date.UTC(S - t, 0, 1, 0, 0, 0, 0)), i = new Date(R);
+      return i.setUTCHours(23, 59, 59, 999), { start: C, end: i };
     }
     return null;
   }
@@ -1036,45 +1064,45 @@ class AR {
     const I = [];
     if (!(R.measures && R.measures.length > 0))
       return [];
-    const e = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
-      for (const t of R.dimensions) {
-        const [C, s] = t.split("."), i = e.get(C);
-        if (i && i.dimensions && i.dimensions[s])
-          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 === s);
+      for (const s of R.dimensions) {
+        const [t, C] = s.split("."), i = N.get(t);
+        if (i && i.dimensions && i.dimensions[C])
+          if ((n = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : n.some((U) => U.cube.name === t)) {
+            const U = S.preAggregationCTEs.find((G) => G.cube.name === t), o = U.joinKeys.find((G) => G.targetColumn === C);
             if (o && o.sourceColumnObj)
               I.push(o.sourceColumnObj);
             else {
-              const G = _`${_.identifier(U.cteAlias)}.${_.identifier(s)}`;
+              const G = _`${_.identifier(U.cteAlias)}.${_.identifier(C)}`;
               I.push(G);
             }
           } else {
-            const U = i.dimensions[s], o = K(U.sql, A);
+            const U = i.dimensions[C], o = K(U.sql, A);
             I.push(o);
           }
       }
     if (R.timeDimensions)
-      for (const t of R.timeDimensions) {
-        const [C, s] = t.dimension.split("."), i = e.get(C);
-        if (i && i.dimensions && i.dimensions[s])
-          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 === s);
+      for (const s of R.timeDimensions) {
+        const [t, C] = s.dimension.split("."), i = N.get(t);
+        if (i && i.dimensions && i.dimensions[C])
+          if ((O = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : O.some((U) => U.cube.name === t)) {
+            const U = S.preAggregationCTEs.find((G) => G.cube.name === t), o = U.joinKeys.find((G) => G.targetColumn === C);
             if (o && o.sourceColumnObj) {
               const G = this.buildTimeDimensionExpression(
                 o.sourceColumnObj,
-                t.granularity,
+                s.granularity,
                 A
               );
               I.push(G);
             } else {
-              const G = _`${_.identifier(U.cteAlias)}.${_.identifier(s)}`;
+              const G = _`${_.identifier(U.cteAlias)}.${_.identifier(C)}`;
               I.push(G);
             }
           } else {
-            const U = i.dimensions[s], o = this.buildTimeDimensionExpression(
+            const U = i.dimensions[C], o = this.buildTimeDimensionExpression(
               U.sql,
-              t.granularity,
+              s.granularity,
               A
             );
             I.push(o);
@@ -1090,21 +1118,21 @@ class AR {
     const A = [], S = R || [
       ...E.measures || [],
       ...E.dimensions || [],
-      ...((I = E.timeDimensions) == null ? void 0 : I.map((N) => N.dimension)) || []
+      ...((I = E.timeDimensions) == null ? void 0 : I.map((e) => e.dimension)) || []
     ];
     if (E.order && Object.keys(E.order).length > 0)
-      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 n = e === "desc" ? vT(_.identifier(N)) : JE(_.identifier(N));
+      for (const [e, N] of Object.entries(E.order)) {
+        if (!S.includes(e))
+          throw new Error(`Cannot order by '${e}': field is not selected in the query`);
+        const n = N === "desc" ? ZT(_.identifier(e)) : JE(_.identifier(e));
         A.push(n);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
-      const N = new Set(Object.keys(E.order || {})), e = [...E.timeDimensions].sort(
+      const e = new Set(Object.keys(E.order || {})), N = [...E.timeDimensions].sort(
         (n, O) => n.dimension.localeCompare(O.dimension)
       );
-      for (const n of e)
-        N.has(n.dimension) || A.push(JE(_.identifier(n.dimension)));
+      for (const n of N)
+        e.has(n.dimension) || A.push(JE(_.identifier(n.dimension)));
     }
     return A;
   }
@@ -1116,9 +1144,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, e] = I.split("."), n = S.get(N);
+        const [e, N] = I.split("."), n = S.get(e);
         if (n) {
-          const O = n.dimensions[e];
+          const O = n.dimensions[N];
           O && O.type === "number" && A.push(I);
         }
       }
@@ -1145,7 +1173,7 @@ class AR {
     return S;
   }
 }
-class SR {
+class NR {
   /**
    * Analyze a semantic query to determine which cubes are involved
    */
@@ -1219,12 +1247,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), e = E.get(N);
-    if (!e)
-      throw new Error(`Primary cube '${N}' not found`);
+    const e = this.choosePrimaryCube(I, R, E), N = E.get(e);
+    if (!N)
+      throw new Error(`Primary cube '${e}' not found`);
     if (I.length === 1)
       return {
-        primaryCube: e,
+        primaryCube: N,
         joinCubes: [],
         // Empty for single cube
         selections: {},
@@ -1234,9 +1262,9 @@ class SR {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const n = this.buildJoinPlan(E, e, I), O = this.planPreAggregationCTEs(E, e, n, R);
+    const n = this.buildJoinPlan(E, N, I), O = this.planPreAggregationCTEs(E, N, n, R);
     return {
-      primaryCube: e,
+      primaryCube: N,
       joinCubes: n,
       selections: {},
       // Will be built by QueryBuilder
@@ -1253,12 +1281,12 @@ class SR {
    */
   choosePrimaryCube(E, R, A) {
     if (R.dimensions && R.dimensions.length > 0 && A) {
-      const S = R.dimensions.map((N) => N.split(".")[0]), I = /* @__PURE__ */ new Map();
-      for (const N of S)
-        I.set(N, (I.get(N) || 0) + 1);
+      const S = R.dimensions.map((e) => e.split(".")[0]), I = /* @__PURE__ */ new Map();
+      for (const e of S)
+        I.set(e, (I.get(e) || 0) + 1);
       if (I.size > 0) {
-        const N = Math.max(...I.values()), e = [...I.entries()].filter(([, n]) => n === N).map(([n]) => n).sort();
-        for (const n of e)
+        const e = Math.max(...I.values()), N = [...I.entries()].filter(([, n]) => n === e).map(([n]) => n).sort();
+        for (const n of N)
           if (this.canReachAllCubes(n, E, A))
             return n;
       }
@@ -1267,12 +1295,12 @@ class SR {
       const S = /* @__PURE__ */ new Map();
       for (const I of E)
         if (this.canReachAllCubes(I, E, A)) {
-          const N = A.get(I), e = N != null && N.joins ? Object.keys(N.joins).length : 0;
-          S.set(I, e);
+          const e = A.get(I), N = e != null && e.joins ? Object.keys(e.joins).length : 0;
+          S.set(I, N);
         }
       if (S.size > 0) {
         const I = Math.max(...S.values());
-        return [...S.entries()].filter(([, e]) => e === I).map(([e]) => e).sort()[0];
+        return [...S.entries()].filter(([, N]) => N === I).map(([N]) => N).sort()[0];
       }
     }
     return [...E].sort()[0];
@@ -1283,8 +1311,8 @@ class SR {
   canReachAllCubes(E, R, A) {
     const S = R.filter((I) => I !== E);
     for (const I of S) {
-      const N = this.findJoinPath(A, E, I, /* @__PURE__ */ new Set());
-      if (!N || N.length === 0)
+      const e = this.findJoinPath(A, E, I, /* @__PURE__ */ new Set());
+      if (!e || e.length === 0)
         return !1;
     }
     return !0;
@@ -1294,31 +1322,31 @@ class SR {
    * Supports both direct joins and transitive joins through intermediate cubes
    */
   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))
+    const S = [], I = /* @__PURE__ */ new Set([R.name]), e = A.filter((N) => N !== R.name);
+    for (const N of e) {
+      if (I.has(N))
         continue;
-      const n = this.findJoinPath(E, R.name, e, I);
+      const n = this.findJoinPath(E, R.name, N, I);
       if (!n || n.length === 0)
-        throw new Error(`No join path found from '${R.name}' to '${e}'`);
-      for (const { toCube: O, joinDef: t } of n) {
+        throw new Error(`No join path found from '${R.name}' to '${N}'`);
+      for (const { toCube: O, joinDef: s } of n) {
         if (I.has(O))
           continue;
-        const C = E.get(O);
-        if (!C)
+        const t = E.get(O);
+        if (!t)
           throw new Error(`Cube '${O}' not found`);
-        const s = this.buildJoinCondition(
-          t,
+        const C = this.buildJoinCondition(
+          s,
           null,
           // No source alias needed - use the actual column
           null
           // No target alias needed - use the actual column 
-        ), i = RR(t.relationship, t.sqlJoinType);
+        ), i = IR(s.relationship, s.sqlJoinType);
         S.push({
-          cube: C,
+          cube: t,
           alias: `${O.toLowerCase()}_cube`,
           joinType: i,
-          joinCondition: s
+          joinCondition: C
         }), I.add(O);
       }
     }
@@ -1330,8 +1358,8 @@ class SR {
   buildJoinCondition(E, R, A) {
     const S = [];
     for (const I of E.on) {
-      const N = R ? _`${_.identifier(R)}.${_.identifier(I.source.name)}` : I.source, e = A ? _`${_.identifier(A)}.${_.identifier(I.target.name)}` : I.target, n = I.as || EE;
-      S.push(n(N, e));
+      const e = R ? _`${_.identifier(R)}.${_.identifier(I.source.name)}` : I.source, N = A ? _`${_.identifier(A)}.${_.identifier(I.target.name)}` : I.target, n = I.as || EE;
+      S.push(n(e, N));
     }
     return d(...S);
   }
@@ -1344,22 +1372,22 @@ class SR {
       return [];
     const I = [
       { cube: R, path: [] }
-    ], N = /* @__PURE__ */ new Set([R, ...S]);
+    ], e = /* @__PURE__ */ new Set([R, ...S]);
     for (; I.length > 0; ) {
-      const { cube: e, path: n } = I.shift(), O = E.get(e);
+      const { cube: N, path: n } = I.shift(), O = E.get(N);
       if (O != null && O.joins)
-        for (const [, t] of Object.entries(O.joins)) {
-          const s = QE(t.targetCube).name;
-          if (N.has(s))
+        for (const [, s] of Object.entries(O.joins)) {
+          const C = QE(s.targetCube).name;
+          if (e.has(C))
             continue;
           const i = [...n, {
-            fromCube: e,
-            toCube: s,
-            joinDef: t
+            fromCube: N,
+            toCube: C,
+            joinDef: s
           }];
-          if (s === A)
+          if (C === A)
             return i;
-          N.add(s), I.push({ cube: s, path: i });
+          e.add(C), I.push({ cube: C, path: i });
         }
     }
     return null;
@@ -1371,27 +1399,27 @@ class SR {
     const I = [];
     if (!S.measures || S.measures.length === 0)
       return I;
-    for (const N of A) {
-      const e = this.findHasManyJoinDef(R, N.cube.name);
-      if (!e)
+    for (const e of A) {
+      const N = this.findHasManyJoinDef(R, e.cube.name);
+      if (!N)
         continue;
       const n = S.measures ? S.measures.filter(
-        (s) => s.startsWith(N.cube.name + ".")
-      ) : [], O = this.extractMeasuresFromFilters(S, N.cube.name), t = [.../* @__PURE__ */ new Set([...n, ...O])];
-      if (t.length === 0)
+        (C) => C.startsWith(e.cube.name + ".")
+      ) : [], O = this.extractMeasuresFromFilters(S, e.cube.name), s = [.../* @__PURE__ */ new Set([...n, ...O])];
+      if (s.length === 0)
         continue;
-      const C = e.on.map((s) => ({
-        sourceColumn: s.source.name,
-        targetColumn: s.target.name,
-        sourceColumnObj: s.source,
-        targetColumnObj: s.target
+      const t = N.on.map((C) => ({
+        sourceColumn: C.source.name,
+        targetColumn: C.target.name,
+        sourceColumnObj: C.source,
+        targetColumnObj: C.target
       }));
       I.push({
-        cube: N.cube,
-        alias: N.alias,
-        cteAlias: `${N.cube.name.toLowerCase()}_agg`,
-        joinKeys: C,
-        measures: t
+        cube: e.cube,
+        alias: e.alias,
+        cteAlias: `${e.cube.name.toLowerCase()}_agg`,
+        joinKeys: t,
+        measures: s
       });
     }
     return I;
@@ -1408,29 +1436,29 @@ class SR {
     return null;
   }
 }
-class tE {
+class sE {
   constructor(E) {
     W(this, "queryBuilder");
     W(this, "queryPlanner");
     W(this, "databaseAdapter");
     if (this.dbExecutor = E, this.databaseAdapter = E.databaseAdapter, !this.databaseAdapter)
       throw new Error("DatabaseExecutor must have a databaseAdapter property");
-    this.queryBuilder = new AR(this.databaseAdapter), this.queryPlanner = new SR();
+    this.queryBuilder = new eR(this.databaseAdapter), this.queryPlanner = new NR();
   }
   /**
    * Unified query execution method that handles both single and multi-cube queries
    */
   async execute(E, R, A) {
     try {
-      const S = KT(E, R);
+      const S = $T(E, R);
       if (!S.isValid)
         throw new Error(`Query validation failed: ${S.errors.join(", ")}`);
       const I = {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: A
-      }, 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), t = Array.isArray(O) ? O.map((s) => {
-        const i = { ...s };
+      }, e = this.queryPlanner.createQueryPlan(E, R, I), N = this.buildUnifiedQuery(e, R, I), n = this.queryBuilder.collectNumericFields(E, R), O = await this.dbExecutor.execute(N, n), s = Array.isArray(O) ? O.map((C) => {
+        const i = { ...C };
         if (R.timeDimensions) {
           for (const a of R.timeDimensions)
             if (a.dimension in i) {
@@ -1443,10 +1471,10 @@ class tE {
             }
         }
         return i;
-      }) : [O], C = this.generateAnnotations(N, R);
+      }) : [O], t = this.generateAnnotations(e, R);
       return {
-        data: t,
-        annotation: C
+        data: s,
+        annotation: t
       };
     } catch (S) {
       throw new Error(`Query execution failed: ${S instanceof Error ? S.message : "Unknown error"}`);
@@ -1464,18 +1492,18 @@ class tE {
    */
   buildPreAggregationCTE(E, R, A, S) {
     var U;
-    const I = E.cube, N = I.sql(A), e = {};
+    const I = E.cube, e = I.sql(A), N = {};
     for (const o of E.joinKeys)
       if (o.targetColumnObj) {
-        e[o.targetColumn] = o.targetColumnObj;
+        N[o.targetColumn] = o.targetColumnObj;
         for (const [G, P] of Object.entries(I.dimensions || {}))
-          P.sql === o.targetColumnObj && G !== o.targetColumn && (e[G] = _`${o.targetColumnObj}`.as(G));
+          P.sql === o.targetColumnObj && G !== o.targetColumn && (N[G] = _`${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);
-        e[G] = _`${H}`.as(G);
+        N[G] = _`${H}`.as(G);
       }
     }
     const n = I.name;
@@ -1484,7 +1512,7 @@ class tE {
         const [G, P] = o.split(".");
         if (G === n && I.dimensions && I.dimensions[P]) {
           const H = I.dimensions[P], l = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A);
-          e[P] = _`${l}`.as(P);
+          N[P] = _`${l}`.as(P);
         }
       }
     if (R.timeDimensions)
@@ -1492,22 +1520,22 @@ class tE {
         const [G, P] = o.dimension.split(".");
         if (G === n && I.dimensions && I.dimensions[P]) {
           const H = I.dimensions[P], l = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
-          e[P] = _`${l}`.as(P);
+          N[P] = _`${l}`.as(P);
         }
       }
-    if (Object.keys(e).length === 0)
+    if (Object.keys(N).length === 0)
       return null;
-    let O = A.db.select(e).from(N.from);
-    const t = S ? {
+    let O = A.db.select(N).from(e.from);
+    const s = S ? {
       ...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, t), s = [];
+    } : void 0, t = this.queryBuilder.buildWhereConditions(I, R, A, s), C = [];
     if (R.timeDimensions)
       for (const o of R.timeDimensions) {
         const [G, P] = o.dimension.split(".");
         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 && C.push(B);
         }
       }
     if (R.filters) {
@@ -1518,13 +1546,13 @@ class tE {
             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 && C.push(u);
             }
           }
         }
     }
     const i = [];
-    if (N.where && i.push(N.where), i.push(...C, ...s), i.length > 0) {
+    if (e.where && i.push(e.where), i.push(...t, ...C), i.length > 0) {
       const o = i.length === 1 ? i[0] : d(...i);
       O = O.where(o);
     }
@@ -1554,13 +1582,13 @@ class tE {
    * Build join condition for CTE
    */
   buildCTEJoinCondition(E, R, A) {
-    var N;
-    const S = (N = A.preAggregationCTEs) == null ? void 0 : N.find((e) => e.cube.name === E.cube.name);
+    var e;
+    const S = (e = A.preAggregationCTEs) == null ? void 0 : e.find((N) => N.cube.name === E.cube.name);
     if (!S)
       throw new Error(`CTE info not found for cube ${E.cube.name}`);
     const I = [];
-    for (const e of S.joinKeys) {
-      const n = e.sourceColumnObj || _.identifier(e.sourceColumn), O = _`${_.identifier(R)}.${_.identifier(e.targetColumn)}`;
+    for (const N of S.joinKeys) {
+      const n = N.sourceColumnObj || _.identifier(N.sourceColumn), O = _`${_.identifier(R)}.${_.identifier(N.targetColumn)}`;
       I.push(EE(n, O));
     }
     return I.length === 1 ? I[0] : d(...I);
@@ -1576,7 +1604,7 @@ class tE {
         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), n = { ...this.queryBuilder.buildSelections(
+    const e = E.primaryCube.sql(A), n = { ...this.queryBuilder.buildSelections(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -1623,16 +1651,16 @@ class tE {
               let AE = P.joinKeys.find((SE) => SE.targetColumn === u);
               if (!AE && ((o = p == null ? void 0 : p.dimensions) != null && o[u])) {
                 const SE = p.dimensions[u].sql;
-                AE = P.joinKeys.find(($T) => $T.targetColumnObj === SE);
+                AE = P.joinKeys.find((JT) => JT.targetColumnObj === SE);
               }
               AE ? n[l] = _`${_.identifier(P.cteAlias)}.${_.identifier(u)}`.as(l) : h && ((G = p == null ? void 0 : p.dimensions) != null && G[u]) && (n[l] = _`${_.identifier(P.cteAlias)}.${_.identifier(u)}`.as(l));
             }
           }
         }
       }
-    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)
+    let O = A.db.select(n).from(e.from);
+    if (S.length > 0 && (O = A.db.with(...S).select(n).from(e.from)), e.joins)
+      for (const P of e.joins)
         switch (P.type || "left") {
           case "left":
             O = O.leftJoin(P.table, P.on);
@@ -1670,15 +1698,15 @@ class tE {
         } catch {
         }
       }
-    const t = [];
-    if (N.where && t.push(N.where), E.joinCubes && E.joinCubes.length > 0)
+    const s = [];
+    if (e.where && s.push(e.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 C = this.queryBuilder.buildWhereConditions(
+    const t = this.queryBuilder.buildWhereConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -1686,11 +1714,11 @@ class tE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (C.length > 0 && t.push(...C), t.length > 0) {
-      const P = t.length === 1 ? t[0] : d(...t);
+    if (t.length > 0 && s.push(...t), s.length > 0) {
+      const P = s.length === 1 ? s[0] : d(...s);
       O = O.where(P);
     }
-    const s = this.queryBuilder.buildGroupByFields(
+    const C = this.queryBuilder.buildGroupByFields(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -1698,7 +1726,7 @@ class tE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    s.length > 0 && (O = O.groupBy(...s));
+    C.length > 0 && (O = O.groupBy(...C));
     const i = this.queryBuilder.buildHavingConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
@@ -1745,51 +1773,51 @@ class tE {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: A
-    }, I = this.queryPlanner.createQueryPlan(E, R, S), e = this.buildUnifiedQuery(I, R, S).toSQL();
+    }, I = this.queryPlanner.createQueryPlan(E, R, S), N = this.buildUnifiedQuery(I, R, S).toSQL();
     return {
-      sql: e.sql,
-      params: e.params
+      sql: N.sql,
+      params: N.params
     };
   }
   /**
    * Generate annotations for UI metadata - unified approach
    */
   generateAnnotations(E, R) {
-    const A = {}, S = {}, I = {}, N = [E.primaryCube];
-    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("."), t = N.find((C) => C.name === n);
-        if (t && t.measures[O]) {
-          const C = t.measures[O];
-          A[e] = {
-            title: C.title || O,
-            shortTitle: C.title || O,
-            type: C.type
+    const A = {}, S = {}, I = {}, e = [E.primaryCube];
+    if (E.joinCubes && E.joinCubes.length > 0 && e.push(...E.joinCubes.map((N) => N.cube)), R.measures)
+      for (const N of R.measures) {
+        const [n, O] = N.split("."), s = e.find((t) => t.name === n);
+        if (s && s.measures[O]) {
+          const t = s.measures[O];
+          A[N] = {
+            title: t.title || O,
+            shortTitle: t.title || O,
+            type: t.type
           };
         }
       }
     if (R.dimensions)
-      for (const e of R.dimensions) {
-        const [n, O] = e.split("."), t = N.find((C) => C.name === n);
-        if (t && t.dimensions[O]) {
-          const C = t.dimensions[O];
-          S[e] = {
-            title: C.title || O,
-            shortTitle: C.title || O,
-            type: C.type
+      for (const N of R.dimensions) {
+        const [n, O] = N.split("."), s = e.find((t) => t.name === n);
+        if (s && s.dimensions[O]) {
+          const t = s.dimensions[O];
+          S[N] = {
+            title: t.title || O,
+            shortTitle: t.title || O,
+            type: t.type
           };
         }
       }
     if (R.timeDimensions)
-      for (const e of R.timeDimensions) {
-        const [n, O] = e.dimension.split("."), t = N.find((C) => C.name === n);
-        if (t && t.dimensions && t.dimensions[O]) {
-          const C = t.dimensions[O];
-          I[e.dimension] = {
-            title: C.title || O,
-            shortTitle: C.title || O,
-            type: C.type,
-            granularity: e.granularity
+      for (const N of R.timeDimensions) {
+        const [n, O] = N.dimension.split("."), s = e.find((t) => t.name === n);
+        if (s && s.dimensions && s.dimensions[O]) {
+          const t = s.dimensions[O];
+          I[N.dimension] = {
+            title: t.title || O,
+            shortTitle: t.title || O,
+            type: t.type,
+            granularity: N.granularity
           };
         }
       }
@@ -1801,13 +1829,13 @@ class tE {
     };
   }
 }
-const L = (T) => T.flatMap(IR), IR = (T) => q(eR(T)).map(NR), NR = (T) => T.replace(/ +/g, " ").trim(), eR = (T) => ({
+const L = (T) => T.flatMap(tR), tR = (T) => q(CR(T)).map(sR), sR = (T) => T.replace(/ +/g, " ").trim(), CR = (T) => ({
   type: "mandatory_block",
   items: XE(T, 0)[0]
 }), XE = (T, E, R) => {
   const A = [];
   for (; T[E]; ) {
-    const [S, I] = CR(T, E);
+    const [S, I] = LR(T, E);
     if (A.push(S), E = I, T[E] === "|")
       E++;
     else if (T[E] === "}" || T[E] === "]") {
@@ -1822,44 +1850,44 @@ const L = (T) => T.flatMap(IR), IR = (T) => q(eR(T)).map(NR), NR = (T) => T.repl
       throw new Error(`Unexpected "${T[E]}"`);
   }
   return [A, E];
-}, CR = (T, E) => {
+}, LR = (T, E) => {
   const R = [];
   for (; ; ) {
-    const [A, S] = tR(T, E);
+    const [A, S] = _R(T, E);
     if (A)
       R.push(A), E = S;
     else
       break;
   }
   return R.length === 1 ? [R[0], E] : [{ type: "concatenation", items: R }, E];
-}, tR = (T, E) => {
+}, _R = (T, E) => {
   if (T[E] === "{")
-    return sR(T, E + 1);
+    return rR(T, E + 1);
   if (T[E] === "[")
-    return LR(T, E + 1);
+    return nR(T, E + 1);
   {
     let R = "";
     for (; T[E] && /[A-Za-z0-9_ ]/.test(T[E]); )
       R += T[E], E++;
     return [R, E];
   }
-}, sR = (T, E) => {
+}, rR = (T, E) => {
   const [R, A] = XE(T, E, "}");
   return [{ type: "mandatory_block", items: R }, A];
-}, LR = (T, E) => {
+}, nR = (T, E) => {
   const [R, A] = XE(T, E, "]");
   return [{ type: "optional_block", items: R }, A];
 }, q = (T) => {
   if (typeof T == "string")
     return [T];
   if (T.type === "concatenation")
-    return T.items.map(q).reduce(_R, [""]);
+    return T.items.map(q).reduce(DR, [""]);
   if (T.type === "mandatory_block")
     return T.items.flatMap(q);
   if (T.type === "optional_block")
     return ["", ...T.items.flatMap(q)];
   throw new Error(`Unknown node type: ${T}`);
-}, _R = (T, E) => {
+}, DR = (T, E) => {
   const R = [];
   for (const A of T)
     for (const S of E)
@@ -1870,19 +1898,19 @@ var D;
 (function(T) {
   T.QUOTED_IDENTIFIER = "QUOTED_IDENTIFIER", T.IDENTIFIER = "IDENTIFIER", T.STRING = "STRING", T.VARIABLE = "VARIABLE", T.RESERVED_DATA_TYPE = "RESERVED_DATA_TYPE", T.RESERVED_PARAMETERIZED_DATA_TYPE = "RESERVED_PARAMETERIZED_DATA_TYPE", T.RESERVED_KEYWORD = "RESERVED_KEYWORD", T.RESERVED_FUNCTION_NAME = "RESERVED_FUNCTION_NAME", T.RESERVED_PHRASE = "RESERVED_PHRASE", T.RESERVED_SET_OPERATION = "RESERVED_SET_OPERATION", T.RESERVED_CLAUSE = "RESERVED_CLAUSE", T.RESERVED_SELECT = "RESERVED_SELECT", T.RESERVED_JOIN = "RESERVED_JOIN", T.ARRAY_IDENTIFIER = "ARRAY_IDENTIFIER", T.ARRAY_KEYWORD = "ARRAY_KEYWORD", T.CASE = "CASE", T.END = "END", T.WHEN = "WHEN", T.ELSE = "ELSE", T.THEN = "THEN", T.LIMIT = "LIMIT", T.BETWEEN = "BETWEEN", T.AND = "AND", T.OR = "OR", T.XOR = "XOR", T.OPERATOR = "OPERATOR", T.COMMA = "COMMA", T.ASTERISK = "ASTERISK", T.PROPERTY_ACCESS_OPERATOR = "PROPERTY_ACCESS_OPERATOR", T.OPEN_PAREN = "OPEN_PAREN", T.CLOSE_PAREN = "CLOSE_PAREN", T.LINE_COMMENT = "LINE_COMMENT", T.BLOCK_COMMENT = "BLOCK_COMMENT", T.DISABLE_COMMENT = "DISABLE_COMMENT", T.NUMBER = "NUMBER", T.NAMED_PARAMETER = "NAMED_PARAMETER", T.QUOTED_PARAMETER = "QUOTED_PARAMETER", T.NUMBERED_PARAMETER = "NUMBERED_PARAMETER", T.POSITIONAL_PARAMETER = "POSITIONAL_PARAMETER", T.CUSTOM_PARAMETER = "CUSTOM_PARAMETER", T.DELIMITER = "DELIMITER", T.EOF = "EOF";
 })(D = D || (D = {}));
-const HT = (T) => ({
+const uT = (T) => ({
   type: D.EOF,
   raw: "«EOF»",
   text: "«EOF»",
   start: T
-}), Q = HT(1 / 0), x = (T) => (E) => E.type === T.type && E.text === T.text, $ = {
+}), Q = uT(1 / 0), x = (T) => (E) => E.type === T.type && E.text === T.text, $ = {
   ARRAY: x({ text: "ARRAY", type: D.RESERVED_DATA_TYPE }),
   BY: x({ text: "BY", type: D.RESERVED_KEYWORD }),
   SET: x({ text: "SET", type: D.RESERVED_CLAUSE }),
   STRUCT: x({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
   WINDOW: x({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
   VALUES: x({ text: "VALUES", type: D.RESERVED_CLAUSE })
-}, BT = (T) => T === D.RESERVED_DATA_TYPE || T === D.RESERVED_KEYWORD || T === D.RESERVED_FUNCTION_NAME || T === D.RESERVED_PHRASE || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.ARRAY_KEYWORD || T === D.CASE || T === D.END || T === D.WHEN || T === D.ELSE || T === D.THEN || T === D.LIMIT || T === D.BETWEEN || T === D.AND || T === D.OR || T === D.XOR, rR = (T) => T === D.AND || T === D.OR || T === D.XOR, nR = [
+}, FT = (T) => T === D.RESERVED_DATA_TYPE || T === D.RESERVED_KEYWORD || T === D.RESERVED_FUNCTION_NAME || T === D.RESERVED_PHRASE || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.ARRAY_KEYWORD || T === D.CASE || T === D.END || T === D.WHEN || T === D.ELSE || T === D.THEN || T === D.LIMIT || T === D.BETWEEN || T === D.AND || T === D.OR || T === D.XOR, iR = (T) => T === D.AND || T === D.OR || T === D.XOR, PR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -2426,7 +2454,7 @@ const HT = (T) => ({
   // pivot
   "PIVOT",
   "UNPIVOT"
-], DR = [
+], oR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/lexical#reserved_keywords
   "ALL",
   "AND",
@@ -2534,7 +2562,7 @@ const HT = (T) => ({
   "CASCADE",
   "RESTRICT",
   "DETERMINISTIC"
-], iR = [
+], aR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types
   "ARRAY",
   "BOOL",
@@ -2559,7 +2587,7 @@ const HT = (T) => ({
   "STRUCT",
   "TIME",
   "TIMEZONE"
-], PR = L(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), oR = L([
+], MR = L(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), UR = L([
   // Queries: https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax
   "WITH [RECURSIVE]",
   "FROM",
@@ -2590,7 +2618,7 @@ const HT = (T) => ({
   "REMOTE WITH CONNECTION"
 ]), ZE = L([
   "CREATE [OR REPLACE] [TEMP|TEMPORARY|SNAPSHOT|EXTERNAL] TABLE [IF NOT EXISTS]"
-]), sE = L([
+]), CE = L([
   // - create:
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -2678,15 +2706,15 @@ const HT = (T) => ({
   "ASSERT",
   // Other, https://cloud.google.com/bigquery/docs/reference/standard-sql/other-statements
   "EXPORT DATA"
-]), aR = L([
+]), GR = L([
   "UNION {ALL | DISTINCT}",
   "EXCEPT DISTINCT",
   "INTERSECT DISTINCT"
-]), MR = L([
+]), cR = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), UR = L([
+]), lR = L([
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax#tablesample_operator
   "TABLESAMPLE SYSTEM",
   // From DDL: https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
@@ -2697,17 +2725,17 @@ const HT = (T) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), GR = {
+]), HR = {
   name: "bigquery",
   tokenizerOptions: {
-    reservedSelect: PR,
-    reservedClauses: [...oR, ...sE, ...ZE],
-    reservedSetOperations: aR,
-    reservedJoins: MR,
-    reservedPhrases: UR,
-    reservedKeywords: DR,
-    reservedDataTypes: iR,
-    reservedFunctionNames: nR,
+    reservedSelect: MR,
+    reservedClauses: [...UR, ...CE, ...ZE],
+    reservedSetOperations: GR,
+    reservedJoins: cR,
+    reservedPhrases: lR,
+    reservedKeywords: oR,
+    reservedDataTypes: aR,
+    reservedFunctionNames: PR,
     extraParens: ["[]"],
     stringTypes: [
       // The triple-quoted strings are listed first, so they get matched first.
@@ -2725,31 +2753,31 @@ const HT = (T) => ({
     variableTypes: [{ regex: String.raw`@@\w+` }],
     lineCommentTypes: ["--", "#"],
     operators: ["&", "|", "^", "~", ">>", "<<", "||", "=>"],
-    postProcess: cR
+    postProcess: BR
   },
   formatOptions: {
-    onelineClauses: [...ZE, ...sE],
-    tabularOnelineClauses: sE
+    onelineClauses: [...ZE, ...CE],
+    tabularOnelineClauses: CE
   }
 };
-function cR(T) {
-  return lR(HR(T));
+function BR(T) {
+  return uR(FR(T));
 }
-function lR(T) {
+function uR(T) {
   let E = Q;
   return T.map((R) => R.text === "OFFSET" && E.text === "[" ? (E = R, Object.assign(Object.assign({}, R), { type: D.RESERVED_FUNCTION_NAME })) : (E = R, R));
 }
-function HR(T) {
+function FR(T) {
   var E;
   const R = [];
   for (let A = 0; A < T.length; A++) {
     const S = T[A];
     if (($.ARRAY(S) || $.STRUCT(S)) && ((E = T[A + 1]) === null || E === void 0 ? void 0 : E.text) === "<") {
-      const I = BR(T, A + 1), N = T.slice(A, I + 1);
+      const I = YR(T, A + 1), e = T.slice(A, I + 1);
       R.push({
         type: D.IDENTIFIER,
-        raw: N.map(kE("raw")).join(""),
-        text: N.map(kE("text")).join(""),
+        raw: e.map(kE("raw")).join(""),
+        text: e.map(kE("text")).join(""),
         start: S.start
       }), A = I;
     } else
@@ -2758,7 +2786,7 @@ function HR(T) {
   return R;
 }
 const kE = (T) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[T] + " " : E[T];
-function BR(T, E) {
+function YR(T, E) {
   let R = 0;
   for (let A = E; A < T.length; A++) {
     const S = T[A];
@@ -2767,7 +2795,7 @@ function BR(T, E) {
   }
   return T.length - 1;
 }
-const uR = [
+const mR = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=bif-aggregate-functions
   "ARRAY_AGG",
   "AVG",
@@ -3087,7 +3115,7 @@ const uR = [
   "RATIO_TO_REPORT",
   // Type casting
   "CAST"
-], FR = [
+], pR = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=sql-reserved-schema-names-reserved-words
   "ACTIVATE",
   "ADD",
@@ -3488,7 +3516,7 @@ const uR = [
   "XMLNAMESPACES",
   "YEAR",
   "YEARS"
-], YR = [
+], dR = [
   // https://www.ibm.com/docs/en/db2-for-zos/12?topic=columns-data-types
   "ARRAY",
   "BIGINT",
@@ -3530,7 +3558,7 @@ const uR = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], mR = L(["SELECT [ALL | DISTINCT]"]), pR = L([
+], VR = L(["SELECT [ALL | DISTINCT]"]), hR = L([
   // queries
   "WITH",
   "FROM",
@@ -3764,26 +3792,26 @@ const uR = [
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}",
   "WHILE"
-]), dR = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), VR = L([
+]), WR = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), fR = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), hR = L([
+]), XR = L([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), WR = {
+]), bR = {
   name: "db2",
   tokenizerOptions: {
-    reservedSelect: mR,
-    reservedClauses: [...pR, ...qE, ...LE],
-    reservedSetOperations: dR,
-    reservedJoins: VR,
-    reservedPhrases: hR,
-    reservedKeywords: FR,
-    reservedDataTypes: YR,
-    reservedFunctionNames: uR,
+    reservedSelect: VR,
+    reservedClauses: [...hR, ...qE, ...LE],
+    reservedSetOperations: WR,
+    reservedJoins: fR,
+    reservedPhrases: XR,
+    reservedKeywords: pR,
+    reservedDataTypes: dR,
+    reservedFunctionNames: mR,
     extraParens: ["[]"],
     stringTypes: [
       { quote: "''-qq", prefixes: ["G", "N", "U&"] },
@@ -3817,7 +3845,7 @@ const uR = [
     onelineClauses: [...qE, ...LE],
     tabularOnelineClauses: LE
   }
-}, fR = [
+}, KR = [
   // https://www.ibm.com/docs/en/i/7.5?topic=functions-aggregate
   // TODO: 'ANY', - conflicts with test for ANY predicate in 'operators.ys'!!
   "ARRAY_AGG",
@@ -4151,7 +4179,7 @@ const uR = [
   "ROW_NUMBER",
   // Type casting
   "CAST"
-], XR = [
+], yR = [
   // https://www.ibm.com/docs/en/i/7.5?topic=words-reserved
   // TODO: This list likely contains all keywords, not only the reserved ones,
   // try to filter it down to just the reserved keywords.
@@ -4647,7 +4675,7 @@ const uR = [
   "YEARS",
   "YES",
   "ZONE"
-], bR = [
+], $R = [
   // https://www.ibm.com/docs/en/i/7.2?topic=iaodsd-odbc-data-types-how-they-correspond-db2-i-database-types
   "ARRAY",
   "BIGINT",
@@ -4683,7 +4711,7 @@ const uR = [
   "VARCHAR",
   "VARGRAPHIC",
   "XML"
-], KR = L(["SELECT [ALL | DISTINCT]"]), yR = L([
+], gR = L(["SELECT [ALL | DISTINCT]"]), JR = L([
   // queries
   "WITH [RECURSIVE]",
   "INTO",
@@ -4809,27 +4837,27 @@ const uR = [
   "TAG",
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}"
-]), $R = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), gR = L([
+]), wR = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), xR = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "[LEFT | RIGHT] EXCEPTION JOIN",
   "{INNER | CROSS} JOIN"
-]), JR = L([
+]), vR = L([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), wR = {
+]), QR = {
   name: "db2i",
   tokenizerOptions: {
-    reservedSelect: KR,
-    reservedClauses: [...yR, ...jE, ..._E],
-    reservedSetOperations: $R,
-    reservedJoins: gR,
-    reservedPhrases: JR,
-    reservedKeywords: XR,
-    reservedDataTypes: bR,
-    reservedFunctionNames: fR,
+    reservedSelect: gR,
+    reservedClauses: [...JR, ...jE, ..._E],
+    reservedSetOperations: wR,
+    reservedJoins: xR,
+    reservedPhrases: vR,
+    reservedKeywords: yR,
+    reservedDataTypes: $R,
+    reservedFunctionNames: KR,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     stringTypes: [
@@ -4846,7 +4874,7 @@ const uR = [
     onelineClauses: [...jE, ..._E],
     tabularOnelineClauses: _E
   }
-}, xR = [
+}, ZR = [
   // Functions from DuckDB (excluding those that start with an underscore):
   // SELECT DISTINCT upper(function_name) AS function_name
   // FROM duckdb_functions()
@@ -5509,7 +5537,7 @@ const uR = [
   // 'NULL', we really prefer treating it as keyword
   "RANK",
   "ROW_NUMBER"
-], vR = [
+], kR = [
   // Keywords from DuckDB:
   // SELECT upper(keyword_name)
   // FROM duckdb_keywords()
@@ -5591,7 +5619,7 @@ const uR = [
   "WHERE",
   "WINDOW",
   "WITH"
-], QR = [
+], qR = [
   // Types from DuckDB:
   // SELECT DISTINCT upper(type_name)
   // FROM duckdb_types()
@@ -5671,7 +5699,7 @@ const uR = [
   "UUID",
   "VARBINARY",
   "VARCHAR"
-], ZR = L(["SELECT [ALL | DISTINCT]"]), kR = L([
+], jR = L(["SELECT [ALL | DISTINCT]"]), zR = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -5775,11 +5803,11 @@ const uR = [
   "PREPARE",
   "EXECUTE",
   "DEALLOCATE [PREPARE]"
-]), qR = L([
+]), EA = L([
   "UNION [ALL | BY NAME]",
   "EXCEPT [ALL]",
   "INTERSECT [ALL]"
-]), jR = L([
+]), TA = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -5788,23 +5816,23 @@ const uR = [
   "POSITIONAL JOIN",
   "ANTI JOIN",
   "SEMI JOIN"
-]), zR = L([
+]), RA = L([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "SIMILAR TO",
   "IS [NOT] DISTINCT FROM",
   "TIMESTAMP WITH TIME ZONE"
-]), EA = {
+]), AA = {
   name: "duckdb",
   tokenizerOptions: {
-    reservedSelect: ZR,
-    reservedClauses: [...kR, ...zE, ...rE],
-    reservedSetOperations: qR,
-    reservedJoins: jR,
-    reservedPhrases: zR,
+    reservedSelect: jR,
+    reservedClauses: [...zR, ...zE, ...rE],
+    reservedSetOperations: EA,
+    reservedJoins: TA,
+    reservedPhrases: RA,
     supportsXor: !0,
-    reservedKeywords: vR,
-    reservedDataTypes: QR,
-    reservedFunctionNames: xR,
+    reservedKeywords: kR,
+    reservedDataTypes: qR,
+    reservedFunctionNames: ZR,
     nestedBlockComments: !0,
     extraParens: ["[]", "{}"],
     stringTypes: [
@@ -5867,7 +5895,7 @@ const uR = [
     onelineClauses: [...zE, ...rE],
     tabularOnelineClauses: rE
   }
-}, TA = [
+}, SA = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+UDF
   // math
   "ABS",
@@ -6075,7 +6103,7 @@ const uR = [
   "CUME_DIST",
   "PERCENT_RANK",
   "NTILE"
-], RA = [
+], IA = [
   // https://cwiki.apache.org/confluence/display/hive/languagemanual+ddl
   // Non-reserved keywords have proscribed meanings in. HiveQL, but can still be used as table or column names
   "ADD",
@@ -6390,7 +6418,7 @@ const uR = [
   "JSONFILE",
   "INPUTFORMAT",
   "OUTPUTFORMAT"
-], AA = [
+], OA = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Types
   "ARRAY",
   "BIGINT",
@@ -6411,7 +6439,7 @@ const uR = [
   "STRUCT",
   "TIMESTAMP",
   "VARCHAR"
-], SA = L(["SELECT [ALL | DISTINCT]"]), IA = L([
+], eA = L(["SELECT [ALL | DISTINCT]"]), NA = L([
   // queries
   "WITH",
   "FROM",
@@ -6472,23 +6500,23 @@ const uR = [
   "STORED AS",
   "STORED BY",
   "ROW FORMAT"
-]), OA = L(["UNION [ALL | DISTINCT]"]), NA = L([
+]), tA = L(["UNION [ALL | DISTINCT]"]), sA = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "LEFT SEMI JOIN"
-]), eA = L(["{ROWS | RANGE} BETWEEN"]), CA = {
+]), CA = L(["{ROWS | RANGE} BETWEEN"]), LA = {
   name: "hive",
   tokenizerOptions: {
-    reservedSelect: SA,
-    reservedClauses: [...IA, ...ET, ...nE],
-    reservedSetOperations: OA,
-    reservedJoins: NA,
-    reservedPhrases: eA,
-    reservedKeywords: RA,
-    reservedDataTypes: AA,
-    reservedFunctionNames: TA,
+    reservedSelect: eA,
+    reservedClauses: [...NA, ...ET, ...nE],
+    reservedSetOperations: tA,
+    reservedJoins: sA,
+    reservedPhrases: CA,
+    reservedKeywords: IA,
+    reservedDataTypes: OA,
+    reservedFunctionNames: SA,
     extraParens: ["[]"],
     stringTypes: ['""-bs', "''-bs"],
     identTypes: ["``"],
@@ -6509,7 +6537,7 @@ function RE(T) {
     return $.VALUES(E) && S.text === "=" ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E;
   });
 }
-const tA = [
+const _A = [
   // https://mariadb.com/kb/en/reserved-words/
   "ACCESSIBLE",
   "ADD",
@@ -6726,7 +6754,7 @@ const tA = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], sA = [
+], rA = [
   // https://mariadb.com/kb/en/data-types/
   "BIGINT",
   "BINARY",
@@ -6777,7 +6805,7 @@ const tA = [
   "YEAR"
   // 'NUMBER', // ?? In oracle mode only
   // 'SET' // handled as special-case in postProcess
-], LA = [
+], nA = [
   // https://mariadb.com/kb/en/information-schema-sql_functions-table/
   "ADDDATE",
   "ADD_MONTHS",
@@ -7015,7 +7043,7 @@ const tA = [
   // CASE expression shorthands
   "COALESCE",
   "NULLIF"
-], _A = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), rA = L([
+], DA = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), iA = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -7246,12 +7274,12 @@ const tA = [
   "XA RECOVER",
   "XA ROLLBACK",
   "XA START"
-]), nA = L([
+]), PA = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]",
   "MINUS [ALL | DISTINCT]"
-]), DA = L([
+]), oA = L([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -7259,23 +7287,23 @@ const tA = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), iA = L([
+]), aA = L([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), PA = {
+]), MA = {
   name: "mariadb",
   tokenizerOptions: {
-    reservedSelect: _A,
-    reservedClauses: [...rA, ...TT, ...DE],
-    reservedSetOperations: nA,
-    reservedJoins: DA,
-    reservedPhrases: iA,
+    reservedSelect: DA,
+    reservedClauses: [...iA, ...TT, ...DE],
+    reservedSetOperations: PA,
+    reservedJoins: oA,
+    reservedPhrases: aA,
     supportsXor: !0,
-    reservedKeywords: tA,
-    reservedDataTypes: sA,
-    reservedFunctionNames: LA,
+    reservedKeywords: _A,
+    reservedDataTypes: rA,
+    reservedFunctionNames: nA,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -7314,7 +7342,7 @@ const tA = [
     onelineClauses: [...TT, ...DE],
     tabularOnelineClauses: DE
   }
-}, oA = [
+}, UA = [
   // https://dev.mysql.com/doc/refman/8.0/en/keywords.html
   "ACCESSIBLE",
   "ADD",
@@ -7545,7 +7573,7 @@ const tA = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], aA = [
+], GA = [
   // https://dev.mysql.com/doc/refman/8.0/en/data-types.html
   "BIGINT",
   "BINARY",
@@ -7597,7 +7625,7 @@ const tA = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], MA = [
+], cA = [
   // https://dev.mysql.com/doc/refman/8.0/en/built-in-function-reference.html
   "ABS",
   "ACOS",
@@ -8020,7 +8048,7 @@ const tA = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], UA = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), GA = L([
+], lA = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), HA = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8221,7 +8249,7 @@ const tA = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), cA = L(["UNION [ALL | DISTINCT]"]), lA = L([
+]), BA = L(["UNION [ALL | DISTINCT]"]), uA = L([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8229,23 +8257,23 @@ const tA = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), HA = L([
+]), FA = L([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), BA = {
+]), YA = {
   name: "mysql",
   tokenizerOptions: {
-    reservedSelect: UA,
-    reservedClauses: [...GA, ...RT, ...iE],
-    reservedSetOperations: cA,
-    reservedJoins: lA,
-    reservedPhrases: HA,
+    reservedSelect: lA,
+    reservedClauses: [...HA, ...RT, ...iE],
+    reservedSetOperations: BA,
+    reservedJoins: uA,
+    reservedPhrases: FA,
     supportsXor: !0,
-    reservedKeywords: oA,
-    reservedDataTypes: aA,
-    reservedFunctionNames: MA,
+    reservedKeywords: UA,
+    reservedDataTypes: GA,
+    reservedFunctionNames: cA,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -8286,7 +8314,7 @@ const tA = [
     onelineClauses: [...RT, ...iE],
     tabularOnelineClauses: iE
   }
-}, uA = [
+}, mA = [
   // https://docs.pingcap.com/tidb/stable/keywords
   "ADD",
   "ALL",
@@ -8478,7 +8506,7 @@ const tA = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], FA = [
+], pA = [
   // https://docs.pingcap.com/tidb/stable/data-type-overview
   "BIGINT",
   "BINARY",
@@ -8525,7 +8553,7 @@ const tA = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], YA = [
+], dA = [
   // https://docs.pingcap.com/tidb/stable/sql-statement-show-builtins
   // https://docs.pingcap.com/tidb/stable/functions-and-operators-overview
   // + MySQL aggregate functions: https://dev.mysql.com/doc/refman/8.0/en/aggregate-functions.html
@@ -8851,7 +8879,7 @@ const tA = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], mA = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), pA = L([
+], VA = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), hA = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8986,7 +9014,7 @@ const tA = [
   "UNLOCK TABLES",
   // https://docs.pingcap.com/tidb/stable/sql-statement-use
   "USE"
-]), dA = L(["UNION [ALL | DISTINCT]"]), VA = L([
+]), WA = L(["UNION [ALL | DISTINCT]"]), fA = L([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8994,23 +9022,23 @@ const tA = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), hA = L([
+]), XA = L([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), WA = {
+]), bA = {
   name: "tidb",
   tokenizerOptions: {
-    reservedSelect: mA,
-    reservedClauses: [...pA, ...AT, ...PE],
-    reservedSetOperations: dA,
-    reservedJoins: VA,
-    reservedPhrases: hA,
+    reservedSelect: VA,
+    reservedClauses: [...hA, ...AT, ...PE],
+    reservedSetOperations: WA,
+    reservedJoins: fA,
+    reservedPhrases: XA,
     supportsXor: !0,
-    reservedKeywords: uA,
-    reservedDataTypes: FA,
-    reservedFunctionNames: YA,
+    reservedKeywords: mA,
+    reservedDataTypes: pA,
+    reservedFunctionNames: dA,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -9051,7 +9079,7 @@ const tA = [
     onelineClauses: [...AT, ...PE],
     tabularOnelineClauses: PE
   }
-}, fA = [
+}, KA = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/functions.html
   "ABORT",
   "ABS",
@@ -9281,7 +9309,7 @@ const tA = [
   // not implemented in N1QL, but added here now for the sake of tests
   // https://docs.couchbase.com/server/current/analytics/3_query.html#Vs_SQL-92
   "CAST"
-], XA = [
+], yA = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/reservedwords.html
   "ADVISE",
   "ALL",
@@ -9487,7 +9515,7 @@ const tA = [
   "WITHIN",
   "WORK",
   "XOR"
-], bA = [
+], $A = [
   // N1QL does not support any way of declaring types for columns.
   // It does not support the CREATE TABLE statement nor the CAST() expression.
   //
@@ -9496,7 +9524,7 @@ const tA = [
   // which it actually doesn't use.
   //
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/datatypes.html
-], KA = L(["SELECT [ALL | DISTINCT]"]), yA = L([
+], gA = L(["SELECT [ALL | DISTINCT]"]), JA = L([
   // queries
   "WITH",
   "FROM",
@@ -9563,18 +9591,18 @@ const tA = [
   "SET CURRENT SCHEMA",
   "SHOW",
   "USE [PRIMARY] KEYS"
-]), $A = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), gA = L(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), JA = L(["{ROWS | RANGE | GROUPS} BETWEEN"]), wA = {
+]), wA = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), xA = L(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), vA = L(["{ROWS | RANGE | GROUPS} BETWEEN"]), QA = {
   name: "n1ql",
   tokenizerOptions: {
-    reservedSelect: KA,
-    reservedClauses: [...yA, ...ST],
-    reservedSetOperations: $A,
-    reservedJoins: gA,
-    reservedPhrases: JA,
+    reservedSelect: gA,
+    reservedClauses: [...JA, ...ST],
+    reservedSetOperations: wA,
+    reservedJoins: xA,
+    reservedPhrases: vA,
     supportsXor: !0,
-    reservedKeywords: XA,
-    reservedDataTypes: bA,
-    reservedFunctionNames: fA,
+    reservedKeywords: yA,
+    reservedDataTypes: $A,
+    reservedFunctionNames: KA,
     // NOTE: single quotes are actually not supported in N1QL,
     // but we support them anyway as all other SQL dialects do,
     // which simplifies writing tests that are shared between all dialects.
@@ -9588,7 +9616,7 @@ const tA = [
   formatOptions: {
     onelineClauses: ST
   }
-}, xA = [
+}, ZA = [
   // https://docs.oracle.com/cd/B19306_01/appdev.102/b14261/reservewords.htm
   // 'A',
   "ADD",
@@ -9893,7 +9921,7 @@ const tA = [
   "WRITE",
   "YEAR",
   "ZONE"
-], vA = [
+], kA = [
   // https://www.ibm.com/docs/en/db2/10.5?topic=plsql-data-types
   "ARRAY",
   "BFILE_BASE",
@@ -9931,7 +9959,7 @@ const tA = [
   "UROWID",
   "VARCHAR",
   "VARCHAR2"
-], QA = [
+], qA = [
   // https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions001.htm
   // numeric
   "ABS",
@@ -10196,7 +10224,7 @@ const tA = [
   "PRESENTNNV",
   "PRESENTV",
   "PREVIOUS"
-], ZA = L(["SELECT [ALL | DISTINCT | UNIQUE]"]), kA = L([
+], jA = L(["SELECT [ALL | DISTINCT | UNIQUE]"]), zA = L([
   // queries
   "WITH",
   "FROM",
@@ -10250,7 +10278,7 @@ const tA = [
   "EXCEPTION",
   "LOOP",
   "START WITH"
-]), qA = L(["UNION [ALL]", "MINUS", "INTERSECT"]), jA = L([
+]), ES = L(["UNION [ALL]", "MINUS", "INTERSECT"]), TS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -10258,22 +10286,22 @@ const tA = [
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), zA = L([
+]), RS = L([
   "ON {UPDATE | DELETE} [SET NULL]",
   "ON COMMIT",
   "{ROWS | RANGE} BETWEEN"
-]), ES = {
+]), AS = {
   name: "plsql",
   tokenizerOptions: {
-    reservedSelect: ZA,
-    reservedClauses: [...kA, ...IT, ...oE],
-    reservedSetOperations: qA,
-    reservedJoins: jA,
-    reservedPhrases: zA,
+    reservedSelect: jA,
+    reservedClauses: [...zA, ...IT, ...oE],
+    reservedSetOperations: ES,
+    reservedJoins: TS,
+    reservedPhrases: RS,
     supportsXor: !0,
-    reservedKeywords: xA,
-    reservedDataTypes: vA,
-    reservedFunctionNames: QA,
+    reservedKeywords: ZA,
+    reservedDataTypes: kA,
+    reservedFunctionNames: qA,
     stringTypes: [
       { quote: "''-qq", prefixes: ["N"] },
       { quote: "q''", prefixes: ["N"] }
@@ -10298,7 +10326,7 @@ const tA = [
       "@",
       "||"
     ],
-    postProcess: TS
+    postProcess: SS
   },
   formatOptions: {
     alwaysDenseOperators: ["@"],
@@ -10306,11 +10334,11 @@ const tA = [
     tabularOnelineClauses: oE
   }
 };
-function TS(T) {
+function SS(T) {
   let E = Q;
-  return T.map((R) => $.SET(R) && $.BY(E) ? Object.assign(Object.assign({}, R), { type: D.RESERVED_KEYWORD }) : (BT(R.type) && (E = R), R));
+  return T.map((R) => $.SET(R) && $.BY(E) ? Object.assign(Object.assign({}, R), { type: D.RESERVED_KEYWORD }) : (FT(R.type) && (E = R), R));
 }
-const RS = [
+const IS = [
   // https://www.postgresql.org/docs/14/functions.html
   //
   // https://www.postgresql.org/docs/14/functions-math.html
@@ -10994,7 +11022,7 @@ const RS = [
   "PG_MCV_LIST_ITEMS",
   // cast
   "CAST"
-], AS = [
+], OS = [
   // https://www.postgresql.org/docs/14/sql-keywords-appendix.html
   "ALL",
   "ANALYSE",
@@ -11113,7 +11141,7 @@ const RS = [
   "WITHOUT",
   "YEAR"
   // requires AS
-], SS = [
+], eS = [
   // https://www.postgresql.org/docs/current/datatype.html
   "ARRAY",
   "BIGINT",
@@ -11147,7 +11175,7 @@ const RS = [
   "VARCHAR",
   "XML",
   "ZONE"
-], IS = L(["SELECT [ALL | DISTINCT]"]), OS = L([
+], NS = L(["SELECT [ALL | DISTINCT]"]), tS = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -11370,17 +11398,17 @@ const RS = [
   "START TRANSACTION",
   "UNLISTEN",
   "VACUUM"
-]), NS = L([
+]), sS = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), eS = L([
+]), CS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), CS = L([
+]), LS = L([
   "PRIMARY KEY",
   "GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY",
   "ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]",
@@ -11393,17 +11421,17 @@ const RS = [
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), tS = {
+]), _S = {
   name: "postgresql",
   tokenizerOptions: {
-    reservedSelect: IS,
-    reservedClauses: [...OS, ...OT, ...aE],
-    reservedSetOperations: NS,
-    reservedJoins: eS,
-    reservedPhrases: CS,
-    reservedKeywords: AS,
-    reservedDataTypes: SS,
-    reservedFunctionNames: RS,
+    reservedSelect: NS,
+    reservedClauses: [...tS, ...OT, ...aE],
+    reservedSetOperations: sS,
+    reservedJoins: CS,
+    reservedPhrases: LS,
+    reservedKeywords: OS,
+    reservedDataTypes: eS,
+    reservedFunctionNames: IS,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     stringTypes: [
@@ -11517,7 +11545,7 @@ const RS = [
     onelineClauses: [...OT, ...aE],
     tabularOnelineClauses: aE
   }
-}, sS = [
+}, rS = [
   // https://docs.aws.amazon.com/redshift/latest/dg/c_Aggregate_Functions.html
   "ANY_VALUE",
   "APPROXIMATE PERCENTILE_DISC",
@@ -11863,7 +11891,7 @@ const RS = [
   "SLICE_NUM",
   "USER",
   "VERSION"
-], LS = [
+], nS = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_pg_keywords.html
   "AES128",
   "AES256",
@@ -12052,7 +12080,7 @@ const RS = [
    * SVL: https://docs.aws.amazon.com/redshift/latest/dg/svl_views.html
    * SVV: https://docs.aws.amazon.com/redshift/latest/dg/svv_views.html
    */
-], _S = [
+], DS = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_Character_types.html#r_Character_types-text-and-bpchar-types
   "ARRAY",
   "BIGINT",
@@ -12073,7 +12101,7 @@ const RS = [
   "TEXT",
   "VARBYTE",
   "VARCHAR"
-], rS = L(["SELECT [ALL | DISTINCT]"]), nS = L([
+], iS = L(["SELECT [ALL | DISTINCT]"]), PS = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -12091,7 +12119,7 @@ const RS = [
   "VALUES",
   // - update:
   "SET"
-]), NT = L([
+]), eT = L([
   "CREATE [TEMPORARY | TEMP | LOCAL TEMPORARY | LOCAL TEMP] TABLE [IF NOT EXISTS]"
 ]), ME = L([
   // - create:
@@ -12184,13 +12212,13 @@ const RS = [
   "START TRANSACTION",
   "UNLOAD",
   "VACUUM"
-]), DS = L(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), iS = L([
+]), oS = L(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), aS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), PS = L([
+]), MS = L([
   // https://docs.aws.amazon.com/redshift/latest/dg/copy-parameters-data-conversion.html
   "NULL AS",
   // https://docs.aws.amazon.com/redshift/latest/dg/r_CREATE_EXTERNAL_SCHEMA.html
@@ -12198,17 +12226,17 @@ const RS = [
   "HIVE METASTORE",
   // in window specifications
   "{ROWS | RANGE} BETWEEN"
-]), oS = {
+]), US = {
   name: "redshift",
   tokenizerOptions: {
-    reservedSelect: rS,
-    reservedClauses: [...nS, ...NT, ...ME],
-    reservedSetOperations: DS,
-    reservedJoins: iS,
-    reservedPhrases: PS,
-    reservedKeywords: LS,
-    reservedDataTypes: _S,
-    reservedFunctionNames: sS,
+    reservedSelect: iS,
+    reservedClauses: [...PS, ...eT, ...ME],
+    reservedSetOperations: oS,
+    reservedJoins: aS,
+    reservedPhrases: MS,
+    reservedKeywords: nS,
+    reservedDataTypes: DS,
+    reservedFunctionNames: rS,
     stringTypes: ["''-qq"],
     identTypes: ['""-qq'],
     identChars: { first: "#" },
@@ -12231,10 +12259,10 @@ const RS = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...NT, ...ME],
+    onelineClauses: [...eT, ...ME],
     tabularOnelineClauses: ME
   }
-}, aS = [
+}, GS = [
   // https://deepkb.com/CO_000013/en/kb/IMPORT-fbfa59f0-2bf1-31fe-bb7b-0f9efe9932c6/spark-sql-keywords
   "ADD",
   "AFTER",
@@ -12501,7 +12529,7 @@ const RS = [
   "UNSIGNED",
   "VARIABLES",
   "YEAR_MONTH"
-], MS = [
+], cS = [
   // https://spark.apache.org/docs/latest/sql-ref-datatypes.html
   "ARRAY",
   "BIGINT",
@@ -12531,7 +12559,7 @@ const RS = [
   "TINYINT",
   "VARCHAR"
   // No varchar type in Spark, only STRING. Added for the sake of tests
-], US = [
+], lS = [
   // http://spark.apache.org/docs/latest/sql-ref-functions.html
   //
   // http://spark.apache.org/docs/latest/sql-ref-functions-builtin.html#aggregate-functions
@@ -12852,7 +12880,7 @@ const RS = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], GS = L(["SELECT [ALL | DISTINCT]"]), cS = L([
+], HS = L(["SELECT [ALL | DISTINCT]"]), BS = L([
   // queries
   "WITH",
   "FROM",
@@ -12877,7 +12905,7 @@ const RS = [
   //   https://spark.apache.org/docs/latest/sql-ref-syntax-dml-load.html
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), eT = L(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), UE = L([
+]), NT = L(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), UE = L([
   // - create:
   "CREATE [OR REPLACE] [GLOBAL TEMPORARY | TEMPORARY] VIEW [IF NOT EXISTS]",
   // - drop table:
@@ -12933,11 +12961,11 @@ const RS = [
   "SHOW TBLPROPERTIES",
   "SHOW VIEWS",
   "UNCACHE TABLE"
-]), lS = L([
+]), uS = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), HS = L([
+]), FS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -12946,23 +12974,23 @@ const RS = [
   // non-standard-joins
   "[LEFT] {ANTI | SEMI} JOIN",
   "NATURAL [LEFT] {ANTI | SEMI} JOIN"
-]), BS = L([
+]), YS = L([
   "ON DELETE",
   "ON UPDATE",
   "CURRENT ROW",
   "{ROWS | RANGE} BETWEEN"
-]), uS = {
+]), mS = {
   name: "spark",
   tokenizerOptions: {
-    reservedSelect: GS,
-    reservedClauses: [...cS, ...eT, ...UE],
-    reservedSetOperations: lS,
-    reservedJoins: HS,
-    reservedPhrases: BS,
+    reservedSelect: HS,
+    reservedClauses: [...BS, ...NT, ...UE],
+    reservedSetOperations: uS,
+    reservedJoins: FS,
+    reservedPhrases: YS,
     supportsXor: !0,
-    reservedKeywords: aS,
-    reservedDataTypes: MS,
-    reservedFunctionNames: US,
+    reservedKeywords: GS,
+    reservedDataTypes: cS,
+    reservedFunctionNames: lS,
     extraParens: ["[]"],
     stringTypes: [
       "''-bs",
@@ -12974,20 +13002,20 @@ const RS = [
     identChars: { allowFirstCharNumber: !0 },
     variableTypes: [{ quote: "{}", prefixes: ["$"], requirePrefix: !0 }],
     operators: ["%", "~", "^", "|", "&", "<=>", "==", "!", "||", "->"],
-    postProcess: FS
+    postProcess: pS
   },
   formatOptions: {
-    onelineClauses: [...eT, ...UE],
+    onelineClauses: [...NT, ...UE],
     tabularOnelineClauses: UE
   }
 };
-function FS(T) {
+function pS(T) {
   return T.map((E, R) => {
     const A = T[R - 1] || Q, S = T[R + 1] || Q;
     return $.WINDOW(E) && S.type === D.OPEN_PAREN ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E.text === "ITEMS" && E.type === D.RESERVED_KEYWORD && !(A.text === "COLLECTION" && S.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: D.IDENTIFIER, text: E.raw }) : E;
   });
 }
-const YS = [
+const dS = [
   // https://www.sqlite.org/lang_corefunc.html
   "ABS",
   "CHANGES",
@@ -13111,7 +13139,7 @@ const YS = [
   "JSON_TREE",
   // cast
   "CAST"
-], mS = [
+], VS = [
   // https://www.sqlite.org/lang_keywords.html
   // Note: The keywords listed on that URL are not all reserved keywords.
   // We'll need to clean up this list to only include reserved keywords.
@@ -13264,7 +13292,7 @@ const YS = [
   "WINDOW",
   "WITH",
   "WITHOUT"
-], pS = [
+], hS = [
   // SQLite allows any word as a data type, e.g. CREATE TABLE foo (col1 madeupname(123));
   // Here we just list some common ones as SQL Formatter
   // is only able to detect a predefined list of data types.
@@ -13285,7 +13313,7 @@ const YS = [
   "TEXT",
   "VARCHAR",
   "VARYING CHARACTER"
-], dS = L(["SELECT [ALL | DISTINCT]"]), VS = L([
+], WS = L(["SELECT [ALL | DISTINCT]"]), fS = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -13304,7 +13332,7 @@ const YS = [
   "VALUES",
   // - update:
   "SET"
-]), CT = L(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), GE = L([
+]), tT = L(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), GE = L([
   // - create:
   "CREATE [TEMPORARY | TEMP] VIEW [IF NOT EXISTS]",
   // - update:
@@ -13323,27 +13351,27 @@ const YS = [
   "RENAME TO",
   // - set schema
   "SET SCHEMA"
-]), hS = L(["UNION [ALL]", "EXCEPT", "INTERSECT"]), WS = L([
+]), XS = L(["UNION [ALL]", "EXCEPT", "INTERSECT"]), bS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), fS = L([
+]), KS = L([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "DO UPDATE"
-]), XS = {
+]), yS = {
   name: "sqlite",
   tokenizerOptions: {
-    reservedSelect: dS,
-    reservedClauses: [...VS, ...CT, ...GE],
-    reservedSetOperations: hS,
-    reservedJoins: WS,
-    reservedPhrases: fS,
-    reservedKeywords: mS,
-    reservedDataTypes: pS,
-    reservedFunctionNames: YS,
+    reservedSelect: WS,
+    reservedClauses: [...fS, ...tT, ...GE],
+    reservedSetOperations: XS,
+    reservedJoins: bS,
+    reservedPhrases: KS,
+    reservedKeywords: VS,
+    reservedDataTypes: hS,
+    reservedFunctionNames: dS,
     stringTypes: [
       "''-qq",
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -13356,10 +13384,10 @@ const YS = [
     operators: ["%", "~", "&", "|", "<<", ">>", "==", "->", "->>", "||"]
   },
   formatOptions: {
-    onelineClauses: [...CT, ...GE],
+    onelineClauses: [...tT, ...GE],
     tabularOnelineClauses: GE
   }
-}, bS = [
+}, $S = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_9_set_function_specification
   "GROUPING",
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_10_window_function
@@ -13456,7 +13484,7 @@ const YS = [
   "ASIN",
   "ACOS",
   "ATAN"
-], KS = [
+], gS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#reserved-word
   "ALL",
   "ALLOCATE",
@@ -13654,7 +13682,7 @@ const YS = [
   "WITHIN",
   "WITHOUT",
   "YEAR"
-], yS = [
+], JS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_1_data_type
   "ARRAY",
   "BIGINT",
@@ -13694,7 +13722,7 @@ const YS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], $S = L(["SELECT [ALL | DISTINCT]"]), gS = L([
+], wS = L(["SELECT [ALL | DISTINCT]"]), xS = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -13713,7 +13741,7 @@ const YS = [
   "VALUES",
   // - update:
   "SET"
-]), tT = L(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), cE = L([
+]), sT = L(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), cE = L([
   // - create:
   "CREATE [RECURSIVE] VIEW",
   // - update:
@@ -13738,30 +13766,30 @@ const YS = [
   "TRUNCATE TABLE",
   // other
   "SET SCHEMA"
-]), JS = L([
+]), vS = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), wS = L([
+]), QS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), xS = L([
+]), ZS = L([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), vS = {
+]), kS = {
   name: "sql",
   tokenizerOptions: {
-    reservedSelect: $S,
-    reservedClauses: [...gS, ...tT, ...cE],
-    reservedSetOperations: JS,
-    reservedJoins: wS,
-    reservedPhrases: xS,
-    reservedKeywords: KS,
-    reservedDataTypes: yS,
-    reservedFunctionNames: bS,
+    reservedSelect: wS,
+    reservedClauses: [...xS, ...sT, ...cE],
+    reservedSetOperations: vS,
+    reservedJoins: QS,
+    reservedPhrases: ZS,
+    reservedKeywords: gS,
+    reservedDataTypes: JS,
+    reservedFunctionNames: $S,
     stringTypes: [
       { quote: "''-qq-bs", prefixes: ["N", "U&"] },
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -13771,10 +13799,10 @@ const YS = [
     operators: ["||"]
   },
   formatOptions: {
-    onelineClauses: [...tT, ...cE],
+    onelineClauses: [...sT, ...cE],
     tabularOnelineClauses: cE
   }
-}, QS = [
+}, qS = [
   // https://github.com/trinodb/trino/tree/432d2897bdef99388c1a47188743a061c4ac1f34/docs/src/main/sphinx/functions
   // rg '^\.\. function::' ./docs/src/main/sphinx/functions | cut -d' ' -f 3 | cut -d '(' -f 1 | sort | uniq
   // rg '\* ' ./docs/src/main/sphinx/functions/list-by-topic.rst | grep    '\* :func:' | cut -d'`' -f 2
@@ -14208,7 +14236,7 @@ const YS = [
   "NEXT",
   "PERMUTE",
   "PREV"
-], ZS = [
+], jS = [
   // https://github.com/trinodb/trino/blob/432d2897bdef99388c1a47188743a061c4ac1f34/core/trino-parser/src/main/antlr4/io/trino/sql/parser/SqlBase.g4#L858-L1128
   "ABSENT",
   "ADD",
@@ -14445,7 +14473,7 @@ const YS = [
   "WRAPPER",
   "WRITE",
   "ZONE"
-], kS = [
+], zS = [
   // https://github.com/trinodb/trino/blob/432d2897bdef99388c1a47188743a061c4ac1f34/core/trino-main/src/main/java/io/trino/metadata/TypeRegistry.java#L131-L168
   // or https://trino.io/docs/current/language/types.html
   "BIGINT",
@@ -14484,7 +14512,7 @@ const YS = [
   "CODEPOINTS",
   "FUNCTION",
   "JSONPATH"
-], qS = L(["SELECT [ALL | DISTINCT]"]), jS = L([
+], EI = L(["SELECT [ALL | DISTINCT]"]), TI = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14512,7 +14540,7 @@ const YS = [
   "PATTERN",
   "SUBSET",
   "DEFINE"
-]), sT = L(["CREATE TABLE [IF NOT EXISTS]"]), lE = L([
+]), CT = L(["CREATE TABLE [IF NOT EXISTS]"]), lE = L([
   // - create:
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW",
   // - update:
@@ -14570,31 +14598,31 @@ const YS = [
   "SHOW ROLE GRANTS",
   "SHOW FUNCTIONS",
   "SHOW SESSION"
-]), zS = L([
+]), RI = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), EI = L([
+]), AI = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), TI = L([
+]), SI = L([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), RI = {
+]), II = {
   name: "trino",
   tokenizerOptions: {
-    reservedSelect: qS,
-    reservedClauses: [...jS, ...sT, ...lE],
-    reservedSetOperations: zS,
-    reservedJoins: EI,
-    reservedPhrases: TI,
-    reservedKeywords: ZS,
-    reservedDataTypes: kS,
-    reservedFunctionNames: QS,
+    reservedSelect: EI,
+    reservedClauses: [...TI, ...CT, ...lE],
+    reservedSetOperations: RI,
+    reservedJoins: AI,
+    reservedPhrases: SI,
+    reservedKeywords: jS,
+    reservedDataTypes: zS,
+    reservedFunctionNames: qS,
     // Trino also supports {- ... -} parenthesis.
     // The formatting of these currently works out as a result of { and -
     // not getting a space added in-between.
@@ -14623,10 +14651,10 @@ const YS = [
     ]
   },
   formatOptions: {
-    onelineClauses: [...sT, ...lE],
+    onelineClauses: [...CT, ...lE],
     tabularOnelineClauses: lE
   }
-}, AI = [
+}, OI = [
   // https://docs.microsoft.com/en-us/sql/t-sql/functions/functions?view=sql-server-ver15
   // aggregate
   "APPROX_COUNT_DISTINCT",
@@ -14931,7 +14959,7 @@ const YS = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], SI = [
+], eI = [
   // https://docs.microsoft.com/en-us/sql/t-sql/language-elements/reserved-keywords-transact-sql?view=sql-server-ver15
   // standard
   "ADD",
@@ -15112,7 +15140,7 @@ const YS = [
   "WRITETEXT",
   // https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql?view=sql-server-ver16#action
   "$ACTION"
-], II = [
+], NI = [
   // https://learn.microsoft.com/en-us/sql/t-sql/data-types/data-types-transact-sql?view=sql-server-ver15
   "BINARY",
   "BIT",
@@ -15139,7 +15167,7 @@ const YS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], OI = L(["SELECT [ALL | DISTINCT]"]), NI = L([
+], tI = L(["SELECT [ALL | DISTINCT]"]), sI = L([
   // queries
   "WITH",
   "INTO",
@@ -15346,26 +15374,26 @@ const YS = [
   "XACT_ABORT",
   "XML INDEX",
   "XML SCHEMA COLLECTION"
-]), eI = L(["UNION [ALL]", "EXCEPT", "INTERSECT"]), CI = L([
+]), CI = L(["UNION [ALL]", "EXCEPT", "INTERSECT"]), LI = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), tI = L([
+]), _I = L([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), sI = {
+]), rI = {
   name: "transactsql",
   tokenizerOptions: {
-    reservedSelect: OI,
-    reservedClauses: [...NI, ...LT, ...HE],
-    reservedSetOperations: eI,
-    reservedJoins: CI,
-    reservedPhrases: tI,
-    reservedKeywords: SI,
-    reservedDataTypes: II,
-    reservedFunctionNames: AI,
+    reservedSelect: tI,
+    reservedClauses: [...sI, ...LT, ...HE],
+    reservedSetOperations: CI,
+    reservedJoins: LI,
+    reservedPhrases: _I,
+    reservedKeywords: eI,
+    reservedDataTypes: NI,
+    reservedFunctionNames: OI,
     nestedBlockComments: !0,
     stringTypes: [{ quote: "''-qq", prefixes: ["N"] }, "{}"],
     identTypes: ['""-qq', "[]"],
@@ -15398,7 +15426,7 @@ const YS = [
     onelineClauses: [...LT, ...HE],
     tabularOnelineClauses: HE
   }
-}, LI = [
+}, nI = [
   // List of all keywords taken from:
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/restricted-keywords/list-of-restricted-keywords.html
   // Then filtered down to reserved keywords by running
@@ -15611,7 +15639,7 @@ const YS = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], _I = [
+], DI = [
   // https://docs.singlestore.com/cloud/reference/sql-reference/data-types/
   "BIGINT",
   "BINARY",
@@ -15660,7 +15688,7 @@ const YS = [
   "VARCHAR",
   "VARCHARACTER",
   "YEAR"
-], rI = [
+], iI = [
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/vector-functions/vector-functions.html
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/window-functions/window-functions.html
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/string-functions/string-functions.html
@@ -15940,7 +15968,7 @@ const YS = [
   "WEEKDAY",
   "WEEKOFYEAR",
   "YEAR"
-], nI = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), DI = L([
+], PI = L(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), oI = L([
   // queries
   "WITH",
   "FROM",
@@ -16141,35 +16169,35 @@ const YS = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), iI = L([
+]), aI = L([
   "UNION [ALL | DISTINCT]",
   "EXCEPT",
   "INTERSECT",
   "MINUS"
-]), PI = L([
+]), MI = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), oI = L([
+]), UI = L([
   "ON DELETE",
   "ON UPDATE",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), aI = {
+]), GI = {
   name: "singlestoredb",
   tokenizerOptions: {
-    reservedSelect: nI,
-    reservedClauses: [...DI, ..._T, ...BE],
-    reservedSetOperations: iI,
-    reservedJoins: PI,
-    reservedPhrases: oI,
-    reservedKeywords: LI,
-    reservedDataTypes: _I,
-    reservedFunctionNames: rI,
+    reservedSelect: PI,
+    reservedClauses: [...oI, ..._T, ...BE],
+    reservedSetOperations: aI,
+    reservedJoins: MI,
+    reservedPhrases: UI,
+    reservedKeywords: nI,
+    reservedDataTypes: DI,
+    reservedFunctionNames: iI,
     // TODO: support _binary"some string" prefix
     stringTypes: [
       '""-qq-bs',
@@ -16209,7 +16237,7 @@ const YS = [
     onelineClauses: [..._T, ...BE],
     tabularOnelineClauses: BE
   }
-}, MI = [
+}, cI = [
   // https://docs.snowflake.com/en/sql-reference-functions.html
   //
   // https://docs.snowflake.com/en/sql-reference/functions-all.html
@@ -16816,7 +16844,7 @@ const YS = [
   "QUARTER",
   "ZEROIFNULL",
   "ZIPF"
-], UI = [
+], lI = [
   // https://docs.snowflake.com/en/sql-reference/reserved-keywords.html
   //
   // run in console on this page: $x('//tbody/tr/*[1]/p/text()').map(x => x.nodeValue)
@@ -16913,7 +16941,7 @@ const YS = [
   "WITH",
   // These are definitely keywords, but haven't found a definite list in the docs
   "COMMENT"
-], GI = [
+], HI = [
   "NUMBER",
   "DECIMAL",
   "NUMERIC",
@@ -16950,7 +16978,7 @@ const YS = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], cI = L(["SELECT [ALL | DISTINCT]"]), lI = L([
+], BI = L(["SELECT [ALL | DISTINCT]"]), uI = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -17222,24 +17250,24 @@ const YS = [
   "USE SCHEMA",
   "USE SECONDARY ROLES",
   "USE WAREHOUSE"
-]), HI = L(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), BI = L([
+]), FI = L(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), YI = L([
   "[INNER] JOIN",
   "[NATURAL] {LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{CROSS | NATURAL} JOIN"
-]), uI = L([
+]), mI = L([
   "{ROWS | RANGE} BETWEEN",
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]"
-]), FI = {
+]), pI = {
   name: "snowflake",
   tokenizerOptions: {
-    reservedSelect: cI,
-    reservedClauses: [...lI, ...rT, ...uE],
-    reservedSetOperations: HI,
-    reservedJoins: BI,
-    reservedPhrases: uI,
-    reservedKeywords: UI,
-    reservedDataTypes: GI,
-    reservedFunctionNames: MI,
+    reservedSelect: BI,
+    reservedClauses: [...uI, ...rT, ...uE],
+    reservedSetOperations: FI,
+    reservedJoins: YI,
+    reservedPhrases: mI,
+    reservedKeywords: lI,
+    reservedDataTypes: HI,
+    reservedFunctionNames: cI,
     stringTypes: ["$$", "''-qq-bs"],
     identTypes: ['""-qq'],
     variableTypes: [
@@ -17272,49 +17300,49 @@ const YS = [
     onelineClauses: [...rT, ...uE],
     tabularOnelineClauses: uE
   }
-}, YI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, dI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  bigquery: GR,
-  db2: WR,
-  db2i: wR,
-  duckdb: EA,
-  hive: CA,
-  mariadb: PA,
-  mysql: BA,
-  n1ql: wA,
-  plsql: ES,
-  postgresql: tS,
-  redshift: oS,
-  singlestoredb: aI,
-  snowflake: FI,
-  spark: uS,
-  sql: vS,
-  sqlite: XS,
-  tidb: WA,
-  transactsql: sI,
-  trino: RI
-}, Symbol.toStringTag, { value: "Module" })), k = (T) => T[T.length - 1], uT = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), j = (T) => T.replace(/\s+/gu, " "), FE = (T) => /\n/.test(T), V = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), nT = /\s+/uy, g = (T) => new RegExp(`(?:${T})`, "uy"), mI = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), pI = (T) => T + "(?:-" + T + ")*", dI = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(mI).join("|")}${E ? "" : "|"})`, VI = (T) => new RegExp(`(?:${T.map(V).join("|")}).*?(?=\r
+  bigquery: HR,
+  db2: bR,
+  db2i: QR,
+  duckdb: AA,
+  hive: LA,
+  mariadb: MA,
+  mysql: YA,
+  n1ql: QA,
+  plsql: AS,
+  postgresql: _S,
+  redshift: US,
+  singlestoredb: GI,
+  snowflake: pI,
+  spark: mS,
+  sql: kS,
+  sqlite: yS,
+  tidb: bA,
+  transactsql: rI,
+  trino: II
+}, Symbol.toStringTag, { value: "Module" })), k = (T) => T[T.length - 1], YT = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), j = (T) => T.replace(/\s+/gu, " "), FE = (T) => /\n/.test(T), V = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), nT = /\s+/uy, g = (T) => new RegExp(`(?:${T})`, "uy"), VI = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), hI = (T) => T + "(?:-" + T + ")*", WI = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(VI).join("|")}${E ? "" : "|"})`, fI = (T) => new RegExp(`(?:${T.map(V).join("|")}).*?(?=\r
 |\r|
 |$)`, "uy"), DT = (T, E = []) => {
   const R = T === "open" ? 0 : 1, A = ["()", ...E].map((S) => S[R]);
   return g(A.map(V).join("|"));
-}, iT = (T) => g(`${uT(T).map(V).join("|")}`), hI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", X = (T, E = {}) => {
+}, iT = (T) => g(`${YT(T).map(V).join("|")}`), XI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", X = (T, E = {}) => {
   if (T.length === 0)
     return /^\b$/u;
-  const R = hI(E), A = uT(T).map(V).join("|").replace(/ /gu, "\\s+");
+  const R = XI(E), A = YT(T).map(V).join("|").replace(/ /gu, "\\s+");
   return new RegExp(`(?:${A})${R}\\b`, "iuy");
 }, YE = (T, E) => {
   if (!T.length)
     return;
   const R = T.map(V).join("|");
   return g(`(?:${R})(?:${E})`);
-}, WI = () => {
+}, bI = () => {
   const T = {
     "<": ">",
     "[": "]",
     "(": ")",
     "{": "}"
-  }, 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(""));
+  }, E = "{left}(?:(?!{right}').)*?{right}", R = Object.entries(T).map(([e, N]) => E.replace(/{left}/g, V(e)).replace(/{right}/g, V(N))), A = V(Object.keys(T).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${A}])(?:(?!\k<tag>').)*?\k<tag>`}|${R.join("|")})'`;
 }, PT = {
   // - backtick quoted (using `` to escape)
@@ -17340,16 +17368,16 @@ const YS = [
   // Hive and Spark variables: ${name}
   "{}": String.raw`(?:\{[^\}]*\})`,
   // Oracle q'' strings: q'<text>' q'|text|' ...
-  "q''": WI()
-}, FT = (T) => typeof T == "string" ? PT[T] : "regex" in T ? T.regex : dI(T) + PT[T.quote], fI = (T) => g(T.map((E) => "regex" in E ? E.regex : FT(E)).join("|")), YT = (T) => T.map(FT).join("|"), oT = (T) => g(YT(T)), XI = (T = {}) => g(mT(T)), mT = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
-  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;
+  "q''": bI()
+}, mT = (T) => typeof T == "string" ? PT[T] : "regex" in T ? T.regex : WI(T) + PT[T.quote], KI = (T) => g(T.map((E) => "regex" in E ? E.regex : mT(E)).join("|")), pT = (T) => T.map(mT).join("|"), oT = (T) => g(pT(T)), yI = (T = {}) => g(dT(T)), dT = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
+  const S = "\\p{Alphabetic}\\p{Mark}_", I = "\\p{Decimal_Number}", e = V(T ?? ""), N = V(E ?? ""), n = A ? `[${S}${I}${e}][${S}${I}${N}]*` : `[${S}${e}][${S}${I}${N}]*`;
+  return R ? hI(n) : n;
 };
-function pT(T, E) {
+function VT(T, E) {
   const R = T.slice(0, E).split(/\n/);
   return { line: R.length, col: R[R.length - 1].length + 1 };
 }
-class bI {
+class $I {
   constructor(E, R) {
     this.rules = E, this.dialectName = R, this.input = "", this.index = 0;
   }
@@ -17375,7 +17403,7 @@ class bI {
     return R;
   }
   createParseError() {
-    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = pT(this.input, this.index);
+    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = VT(this.input, this.index);
     return new Error(`Parse error: Unexpected "${E}" at line ${R} column ${A}.
 ${this.dialectInfo()}`);
   }
@@ -17411,8 +17439,8 @@ If possible, please select a more specific dialect (like sqlite, postgresql, etc
     }
   }
 }
-const aT = /\/\*/uy, KI = /[\s\S]/uy, yI = /\*\//uy;
-class $I {
+const aT = /\/\*/uy, gI = /[\s\S]/uy, JI = /\*\//uy;
+class wI {
   constructor() {
     this.lastIndex = 0;
   }
@@ -17425,9 +17453,9 @@ class $I {
     for (; S > 0; )
       if (A = this.matchSection(aT, E))
         R += A, S++;
-      else if (A = this.matchSection(yI, E))
+      else if (A = this.matchSection(JI, E))
         R += A, S--;
-      else if (A = this.matchSection(KI, E))
+      else if (A = this.matchSection(gI, E))
         R += A;
       else
         return null;
@@ -17439,7 +17467,7 @@ class $I {
     return A && (this.lastIndex += A[0].length), A ? A[0] : null;
   }
 }
-class gI {
+class xI {
   constructor(E, R) {
     this.cfg = E, this.dialectName = R, this.rulesBeforeParams = this.buildRulesBeforeParams(E), this.rulesAfterParams = this.buildRulesAfterParams(E);
   }
@@ -17448,7 +17476,7 @@ class gI {
       ...this.rulesBeforeParams,
       ...this.buildParamRules(this.cfg, R),
       ...this.rulesAfterParams
-    ], S = new bI(A, this.dialectName).tokenize(E);
+    ], S = new $I(A, this.dialectName).tokenize(E);
     return this.cfg.postProcess ? this.cfg.postProcess(S) : S;
   }
   // These rules can be cached as they only depend on
@@ -17462,11 +17490,11 @@ class gI {
       },
       {
         type: D.BLOCK_COMMENT,
-        regex: E.nestedBlockComments ? new $I() : /(\/\*[^]*?\*\/)/uy
+        regex: E.nestedBlockComments ? new wI() : /(\/\*[^]*?\*\/)/uy
       },
       {
         type: D.LINE_COMMENT,
-        regex: VI((R = E.lineCommentTypes) !== null && R !== void 0 ? R : ["--"])
+        regex: fI((R = E.lineCommentTypes) !== null && R !== void 0 ? R : ["--"])
       },
       {
         type: D.QUOTED_IDENTIFIER,
@@ -17583,12 +17611,12 @@ class gI {
     return this.validRules([
       {
         type: D.VARIABLE,
-        regex: E.variableTypes ? fI(E.variableTypes) : void 0
+        regex: E.variableTypes ? KI(E.variableTypes) : void 0
       },
       { type: D.STRING, regex: oT(E.stringTypes) },
       {
         type: D.IDENTIFIER,
-        regex: XI(E.identChars)
+        regex: yI(E.identChars)
       },
       { type: D.DELIMITER, regex: /[;]/uy },
       { type: D.COMMA, regex: /[,]/y },
@@ -17627,24 +17655,24 @@ 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, e;
+    var A, S, I, e, N;
     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) || ((e = E.paramTypes) === null || e === void 0 ? void 0 : e.custom) || []
+      positional: typeof (R == null ? void 0 : R.positional) == "boolean" ? R.positional : (e = E.paramTypes) === null || e === void 0 ? void 0 : e.positional,
+      custom: (R == null ? void 0 : R.custom) || ((N = E.paramTypes) === null || N === void 0 ? void 0 : N.custom) || []
     };
     return this.validRules([
       {
         type: D.NAMED_PARAMETER,
-        regex: YE(n.named, mT(E.paramChars || E.identChars)),
+        regex: YE(n.named, dT(E.paramChars || E.identChars)),
         key: (O) => O.slice(1)
       },
       {
         type: D.QUOTED_PARAMETER,
-        regex: YE(n.quoted, YT(E.identTypes)),
-        key: (O) => (({ tokenKey: t, quoteChar: C }) => t.replace(new RegExp(V("\\" + C), "gu"), C))({
+        regex: YE(n.quoted, pT(E.identTypes)),
+        key: (O) => (({ tokenKey: s, quoteChar: t }) => s.replace(new RegExp(V("\\" + t), "gu"), t))({
           tokenKey: O.slice(2, -1),
           quoteChar: O.slice(-1)
         })
@@ -17659,11 +17687,11 @@ class gI {
         regex: n.positional ? /[?]/y : void 0
       },
       ...n.custom.map((O) => {
-        var t;
+        var s;
         return {
           type: D.CUSTOM_PARAMETER,
           regex: g(O.regex),
-          key: (t = O.key) !== null && t !== void 0 ? t : (C) => C
+          key: (s = O.key) !== null && s !== void 0 ? s : (t) => t
         };
       })
     ]);
@@ -17673,13 +17701,13 @@ class gI {
     return E.filter((R) => !!R.regex);
   }
 }
-const F = (T) => j(T.toUpperCase()), MT = /* @__PURE__ */ new Map(), JI = (T) => {
+const F = (T) => j(T.toUpperCase()), MT = /* @__PURE__ */ new Map(), vI = (T) => {
   let E = MT.get(T);
-  return E || (E = wI(T), MT.set(T, E)), E;
-}, wI = (T) => ({
-  tokenizer: new gI(T.tokenizerOptions, T.name),
-  formatOptions: xI(T.formatOptions)
-}), xI = (T) => {
+  return E || (E = QI(T), MT.set(T, E)), E;
+}, QI = (T) => ({
+  tokenizer: new xI(T.tokenizerOptions, T.name),
+  formatOptions: ZI(T.formatOptions)
+}), ZI = (T) => {
   var E;
   return {
     alwaysDenseOperators: T.alwaysDenseOperators || [],
@@ -17687,13 +17715,13 @@ const F = (T) => j(T.toUpperCase()), MT = /* @__PURE__ */ new Map(), JI = (T) =>
     tabularOnelineClauses: Object.fromEntries(((E = T.tabularOnelineClauses) !== null && E !== void 0 ? E : T.onelineClauses).map((R) => [R, !0]))
   };
 };
-function vI(T) {
+function kI(T) {
   return T.indentStyle === "tabularLeft" || T.indentStyle === "tabularRight" ? " ".repeat(10) : T.useTabs ? "	" : " ".repeat(T.tabWidth);
 }
 function v(T) {
   return T.indentStyle === "tabularLeft" || T.indentStyle === "tabularRight";
 }
-class QI {
+class qI {
   constructor(E) {
     this.params = E, this.index = 0;
   }
@@ -17716,47 +17744,47 @@ class QI {
     this.index = E;
   }
 }
-var ZI = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
-function kI(T) {
+var jI = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
+function zI(T) {
   return T && T.__esModule && Object.prototype.hasOwnProperty.call(T, "default") ? T.default : T;
 }
-var dT = { exports: {} };
+var hT = { exports: {} };
 (function(T) {
   (function(E, R) {
     T.exports ? T.exports = R() : E.nearley = R();
-  })(ZI, function() {
-    function E(O, t, C) {
-      return this.id = ++E.highestId, this.name = O, this.symbols = t, this.postprocess = C, this;
+  })(jI, function() {
+    function E(O, s, t) {
+      return this.id = ++E.highestId, this.name = O, this.symbols = s, this.postprocess = t, this;
     }
     E.highestId = 0, E.prototype.toString = function(O) {
-      var t = 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 + " → " + 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, C, s) {
-      this.rule = O, this.dot = t, this.reference = C, this.data = [], this.wantedBy = s, this.isComplete = this.dot === O.symbols.length;
+    function R(O, s, t, C) {
+      this.rule = O, this.dot = s, this.reference = t, this.data = [], this.wantedBy = C, 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));
+      this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, e.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, C = this.wants, s = this.completed, i = 0; i < t.length; i++) {
-        var a = t[i];
+      for (var s = this.states, t = this.wants, C = this.completed, i = 0; i < s.length; i++) {
+        var a = s[i];
         if (a.isComplete) {
-          if (a.finish(), a.data !== N.fail) {
+          if (a.finish(), a.data !== e.fail) {
             for (var U = a.wantedBy, o = U.length; o--; ) {
               var G = U[o];
               this.complete(G, a);
@@ -17772,45 +17800,45 @@ var dT = { exports: {} };
             this.scannable.push(a);
             continue;
           }
-          if (C[P]) {
-            if (C[P].push(a), s.hasOwnProperty(P))
-              for (var H = s[P], o = 0; o < H.length; o++) {
+          if (t[P]) {
+            if (t[P].push(a), C.hasOwnProperty(P))
+              for (var H = C[P], o = 0; o < H.length; o++) {
                 var l = H[o];
                 this.complete(a, l);
               }
           } else
-            C[P] = [a], this.predict(P);
+            t[P] = [a], this.predict(P);
         }
       }
     }, A.prototype.predict = function(O) {
-      for (var t = this.grammar.byName[O] || [], C = 0; C < t.length; C++) {
-        var s = t[C], i = this.wants[O], a = new R(s, 0, this.index, i);
+      for (var s = this.grammar.byName[O] || [], t = 0; t < s.length; t++) {
+        var C = s[t], i = this.wants[O], a = new R(C, 0, this.index, i);
         this.states.push(a);
       }
-    }, A.prototype.complete = function(O, t) {
-      var C = O.nextState(t);
-      this.states.push(C);
+    }, A.prototype.complete = function(O, s) {
+      var t = O.nextState(s);
+      this.states.push(t);
     };
-    function S(O, t) {
-      this.rules = O, this.start = t || this.rules[0].name;
-      var C = this.byName = {};
-      this.rules.forEach(function(s) {
-        C.hasOwnProperty(s.name) || (C[s.name] = []), C[s.name].push(s);
+    function S(O, s) {
+      this.rules = O, this.start = s || this.rules[0].name;
+      var t = this.byName = {};
+      this.rules.forEach(function(C) {
+        t.hasOwnProperty(C.name) || (t[C.name] = []), t[C.name].push(C);
       });
     }
-    S.fromCompiled = function(s, t) {
-      var C = s.Lexer;
-      s.ParserStart && (t = s.ParserStart, s = s.ParserRules);
-      var s = s.map(function(a) {
+    S.fromCompiled = function(C, s) {
+      var t = C.Lexer;
+      C.ParserStart && (s = C.ParserStart, C = C.ParserRules);
+      var C = C.map(function(a) {
         return new E(a.name, a.symbols, a.postprocess);
-      }), i = new S(s, t);
-      return i.lexer = C, i;
+      }), i = new S(C, s);
+      return i.lexer = t, 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++];
@@ -17822,144 +17850,144 @@ var dT = { exports: {} };
         line: this.line,
         col: this.index - this.lastLineBreak
       };
-    }, I.prototype.formatError = function(O, t) {
-      var C = this.buffer;
-      if (typeof C == "string") {
-        var s = C.split(`
+    }, I.prototype.formatError = function(O, s) {
+      var t = this.buffer;
+      if (typeof t == "string") {
+        var C = t.split(`
 `).slice(
           Math.max(0, this.line - 5),
           this.line
-        ), i = C.indexOf(`
+        ), i = t.indexOf(`
 `, this.index);
-        i === -1 && (i = C.length);
+        i === -1 && (i = t.length);
         var a = this.index - this.lastLineBreak, U = String(this.line).length;
-        return t += " at line " + this.line + " col " + a + `:
+        return s += " at line " + this.line + " col " + a + `:
 
-`, t += s.map(function(G, P) {
-          return o(this.line - s.length + P + 1, U) + " " + G;
+`, s += C.map(function(G, P) {
+          return o(this.line - C.length + P + 1, U) + " " + G;
         }, this).join(`
-`), t += `
+`), s += `
 ` + o("", U + a) + `^
-`, t;
+`, 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, C) {
+    function e(O, s, t) {
       if (O instanceof S)
-        var s = O, C = t;
+        var C = O, t = s;
       else
-        var s = S.fromCompiled(O, t);
-      this.grammar = s, this.options = {
+        var C = S.fromCompiled(O, s);
+      this.grammar = C, this.options = {
         keepHistory: !1,
-        lexer: s.lexer || new I()
+        lexer: C.lexer || new I()
       };
-      for (var i in C || {})
-        this.options[i] = C[i];
+      for (var i in t || {})
+        this.options[i] = t[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(C, 0);
+      this.table = [a], a.wants[C.start] = [], a.predict(C.start), a.process(), this.current = 0;
     }
-    N.fail = {}, N.prototype.feed = function(O) {
-      var t = this.lexer;
-      t.reset(O, this.lexerState);
-      for (var C; ; ) {
+    e.fail = {}, e.prototype.feed = function(O) {
+      var s = this.lexer;
+      s.reset(O, this.lexerState);
+      for (var t; ; ) {
         try {
-          if (C = t.next(), !C)
+          if (t = s.next(), !t)
             break;
         } catch (p) {
           var U = new A(this.grammar, this.current + 1);
           this.table.push(U);
-          var s = new Error(this.reportLexerError(p));
-          throw s.offset = this.current, s.token = p.token, s;
+          var C = new Error(this.reportLexerError(p));
+          throw C.offset = this.current, C.token = p.token, C;
         }
         var i = this.table[this.current];
         this.options.keepHistory || delete this.table[this.current - 1];
         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 = t.constructor === I ? C.value : C, P = i.scannable, H = P.length; H--; ) {
+        for (var o = t.text !== void 0 ? t.text : t.value, G = s.constructor === I ? t.value : t, 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 === C.type : B.literal === o) {
-            var u = l.nextState({ data: G, token: C, isToken: !0, reference: a - 1 });
+          if (B.test ? B.test(G) : B.type ? B.type === t.type : B.literal === o) {
+            var u = l.nextState({ data: G, token: t, isToken: !0, reference: a - 1 });
             U.states.push(u);
           }
         }
         if (U.process(), U.states.length === 0) {
-          var s = new Error(this.reportError(C));
-          throw s.offset = this.current, s.token = C, s;
+          var C = new Error(this.reportError(t));
+          throw C.offset = this.current, C.token = t, C;
         }
-        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;
-    }, N.prototype.reportLexerError = function(O) {
-      var t, C, s = O.token;
-      return s ? (t = "input " + JSON.stringify(s.text[0]) + " (lexer error)", C = this.lexer.formatError(s, "Syntax error")) : (t = "input (lexer error)", C = O.message), this.reportErrorCommon(C, t);
-    }, N.prototype.reportError = function(O) {
-      var t = (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, t);
-    }, N.prototype.reportErrorCommon = function(O, t) {
-      var C = [];
-      C.push(O);
-      var s = this.table.length - 2, i = this.table[s], a = i.states.filter(function(o) {
+      return i && (this.lexerState = s.save()), this.results = this.finish(), this;
+    }, e.prototype.reportLexerError = function(O) {
+      var s, t, C = O.token;
+      return C ? (s = "input " + JSON.stringify(C.text[0]) + " (lexer error)", t = this.lexer.formatError(C, "Syntax error")) : (s = "input (lexer error)", t = O.message), this.reportErrorCommon(t, s);
+    }, e.prototype.reportError = function(O) {
+      var s = (O.type ? O.type + " token: " : "") + JSON.stringify(O.value !== void 0 ? O.value : O), t = this.lexer.formatError(O, "Syntax error");
+      return this.reportErrorCommon(t, s);
+    }, e.prototype.reportErrorCommon = function(O, s) {
+      var t = [];
+      t.push(O);
+      var C = this.table.length - 2, i = this.table[C], a = i.states.filter(function(o) {
         var G = o.rule.symbols[o.dot];
         return G && typeof G != "string";
       });
       if (a.length === 0)
-        C.push("Unexpected " + t + `. I did not expect any more input. Here is the state of my parse table:
-`), this.displayStateStack(i.states, C);
+        t.push("Unexpected " + s + `. I did not expect any more input. Here is the state of my parse table:
+`), this.displayStateStack(i.states, t);
       else {
-        C.push("Unexpected " + t + `. Instead, I was expecting to see one of the following:
+        t.push("Unexpected " + s + `. Instead, I was expecting to see one of the following:
 `);
         var U = a.map(function(o) {
           return this.buildFirstStateStack(o, []) || [o];
         }, this);
         U.forEach(function(o) {
           var G = o[0], P = G.rule.symbols[G.dot], H = this.getSymbolDisplay(P);
-          C.push("A " + H + " based on:"), this.displayStateStack(o, C);
+          t.push("A " + H + " based on:"), this.displayStateStack(o, t);
         }, this);
       }
-      return C.push(""), C.join(`
+      return t.push(""), t.join(`
 `);
-    }, N.prototype.displayStateStack = function(O, t) {
-      for (var C, s = 0, i = 0; i < O.length; i++) {
+    }, e.prototype.displayStateStack = function(O, s) {
+      for (var t, C = 0, i = 0; i < O.length; i++) {
         var a = O[i], U = a.rule.toString(a.dot);
-        U === C ? s++ : (s > 0 && t.push("    ^ " + s + " more lines identical to this"), s = 0, t.push("    " + U)), C = U;
+        U === t ? C++ : (C > 0 && s.push("    ^ " + C + " more lines identical to this"), C = 0, s.push("    " + U)), t = U;
       }
-    }, N.prototype.getSymbolDisplay = function(O) {
-      return e(O);
-    }, N.prototype.buildFirstStateStack = function(O, t) {
-      if (t.indexOf(O) !== -1)
+    }, e.prototype.getSymbolDisplay = function(O) {
+      return N(O);
+    }, e.prototype.buildFirstStateStack = function(O, s) {
+      if (s.indexOf(O) !== -1)
         return null;
       if (O.wantedBy.length === 0)
         return [O];
-      var C = O.wantedBy[0], s = [O].concat(t), i = this.buildFirstStateStack(C, s);
+      var t = O.wantedBy[0], C = [O].concat(s), i = this.buildFirstStateStack(t, C);
       return i === null ? null : [O].concat(i);
-    }, N.prototype.save = function() {
+    }, e.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();
-    }, N.prototype.rewind = function(O) {
+    }, e.prototype.restore = function(O) {
+      var s = O.index;
+      this.current = s, this.table[s] = O, this.table.splice(s + 1), this.lexerState = O.lexerState, this.results = this.finish();
+    }, e.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, C = this.table[this.table.length - 1];
-      return C.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;
+    }, e.prototype.finish = function() {
+      var O = [], s = this.grammar.start, t = this.table[this.table.length - 1];
+      return t.states.forEach(function(C) {
+        C.rule.name === s && C.dot === C.rule.symbols.length && C.reference === 0 && C.data !== e.fail && O.push(C);
+      }), O.map(function(C) {
+        return C.data;
       });
     };
-    function e(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)
@@ -17972,10 +18000,10 @@ var dT = { exports: {} };
       }
     }
     function n(O) {
-      var t = typeof O;
-      if (t === "string")
+      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)
@@ -17988,20 +18016,20 @@ var dT = { exports: {} };
       }
     }
     return {
-      Parser: N,
+      Parser: e,
       Grammar: S,
       Rule: E
     };
   });
-})(dT);
-var qI = dT.exports;
-const jI = /* @__PURE__ */ kI(qI);
-function zI(T) {
-  return T.map(EO).map(TO).map(RO).map(AO).map(SO);
+})(hT);
+var EO = hT.exports;
+const TO = /* @__PURE__ */ zI(EO);
+function RO(T) {
+  return T.map(AO).map(SO).map(IO).map(OO).map(eO);
 }
-const EO = (T, E, R) => {
-  if (BT(T.type)) {
-    const A = IO(R, E);
+const AO = (T, E, R) => {
+  if (FT(T.type)) {
+    const A = NO(R, E);
     if (A && A.type === D.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
     const S = Z(R, E);
@@ -18009,41 +18037,41 @@ const EO = (T, E, R) => {
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
-}, TO = (T, E, R) => {
+}, SO = (T, E, R) => {
   if (T.type === D.RESERVED_FUNCTION_NAME) {
     const A = Z(R, E);
-    if (!A || !VT(A))
+    if (!A || !WT(A))
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
-}, RO = (T, E, R) => {
+}, IO = (T, E, R) => {
   if (T.type === D.RESERVED_DATA_TYPE) {
     const A = Z(R, E);
-    if (A && VT(A))
+    if (A && WT(A))
       return Object.assign(Object.assign({}, T), { type: D.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return T;
-}, AO = (T, E, R) => {
+}, OO = (T, E, R) => {
   if (T.type === D.IDENTIFIER) {
     const A = Z(R, E);
-    if (A && hT(A))
+    if (A && fT(A))
       return Object.assign(Object.assign({}, T), { type: D.ARRAY_IDENTIFIER });
   }
   return T;
-}, SO = (T, E, R) => {
+}, eO = (T, E, R) => {
   if (T.type === D.RESERVED_DATA_TYPE) {
     const A = Z(R, E);
-    if (A && hT(A))
+    if (A && fT(A))
       return Object.assign(Object.assign({}, T), { type: D.ARRAY_KEYWORD });
   }
   return T;
-}, IO = (T, E) => Z(T, E, -1), Z = (T, E, R = 1) => {
+}, NO = (T, E) => Z(T, E, -1), Z = (T, E, R = 1) => {
   let A = 1;
-  for (; T[E + A * R] && OO(T[E + A * R]); )
+  for (; T[E + A * R] && tO(T[E + A * R]); )
     A++;
   return T[E + A * R];
-}, VT = (T) => T.type === D.OPEN_PAREN && T.text === "(", hT = (T) => T.type === D.OPEN_PAREN && T.text === "[", OO = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
-class WT {
+}, WT = (T) => T.type === D.OPEN_PAREN && T.text === "(", fT = (T) => T.type === D.OPEN_PAREN && T.text === "[", tO = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
+class XT {
   constructor(E) {
     this.tokenize = E, this.index = 0, this.tokens = [], this.input = "";
   }
@@ -18056,7 +18084,7 @@ class WT {
   save() {
   }
   formatError(E) {
-    const { line: R, col: A } = pT(this.input, E.start);
+    const { line: R, col: A } = VT(this.input, E.start);
     return `Parse error at token: ${E.text} at line ${R} column ${A}`;
   }
   has(E) {
@@ -18070,7 +18098,7 @@ var M;
 function mE(T) {
   return T[0];
 }
-const c = new WT((T) => []), b = ([[T]]) => T, Y = (T) => ({
+const c = new XT((T) => []), b = ([[T]]) => T, Y = (T) => ({
   type: M.keyword,
   tokenType: T.type,
   text: T.text,
@@ -18079,7 +18107,7 @@ const c = new WT((T) => []), b = ([[T]]) => T, Y = (T) => ({
   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 }) => {
+}), 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), sO = (T, { leading: E, trailing: R }) => {
   if (E != null && E.length) {
     const [A, ...S] = T;
     T = [m(A, { leading: E }), ...S];
@@ -18089,7 +18117,7 @@ const c = new WT((T) => []), b = ([[T]]) => T, Y = (T) => ({
     T = [...A, m(S, { trailing: R })];
   }
   return T;
-}, eO = {
+}, CO = {
   Lexer: c,
   ParserRules: [
     { name: "main$ebnf$1", symbols: [] },
@@ -18351,12 +18379,12 @@ const c = new WT((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]) => ({
+      postprocess: ([T, E, R, A, S, I, e]) => ({
         type: M.between_predicate,
         betweenKw: Y(T),
-        expr1: NO(R, { leading: E, trailing: A }),
+        expr1: sO(R, { leading: E, trailing: A }),
         andKw: Y(S),
-        expr2: [m(N, { leading: I })]
+        expr2: [m(e, { leading: I })]
       })
     },
     { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: mE },
@@ -18485,21 +18513,21 @@ const c = new WT((T) => []), b = ([[T]]) => T, Y = (T) => ({
     }
   ],
   ParserStart: "main"
-}, { Parser: CO, Grammar: tO } = jI;
-function sO(T) {
+}, { Parser: LO, Grammar: _O } = TO;
+function rO(T) {
   let E = {};
-  const R = new WT((S) => [
-    ...zI(T.tokenize(S, E)),
-    HT(S.length)
-  ]), A = new CO(tO.fromCompiled(eO), { lexer: R });
+  const R = new XT((S) => [
+    ...RO(T.tokenize(S, E)),
+    uT(S.length)
+  ]), A = new LO(_O.fromCompiled(CO), { lexer: R });
   return {
     parse: (S, I) => {
       E = I;
-      const { results: N } = A.feed(S);
-      if (N.length === 1)
-        return N[0];
-      throw N.length === 0 ? new Error("Parse error: Invalid SQL") : new Error(`Parse error: Ambiguous grammar
-${JSON.stringify(N, void 0, 2)}`);
+      const { results: e } = A.feed(S);
+      if (e.length === 1)
+        return e[0];
+      throw e.length === 0 ? new Error("Parse error: Invalid SQL") : new Error(`Parse error: Ambiguous grammar
+${JSON.stringify(e, void 0, 2)}`);
     }
   };
 }
@@ -18507,7 +18535,7 @@ var r;
 (function(T) {
   T[T.SPACE = 0] = "SPACE", T[T.NO_SPACE = 1] = "NO_SPACE", T[T.NO_NEWLINE = 2] = "NO_NEWLINE", T[T.NEWLINE = 3] = "NEWLINE", T[T.MANDATORY_NEWLINE = 4] = "MANDATORY_NEWLINE", T[T.INDENT = 5] = "INDENT", T[T.SINGLE_INDENT = 6] = "SINGLE_INDENT";
 })(r = r || (r = {}));
-class fT {
+class bT {
   constructor(E) {
     this.indentation = E, this.items = [];
   }
@@ -18543,11 +18571,11 @@ class fT {
       }
   }
   trimHorizontalWhitespace() {
-    for (; LO(k(this.items)); )
+    for (; nO(k(this.items)); )
       this.items.pop();
   }
   trimWhitespace() {
-    for (; _O(k(this.items)); )
+    for (; DO(k(this.items)); )
       this.items.pop();
   }
   addNewline(E) {
@@ -18594,7 +18622,7 @@ class fT {
     }
   }
 }
-const LO = (T) => T === r.SPACE || T === r.SINGLE_INDENT, _O = (T) => T === r.SPACE || T === r.SINGLE_INDENT || T === r.NEWLINE;
+const nO = (T) => T === r.SPACE || T === r.SINGLE_INDENT, DO = (T) => T === r.SPACE || T === r.SINGLE_INDENT || T === r.NEWLINE;
 function GT(T, E) {
   if (E === "standard")
     return T;
@@ -18602,10 +18630,10 @@ function GT(T, E) {
   return T.length >= 10 && T.includes(" ") && ([T, ...R] = T.split(" ")), E === "tabularLeft" ? T = T.padEnd(9, " ") : T = T.padStart(9, " "), T + ["", ...R].join(" ");
 }
 function cT(T) {
-  return rR(T) || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.LIMIT;
+  return iR(T) || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.LIMIT;
 }
-const pE = "top-level", rO = "block-level";
-class XT {
+const pE = "top-level", iO = "block-level";
+class KT {
   /**
    * @param {string} indent A string to indent with
    */
@@ -18634,7 +18662,7 @@ class XT {
    * Increases indentation by one block-level indent.
    */
   increaseBlockLevel() {
-    this.indentTypes.push(rO);
+    this.indentTypes.push(iO);
   }
   /**
    * Decreases indentation by one top-level indent.
@@ -18653,9 +18681,9 @@ class XT {
       ;
   }
 }
-class nO extends fT {
+class PO extends bT {
   constructor(E) {
-    super(new XT("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
+    super(new KT("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
   }
   add(...E) {
     if (E.forEach((R) => this.addToLength(R)), this.length > this.expressionWidth)
@@ -18897,7 +18925,7 @@ class TE {
         cfg: this.cfg,
         dialectCfg: this.dialectCfg,
         params: this.params,
-        layout: new nO(this.cfg.expressionWidth),
+        layout: new PO(this.cfg.expressionWidth),
         inline: !0
       }).format(E);
     } catch (A) {
@@ -18983,9 +19011,9 @@ class TE {
     }
   }
 }
-class DO {
+class oO {
   constructor(E, R) {
-    this.dialect = E, this.cfg = R, this.params = new QI(this.cfg.params);
+    this.dialect = E, this.cfg = R, this.params = new qI(this.cfg.params);
   }
   /**
    * Formats an SQL query.
@@ -18997,7 +19025,7 @@ class DO {
     return this.formatAst(R).trimEnd();
   }
   parse(E) {
-    return sO(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
+    return rO(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
   }
   formatAst(E) {
     return E.map((R) => this.formatStatement(R)).join(`
@@ -19008,14 +19036,14 @@ class DO {
       cfg: this.cfg,
       dialectCfg: this.dialect.formatOptions,
       params: this.params,
-      layout: new fT(new XT(vI(this.cfg)))
+      layout: new bT(new KT(kI(this.cfg)))
     }).format(E.children);
     return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? R.add(r.NEWLINE, ";") : R.add(r.NO_NEWLINE, ";")), R.toString();
   }
 }
 class z extends Error {
 }
-function iO(T) {
+function aO(T) {
   const E = [
     "multilineLists",
     "newlineBeforeOpenParen",
@@ -19029,17 +19057,17 @@ function iO(T) {
       throw new z(`${R} config is no more supported.`);
   if (T.expressionWidth <= 0)
     throw new z(`expressionWidth config must be positive number. Received ${T.expressionWidth} instead.`);
-  if (T.params && !PO(T.params) && console.warn('WARNING: All "params" option values should be strings.'), T.paramTypes && !oO(T.paramTypes))
+  if (T.params && !MO(T.params) && console.warn('WARNING: All "params" option values should be strings.'), T.paramTypes && !UO(T.paramTypes))
     throw new z("Empty regex given in custom paramTypes. That would result in matching infinite amount of parameters.");
   return T;
 }
-function PO(T) {
+function MO(T) {
   return (T instanceof Array ? T : Object.values(T)).every((R) => typeof R == "string");
 }
-function oO(T) {
+function UO(T) {
   return T.custom && Array.isArray(T.custom) ? T.custom.every((E) => E.regex !== "") : !0;
 }
-var aO = function(T, E) {
+var GO = function(T, E) {
   var R = {};
   for (var A in T) Object.prototype.hasOwnProperty.call(T, A) && E.indexOf(A) < 0 && (R[A] = T[A]);
   if (T != null && typeof Object.getOwnPropertySymbols == "function")
@@ -19047,7 +19075,7 @@ var aO = function(T, E) {
       E.indexOf(A[S]) < 0 && Object.prototype.propertyIsEnumerable.call(T, A[S]) && (R[A[S]] = T[A[S]]);
   return R;
 };
-const bT = {
+const yT = {
   bigquery: "bigquery",
   db2: "db2",
   db2i: "db2i",
@@ -19068,7 +19096,7 @@ const bT = {
   tsql: "transactsql",
   singlestoredb: "singlestoredb",
   snowflake: "snowflake"
-}, MO = Object.keys(bT), UO = {
+}, cO = Object.keys(yT), lO = {
   tabWidth: 2,
   useTabs: !1,
   keywordCase: "preserve",
@@ -19081,25 +19109,27 @@ const bT = {
   linesBetweenQueries: 1,
   denseOperators: !1,
   newlineBeforeSemicolon: !1
-}, GO = (T, E = {}) => {
-  if (typeof E.language == "string" && !MO.includes(E.language))
+}, HO = (T, E = {}) => {
+  if (typeof E.language == "string" && !cO.includes(E.language))
     throw new z(`Unsupported SQL dialect: ${E.language}`);
-  const R = bT[E.language || "sql"];
-  return cO(T, Object.assign(Object.assign({}, E), { dialect: YI[R] }));
-}, cO = (T, E) => {
-  var { dialect: R } = E, A = aO(E, ["dialect"]);
+  const R = yT[E.language || "sql"];
+  return BO(T, Object.assign(Object.assign({}, E), { dialect: dI[R] }));
+}, BO = (T, E) => {
+  var { dialect: R } = E, A = GO(E, ["dialect"]);
   if (typeof T != "string")
     throw new Error("Invalid query argument. Expected string, instead got " + typeof T);
-  const S = iO(Object.assign(Object.assign({}, UO), A));
-  return new DO(JI(R), S).format(T);
+  const S = aO(Object.assign(Object.assign({}, lO), A));
+  return new oO(vI(R), S).format(T);
 };
 function lT(T, E) {
   try {
-    return GO(T, {
+    return HO(T, {
       language: {
         postgres: "postgresql",
         mysql: "mysql",
-        sqlite: "sqlite"
+        sqlite: "sqlite",
+        singlestore: "mysql"
+        // SingleStore uses MySQL dialect for formatting
       }[E],
       tabWidth: 2,
       keywordCase: "upper",
@@ -19178,7 +19208,7 @@ class bE {
   async execute(E, R) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new tE(this.dbExecutor).execute(this.cubes, E, R);
+    return new sE(this.dbExecutor).execute(this.cubes, E, R);
   }
   /**
    * Execute a multi-cube query
@@ -19205,6 +19235,22 @@ class bE {
     const R = Array.from(this.cubes.values()).map((A) => this.generateCubeMetadata(A));
     return this.metadataCache = R, this.metadataCacheTimestamp = E, R;
   }
+  /**
+   * Extract column name from Drizzle column reference
+   * Handles different column types and extracts the actual column name
+   */
+  getColumnName(E) {
+    if (E && E.name || E && E.columnType && E.name)
+      return E.name;
+    if (typeof E == "string")
+      return E;
+    if (E && typeof E == "object") {
+      if (E._.name) return E._.name;
+      if (E.name) return E.name;
+      if (E.columnName) return E.columnName;
+    }
+    return "unknown_column";
+  }
   /**
    * Generate cube metadata for API responses from cubes
    * Optimized version that minimizes object iterations
@@ -19212,37 +19258,51 @@ class bE {
   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 e = R[N], n = E.measures[e];
+      const n = R[N], O = E.measures[n];
       S[N] = {
-        name: `${E.name}.${e}`,
-        title: n.title || e,
-        shortTitle: n.title || e,
-        type: n.type,
+        name: `${E.name}.${n}`,
+        title: O.title || n,
+        shortTitle: O.title || n,
+        type: O.type,
         format: void 0,
         // Measure doesn't have format field
-        description: n.description
+        description: O.description
       };
     }
     for (let N = 0; N < A.length; N++) {
-      const e = A[N], n = E.dimensions[e];
+      const n = A[N], O = E.dimensions[n];
       I[N] = {
-        name: `${E.name}.${e}`,
-        title: n.title || e,
-        shortTitle: n.title || e,
-        type: n.type,
+        name: `${E.name}.${n}`,
+        title: O.title || n,
+        shortTitle: O.title || n,
+        type: O.type,
         format: void 0,
         // Dimension doesn't have format field
-        description: n.description
+        description: O.description
       };
     }
+    const e = [];
+    if (E.joins)
+      for (const [, N] of Object.entries(E.joins)) {
+        const n = typeof N.targetCube == "function" ? N.targetCube() : N.targetCube;
+        e.push({
+          targetCube: n.name,
+          relationship: N.relationship,
+          joinFields: N.on.map((O) => ({
+            sourceField: this.getColumnName(O.source),
+            targetField: this.getColumnName(O.target)
+          }))
+        });
+      }
     return {
       name: E.name,
       title: E.title || E.name,
       description: E.description,
       measures: S,
       dimensions: I,
-      segments: []
+      segments: [],
       // Add segments support later if needed
+      relationships: e.length > 0 ? e : void 0
     };
   }
   /**
@@ -19254,10 +19314,10 @@ class bE {
       throw new Error(`Cube '${E}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const N = await new tE(this.dbExecutor).generateSQL(S, R, A), e = this.dbExecutor.getEngineType();
+    const e = await new sE(this.dbExecutor).generateSQL(S, R, A), N = this.dbExecutor.getEngineType();
     return {
-      sql: lT(N.sql, e),
-      params: N.params
+      sql: lT(e.sql, N),
+      params: e.params
     };
   }
   /**
@@ -19266,7 +19326,7 @@ class bE {
   async generateMultiCubeSQL(E, R) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const S = await new tE(this.dbExecutor).generateMultiCubeSQL(this.cubes, E, R), I = this.dbExecutor.getEngineType();
+    const S = await new sE(this.dbExecutor).generateMultiCubeSQL(this.cubes, E, R), I = this.dbExecutor.getEngineType();
     return {
       sql: lT(S.sql, I),
       params: S.params
@@ -19309,69 +19369,69 @@ class bE {
    * Ensures all referenced cubes and fields exist
    */
   validateQuery(E) {
-    return KT(this.cubes, E);
+    return $T(this.cubes, E);
   }
 }
-function KT(T, E) {
+function $T(T, E) {
   const R = [], A = /* @__PURE__ */ new Set();
   if (E.measures)
     for (const S of E.measures) {
-      const [I, N] = S.split(".");
-      if (!I || !N) {
+      const [I, e] = S.split(".");
+      if (!I || !e) {
         R.push(`Invalid measure format: ${S}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
       A.add(I);
-      const e = T.get(I);
-      if (!e) {
+      const N = T.get(I);
+      if (!N) {
         R.push(`Cube '${I}' not found (referenced in measure '${S}')`);
         continue;
       }
-      e.measures[N] || R.push(`Measure '${N}' not found on cube '${I}'`);
+      N.measures[e] || R.push(`Measure '${e}' not found on cube '${I}'`);
     }
   if (E.dimensions)
     for (const S of E.dimensions) {
-      const [I, N] = S.split(".");
-      if (!I || !N) {
+      const [I, e] = S.split(".");
+      if (!I || !e) {
         R.push(`Invalid dimension format: ${S}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
       A.add(I);
-      const e = T.get(I);
-      if (!e) {
+      const N = T.get(I);
+      if (!N) {
         R.push(`Cube '${I}' not found (referenced in dimension '${S}')`);
         continue;
       }
-      e.dimensions[N] || R.push(`Dimension '${N}' not found on cube '${I}'`);
+      N.dimensions[e] || R.push(`Dimension '${e}' not found on cube '${I}'`);
     }
   if (E.timeDimensions)
     for (const S of E.timeDimensions) {
-      const [I, N] = S.dimension.split(".");
-      if (!I || !N) {
+      const [I, e] = S.dimension.split(".");
+      if (!I || !e) {
         R.push(`Invalid timeDimension format: ${S.dimension}. Expected format: 'CubeName.fieldName'`);
         continue;
       }
       A.add(I);
-      const e = T.get(I);
-      if (!e) {
+      const N = T.get(I);
+      if (!N) {
         R.push(`Cube '${I}' not found (referenced in timeDimension '${S.dimension}')`);
         continue;
       }
-      e.dimensions[N] || R.push(`TimeDimension '${N}' not found on cube '${I}' (must be a dimension with time type)`);
+      N.dimensions[e] || R.push(`TimeDimension '${e}' not found on cube '${I}' (must be a dimension with time type)`);
     }
   if (E.filters)
     for (const S of E.filters)
-      yT(S, T, R, A);
+      gT(S, T, R, A);
   return A.size === 0 && R.push("Query must reference at least one cube through measures, dimensions, or filters"), {
     isValid: R.length === 0,
     errors: R
   };
 }
-function yT(T, E, R, A) {
+function gT(T, E, R, A) {
   if ("and" in T || "or" in T) {
-    const e = T.and || T.or || [];
-    for (const n of e)
-      yT(n, E, R, A);
+    const N = T.and || T.or || [];
+    for (const n of N)
+      gT(n, E, R, A);
     return;
   }
   if (!("member" in T)) {
@@ -19384,35 +19444,35 @@ function yT(T, E, R, A) {
     return;
   }
   A.add(S);
-  const N = E.get(S);
-  if (!N) {
+  const e = E.get(S);
+  if (!e) {
     R.push(`Cube '${S}' not found (referenced in filter '${T.member}')`);
     return;
   }
-  !N.dimensions[I] && !N.measures[I] && R.push(`Filter field '${I}' not found on cube '${S}' (must be a dimension or measure)`);
+  !e.dimensions[I] && !e.measures[I] && R.push(`Filter field '${I}' not found on cube '${S}' (must be a dimension or measure)`);
 }
-function YO(T) {
+function dO(T) {
   return new bE(T);
 }
-const lO = new bE(), mO = lO;
-function pO(T) {
+const uO = new bE(), VO = uO;
+function hO(T) {
   return new bE({
     drizzle: T.drizzle,
     schema: T.schema
   });
 }
-const dO = {
+const WO = {
   /**
    * Create a simple query builder
    */
   query: () => {
-    const T = (E, R = [], A = [], S = [], I, N) => ({
+    const T = (E, R = [], A = [], S = [], I, e) => ({
       measures: E,
       dimensions: R,
       filters: A,
       timeDimensions: S,
       limit: I,
-      order: N
+      order: e
     });
     return {
       measures: (E) => ({
@@ -19420,7 +19480,7 @@ const dO = {
           filters: (A = []) => ({
             timeDimensions: (S = []) => ({
               limit: (I) => ({
-                order: (N) => T(E, R, A, S, I, N)
+                order: (e) => T(E, R, A, S, I, e)
               }),
               order: (I) => T(E, R, A, S, void 0, I)
             }),
@@ -19432,7 +19492,7 @@ const dO = {
           timeDimensions: (A = []) => ({
             filters: (S = []) => ({
               limit: (I) => ({
-                order: (N) => T(E, R, S, A, I, N)
+                order: (e) => T(E, R, S, A, I, e)
               }),
               order: (I) => T(E, R, S, A, void 0, I)
             }),
@@ -19450,7 +19510,7 @@ const dO = {
           dimensions: (A = []) => ({
             timeDimensions: (S = []) => ({
               limit: (I) => ({
-                order: (N) => T(E, A, R, S, I, N)
+                order: (e) => T(E, A, R, S, I, e)
               }),
               order: (I) => T(E, A, R, S, void 0, I)
             }),
@@ -19462,7 +19522,7 @@ const dO = {
           timeDimensions: (A = []) => ({
             dimensions: (S = []) => ({
               limit: (I) => ({
-                order: (N) => T(E, S, R, A, I, N)
+                order: (e) => T(E, S, R, A, I, e)
               }),
               order: (I) => T(E, S, R, A, void 0, I)
             }),
@@ -19509,25 +19569,25 @@ const dO = {
 };
 export {
   fE as BaseDatabaseExecutor,
-  zT as MySQLExecutor,
-  jT as PostgresExecutor,
-  AR as QueryBuilder,
-  tE as QueryExecutor,
-  SR as QueryPlanner,
-  TR as SQLiteExecutor,
+  BT as MySQLExecutor,
+  ER as PostgresExecutor,
+  eR as QueryBuilder,
+  sE as QueryExecutor,
+  NR as QueryPlanner,
+  RR as SQLiteExecutor,
   bE as SemanticLayerCompiler,
-  dO as SemanticLayerUtils,
+  WO as SemanticLayerUtils,
   vE as createDatabaseExecutor,
-  pO as createDrizzleSemanticLayer,
-  uO as createMultiCubeContext,
-  ER as createMySQLExecutor,
+  hO as createDrizzleSemanticLayer,
+  mO as createMultiCubeContext,
+  TR as createMySQLExecutor,
   wE as createPostgresExecutor,
   xE as createSQLiteExecutor,
-  YO as createSemanticLayer,
-  mO as defaultSemanticLayer,
-  FO as defineCube,
-  RR as getJoinType,
+  dO as createSemanticLayer,
+  VO as defaultSemanticLayer,
+  pO as defineCube,
+  IR as getJoinType,
   QE as resolveCubeReference,
   K as resolveSqlExpression,
-  lO as semanticLayer
+  uO as semanticLayer
 };