drizzle-cube 0.1.31 → 0.1.33

package/dist/adapters/{compiler-CVega_Gv.js → compiler-Ce33cdy6.js}

@@ -1,17 +1,17 @@
-const f = Symbol.for("drizzle:entityKind");
+const h = Symbol.for("drizzle:entityKind");
 function H(T, E) {
   if (!T || typeof T != "object")
     return !1;
   if (T instanceof E)
     return !0;
-  if (!Object.prototype.hasOwnProperty.call(E, f))
+  if (!Object.prototype.hasOwnProperty.call(E, h))
     throw new Error(
       `Class "${E.name ?? "<unknown>"}" doesn't look like a Drizzle entity. If this is incorrect and the class is provided by Drizzle, please report this as a bug.`
     );
   let R = Object.getPrototypeOf(T).constructor;
   if (R)
     for (; R; ) {
-      if (f in R && R[f] === E[f])
+      if (h in R && R[h] === E[h])
         return !0;
       R = Object.getPrototypeOf(R);
     }
@@ -21,7 +21,7 @@ class TE {
   constructor(E, R) {
     this.table = E, this.config = R, this.name = R.name, this.keyAsName = R.keyAsName, this.notNull = R.notNull, this.default = R.default, this.defaultFn = R.defaultFn, this.onUpdateFn = R.onUpdateFn, this.hasDefault = R.hasDefault, this.primary = R.primaryKey, this.isUnique = R.isUnique, this.uniqueName = R.uniqueName, this.uniqueType = R.uniqueType, this.dataType = R.dataType, this.columnType = R.columnType, this.generated = R.generated, this.generatedIdentity = R.generatedIdentity;
   }
-  static [f] = "Column";
+  static [h] = "Column";
   name;
   keyAsName;
   primary;
@@ -55,7 +55,7 @@ function _R(T) {
   return !!T && typeof T == "function" && kE in T && T[kE] === !0;
 }
 class gT {
-  static [f] = "Subquery";
+  static [h] = "Subquery";
   constructor(E, R, A, e = !1, S = []) {
     this._ = {
       brand: "Subquery",
@@ -76,7 +76,7 @@ const rR = {
   }
 }, z = Symbol.for("drizzle:ViewBaseConfig"), rE = Symbol.for("drizzle:Schema"), zE = Symbol.for("drizzle:Columns"), ET = Symbol.for("drizzle:ExtraConfigColumns"), nE = Symbol.for("drizzle:OriginalName"), iE = Symbol.for("drizzle:BaseName"), IE = Symbol.for("drizzle:IsAlias"), TT = Symbol.for("drizzle:ExtraConfigBuilder"), nR = Symbol.for("drizzle:IsDrizzleTable");
 class W {
-  static [f] = "Table";
+  static [h] = "Table";
   /** @internal */
   static Symbol = {
     Name: _E,
@@ -119,7 +119,7 @@ class W {
     this[_E] = this[nE] = E, this[rE] = R, this[iE] = A;
   }
 }
-function JT(T) {
+function wT(T) {
   return T != null && typeof T.getSQL == "function";
 }
 function iR(T) {
@@ -129,7 +129,7 @@ function iR(T) {
   return E;
 }
 class d {
-  static [f] = "StringChunk";
+  static [h] = "StringChunk";
   value;
   constructor(E) {
     this.value = Array.isArray(E) ? E : [E];
@@ -149,9 +149,9 @@ class u {
         );
       }
   }
-  static [f] = "SQL";
+  static [h] = "SQL";
   /** @internal */
-  decoder = wT;
+  decoder = JT;
   shouldInlineParams = !1;
   /** @internal */
   usedTables = [];
@@ -175,73 +175,73 @@ class u {
       casing: e,
       escapeName: S,
       escapeParam: N,
-      prepareTyping: s,
-      inlineParams: _,
+      prepareTyping: t,
+      inlineParams: r,
       paramStartIndex: I
     } = A;
     return iR(E.map((O) => {
       if (H(O, d))
         return { sql: O.value.join(""), params: [] };
-      if (H(O, wE))
+      if (H(O, JE))
         return { sql: S(O.value), params: [] };
       if (O === void 0)
         return { sql: "", params: [] };
       if (Array.isArray(O)) {
-        const t = [new d("(")];
+        const s = [new d("(")];
         for (const [L, a] of O.entries())
-          t.push(a), L < O.length - 1 && t.push(new d(", "));
-        return t.push(new d(")")), this.buildQueryFromSourceParams(t, A);
+          s.push(a), L < O.length - 1 && s.push(new d(", "));
+        return s.push(new d(")")), this.buildQueryFromSourceParams(s, A);
       }
       if (H(O, u))
         return this.buildQueryFromSourceParams(O.queryChunks, {
           ...A,
-          inlineParams: _ || O.shouldInlineParams
+          inlineParams: r || O.shouldInlineParams
         });
       if (H(O, W)) {
-        const t = O[W.Symbol.Schema], L = O[W.Symbol.Name];
+        const s = O[W.Symbol.Schema], L = O[W.Symbol.Name];
         return {
-          sql: t === void 0 || O[IE] ? S(L) : S(t) + "." + S(L),
+          sql: s === void 0 || O[IE] ? S(L) : S(s) + "." + S(L),
           params: []
         };
       }
       if (H(O, TE)) {
-        const t = e.getColumnCasing(O);
+        const s = e.getColumnCasing(O);
         if (R.invokeSource === "indexes")
-          return { sql: S(t), params: [] };
+          return { sql: S(s), params: [] };
         const L = O.table[W.Symbol.Schema];
         return {
-          sql: O.table[IE] || L === void 0 ? S(O.table[W.Symbol.Name]) + "." + S(t) : S(L) + "." + S(O.table[W.Symbol.Name]) + "." + S(t),
+          sql: O.table[IE] || L === void 0 ? S(O.table[W.Symbol.Name]) + "." + S(s) : S(L) + "." + S(O.table[W.Symbol.Name]) + "." + S(s),
           params: []
         };
       }
       if (H(O, vT)) {
-        const t = O[z].schema, L = O[z].name;
+        const s = O[z].schema, L = O[z].name;
         return {
-          sql: t === void 0 || O[z].isAlias ? S(L) : S(t) + "." + S(L),
+          sql: s === void 0 || O[z].isAlias ? S(L) : S(s) + "." + S(L),
           params: []
         };
       }
       if (H(O, OE)) {
         if (H(O.value, NE))
           return { sql: N(I.value++, O), params: [O], typings: ["none"] };
-        const t = O.value === null ? null : O.encoder.mapToDriverValue(O.value);
-        if (H(t, u))
-          return this.buildQueryFromSourceParams([t], A);
-        if (_)
-          return { sql: this.mapInlineParam(t, A), params: [] };
+        const s = O.value === null ? null : O.encoder.mapToDriverValue(O.value);
+        if (H(s, u))
+          return this.buildQueryFromSourceParams([s], A);
+        if (r)
+          return { sql: this.mapInlineParam(s, A), params: [] };
         let L = ["none"];
-        return s && (L = [s(O.encoder)]), { sql: N(I.value++, t), params: [t], typings: L };
+        return t && (L = [t(O.encoder)]), { sql: N(I.value++, s), params: [s], typings: L };
       }
       return H(O, NE) ? { sql: N(I.value++, O), params: [O], typings: ["none"] } : H(O, u.Aliased) && O.fieldAlias !== void 0 ? { sql: S(O.fieldAlias), params: [] } : H(O, gT) ? O._.isWith ? { sql: S(O._.alias), params: [] } : this.buildQueryFromSourceParams([
         new d("("),
         O._.sql,
         new d(") "),
-        new wE(O._.alias)
-      ], A) : _R(O) ? O.schema ? { sql: S(O.schema) + "." + S(O.enumName), params: [] } : { sql: S(O.enumName), params: [] } : JT(O) ? O.shouldOmitSQLParens?.() ? this.buildQueryFromSourceParams([O.getSQL()], A) : this.buildQueryFromSourceParams([
+        new JE(O._.alias)
+      ], A) : _R(O) ? O.schema ? { sql: S(O.schema) + "." + S(O.enumName), params: [] } : { sql: S(O.enumName), params: [] } : wT(O) ? O.shouldOmitSQLParens?.() ? this.buildQueryFromSourceParams([O.getSQL()], A) : this.buildQueryFromSourceParams([
         new d("("),
         O.getSQL(),
         new d(")")
-      ], A) : _ ? { sql: this.mapInlineParam(O, A), params: [] } : { sql: N(I.value++, O), params: [O], typings: ["none"] };
+      ], A) : r ? { sql: this.mapInlineParam(O, A), params: [] } : { sql: N(I.value++, O), params: [O], typings: ["none"] };
     }));
   }
   mapInlineParam(E, { escapeString: R }) {
@@ -279,11 +279,11 @@ class u {
     return E ? this : void 0;
   }
 }
-class wE {
+class JE {
   constructor(E) {
     this.value = E;
   }
-  static [f] = "Name";
+  static [h] = "Name";
   brand;
   getSQL() {
     return new u([this]);
@@ -292,13 +292,13 @@ class wE {
 function DR(T) {
   return typeof T == "object" && T !== null && "mapToDriverValue" in T && typeof T.mapToDriverValue == "function";
 }
-const wT = {
+const JT = {
   mapFromDriverValue: (T) => T
 }, xT = {
   mapToDriverValue: (T) => T
 };
 ({
-  ...wT,
+  ...JT,
   ...xT
 });
 class OE {
@@ -309,7 +309,7 @@ class OE {
   constructor(E, R = xT) {
     this.value = E, this.encoder = R;
   }
-  static [f] = "Param";
+  static [h] = "Param";
   brand;
   getSQL() {
     return new u([this]);
@@ -327,40 +327,40 @@ function C(T, ...E) {
     return new u([]);
   }
   T.empty = E;
-  function R(_) {
-    return new u(_);
+  function R(r) {
+    return new u(r);
   }
   T.fromList = R;
-  function A(_) {
-    return new u([new d(_)]);
+  function A(r) {
+    return new u([new d(r)]);
   }
   T.raw = A;
-  function e(_, I) {
+  function e(r, I) {
     const O = [];
-    for (const [t, L] of _.entries())
-      t > 0 && I !== void 0 && O.push(I), O.push(L);
+    for (const [s, L] of r.entries())
+      s > 0 && I !== void 0 && O.push(I), O.push(L);
     return new u(O);
   }
   T.join = e;
-  function S(_) {
-    return new wE(_);
+  function S(r) {
+    return new JE(r);
   }
   T.identifier = S;
-  function N(_) {
-    return new NE(_);
+  function N(r) {
+    return new NE(r);
   }
   T.placeholder = N;
-  function s(_, I) {
-    return new OE(_, I);
+  function t(r, I) {
+    return new OE(r, I);
   }
-  T.param = s;
+  T.param = t;
 })(C || (C = {}));
 ((T) => {
   class E {
     constructor(A, e) {
       this.sql = A, this.fieldAlias = e;
     }
-    static [f] = "SQL.Aliased";
+    static [h] = "SQL.Aliased";
     /** @internal */
     isSelectionField = !1;
     getSQL() {
@@ -377,14 +377,14 @@ class NE {
   constructor(E) {
     this.name = E;
   }
-  static [f] = "Placeholder";
+  static [h] = "Placeholder";
   getSQL() {
     return new u([this]);
   }
 }
 const aR = Symbol.for("drizzle:IsDrizzleView");
 class vT {
-  static [f] = "View";
+  static [h] = "View";
   /** @internal */
   [z];
   /** @internal */
@@ -414,10 +414,10 @@ gT.prototype.getSQL = function() {
   return new u([this]);
 };
 function b(T, E) {
-  return DR(E) && !JT(T) && !H(T, OE) && !H(T, NE) && !H(T, TE) && !H(T, W) && !H(T, vT) ? new OE(T, E) : T;
+  return DR(E) && !wT(T) && !H(T, OE) && !H(T, NE) && !H(T, TE) && !H(T, W) && !H(T, vT) ? new OE(T, E) : T;
 }
-const tE = (T, E) => C`${T} = ${b(E, T)}`, RT = (T, E) => C`${T} <> ${b(E, T)}`;
-function h(...T) {
+const sE = (T, E) => C`${T} = ${b(E, T)}`, RT = (T, E) => C`${T} <> ${b(E, T)}`;
+function f(...T) {
   const E = T.filter(
     (R) => R !== void 0
   );
@@ -1067,7 +1067,7 @@ class BR extends ZT {
 function mR(T, E) {
   return new BR(T, E);
 }
-function tT(T, E, R) {
+function sT(T, E, R) {
   if (R)
     switch (R) {
       case "postgres":
@@ -1085,7 +1085,7 @@ function tT(T, E, R) {
     return OT(T, E);
   throw new Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
-function sT(T) {
+function tT(T) {
   return typeof T == "function" ? T() : T;
 }
 function FR(T, E) {
@@ -1119,30 +1119,30 @@ class YR {
     const e = {}, S = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
       for (const N of R.dimensions) {
-        const [s, _] = N.split("."), I = S.get(s);
-        if (I && I.dimensions && I.dimensions[_]) {
-          const O = I.dimensions[_], t = $(O.sql, A);
-          e[N] = C`${t}`.as(N);
+        const [t, r] = N.split("."), I = S.get(t);
+        if (I && I.dimensions && I.dimensions[r]) {
+          const O = I.dimensions[r], s = $(O.sql, A);
+          e[N] = C`${s}`.as(N);
         }
       }
     if (R.measures)
       for (const N of R.measures) {
-        const [s, _] = N.split("."), I = S.get(s);
-        if (I && I.measures && I.measures[_]) {
-          const O = I.measures[_], t = this.buildMeasureExpression(O, A);
-          e[N] = C`${t}`.as(N);
+        const [t, r] = N.split("."), I = S.get(t);
+        if (I && I.measures && I.measures[r]) {
+          const O = I.measures[r], s = this.buildMeasureExpression(O, A);
+          e[N] = C`${s}`.as(N);
         }
       }
     if (R.timeDimensions)
       for (const N of R.timeDimensions) {
-        const [s, _] = N.dimension.split("."), I = S.get(s);
-        if (I && I.dimensions && I.dimensions[_]) {
-          const O = I.dimensions[_], t = this.buildTimeDimensionExpression(
+        const [t, r] = N.dimension.split("."), I = S.get(t);
+        if (I && I.dimensions && I.dimensions[r]) {
+          const O = I.dimensions[r], s = this.buildTimeDimensionExpression(
             O.sql,
             N.granularity,
             A
           );
-          e[N.dimension] = C`${t}`.as(N.dimension);
+          e[N.dimension] = C`${s}`.as(N.dimension);
         }
       }
     return Object.keys(e).length === 0 && (e.count = ME()), e;
@@ -1152,24 +1152,24 @@ class YR {
    */
   buildHavingMeasureExpression(E, R, A, e, S) {
     if (S && S.preAggregationCTEs) {
-      const N = S.preAggregationCTEs.find((s) => s.cube.name === E);
+      const N = S.preAggregationCTEs.find((t) => t.cube.name === E);
       if (N && N.measures.includes(`${E}.${R}`)) {
-        const s = C`${C.identifier(N.cteAlias)}.${C.identifier(R)}`;
+        const t = C`${C.identifier(N.cteAlias)}.${C.identifier(R)}`;
         switch (A.type) {
           case "count":
           case "countDistinct":
           case "sum":
-            return g(s);
+            return g(t);
           case "avg":
-            return this.databaseAdapter.buildAvg(s);
+            return this.databaseAdapter.buildAvg(t);
           case "min":
-            return vE(s);
+            return vE(t);
           case "max":
-            return xE(s);
+            return xE(t);
           case "number":
-            return g(s);
+            return g(t);
           default:
-            return g(s);
+            return g(t);
         }
       }
     }
@@ -1183,7 +1183,7 @@ class YR {
     if (E.filters && E.filters.length > 0) {
       const e = E.filters.map((S) => S(R)).filter(Boolean);
       if (e.length > 0) {
-        const S = e.length === 1 ? e[0] : h(...e);
+        const S = e.length === 1 ? e[0] : f(...e);
         A = this.databaseAdapter.buildCaseWhen([
           { when: S, then: A }
         ]);
@@ -1222,17 +1222,17 @@ class YR {
   buildWhereConditions(E, R, A, e) {
     const S = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.filters && R.filters.length > 0)
-      for (const s of R.filters) {
-        const _ = this.processFilter(s, N, A, "where", e);
-        _ && S.push(_);
+      for (const t of R.filters) {
+        const r = this.processFilter(t, N, A, "where", e);
+        r && S.push(r);
       }
     if (R.timeDimensions)
-      for (const s of R.timeDimensions) {
-        const [_, I] = s.dimension.split("."), O = N.get(_);
-        if (O && O.dimensions[I] && s.dateRange) {
-          if (e?.preAggregationCTEs && e.preAggregationCTEs.some((n) => n.cube.name === _))
+      for (const t of R.timeDimensions) {
+        const [r, I] = t.dimension.split("."), O = N.get(r);
+        if (O && O.dimensions[I] && t.dateRange) {
+          if (e?.preAggregationCTEs && e.preAggregationCTEs.some((n) => n.cube.name === r))
             continue;
-          const t = O.dimensions[I], L = $(t.sql, A), a = this.buildDateRangeCondition(L, s.dateRange);
+          const s = O.dimensions[I], L = $(s.sql, A), a = this.buildDateRangeCondition(L, t.dateRange);
           a && S.push(a);
         }
       }
@@ -1245,9 +1245,9 @@ class YR {
   buildHavingConditions(E, R, A, e) {
     const S = [], N = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.filters && R.filters.length > 0)
-      for (const s of R.filters) {
-        const _ = this.processFilter(s, N, A, "having", e);
-        _ && S.push(_);
+      for (const t of R.filters) {
+        const r = this.processFilter(t, N, A, "having", e);
+        r && S.push(r);
       }
     return S;
   }
@@ -1260,27 +1260,27 @@ class YR {
       const a = E;
       if (a.and) {
         const o = a.and.map((n) => this.processFilter(n, R, A, e, S)).filter((n) => n !== null);
-        return o.length > 0 ? h(...o) : null;
+        return o.length > 0 ? f(...o) : null;
       }
       if (a.or) {
         const o = a.or.map((n) => this.processFilter(n, R, A, e, S)).filter((n) => n !== null);
         return o.length > 0 ? DE(...o) : null;
       }
     }
-    const N = E, [s, _] = N.member.split("."), I = R.get(s);
+    const N = E, [t, r] = N.member.split("."), I = R.get(t);
     if (!I) return null;
-    const O = I.dimensions[_], t = I.measures[_], L = O || t;
+    const O = I.dimensions[r], s = I.measures[r], L = O || s;
     if (!L) return null;
     if (e === "where" && O) {
-      if (S?.preAggregationCTEs && S.preAggregationCTEs.some((n) => n.cube.name === s))
+      if (S?.preAggregationCTEs && S.preAggregationCTEs.some((n) => n.cube.name === t))
         return null;
       const a = $(O.sql, A);
       return this.buildFilterCondition(a, N.operator, N.values, L);
     } else {
-      if (e === "where" && t)
+      if (e === "where" && s)
         return null;
-      if (e === "having" && t) {
-        const a = this.buildHavingMeasureExpression(s, _, t, A, S);
+      if (e === "having" && s) {
+        const a = this.buildHavingMeasureExpression(t, r, s, A, S);
         return this.buildFilterCondition(a, N.operator, N.values, L);
       }
     }
@@ -1292,7 +1292,7 @@ class YR {
   buildFilterCondition(E, R, A, e) {
     if (!A || A.length === 0)
       return R === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
-    const S = A.filter((s) => !(s == null || s === "" || typeof s == "string" && s.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
+    const S = A.filter((t) => !(t == null || t === "" || typeof t == "string" && t.includes("\0"))).map(this.databaseAdapter.convertFilterValue);
     if (S.length === 0 && !["set", "notSet"].includes(R))
       return R === "equals" ? this.databaseAdapter.buildBooleanLiteral(!1) : null;
     const N = S[0];
@@ -1300,13 +1300,13 @@ class YR {
       case "equals":
         if (S.length > 1) {
           if (e?.type === "time") {
-            const s = S.map((_) => this.normalizeDate(_) || _);
-            return PE(E, s);
+            const t = S.map((r) => this.normalizeDate(r) || r);
+            return PE(E, t);
           }
           return PE(E, S);
         } else if (S.length === 1) {
-          const s = e?.type === "time" && this.normalizeDate(N) || N;
-          return tE(E, s);
+          const t = e?.type === "time" && this.normalizeDate(N) || N;
+          return sE(E, t);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
@@ -1333,24 +1333,24 @@ class YR {
         return eT(E);
       case "inDateRange":
         if (S.length >= 2) {
-          const s = this.normalizeDate(S[0]), _ = this.normalizeDate(S[1]);
-          if (s && _)
-            return h(
-              v(E, s),
-              Q(E, _)
+          const t = this.normalizeDate(S[0]), r = this.normalizeDate(S[1]);
+          if (t && r)
+            return f(
+              v(E, t),
+              Q(E, r)
             );
         }
         return null;
       case "beforeDate": {
-        const s = this.normalizeDate(N);
-        return s ? oE(E, s) : null;
+        const t = this.normalizeDate(N);
+        return t ? oE(E, t) : null;
       }
       case "afterDate": {
-        const s = this.normalizeDate(N);
-        return s ? aE(E, s) : null;
+        const t = this.normalizeDate(N);
+        return t ? aE(E, t) : null;
       }
       case "between":
-        return S.length >= 2 ? h(
+        return S.length >= 2 ? f(
           v(E, S[0]),
           Q(E, S[1])
         ) : null;
@@ -1376,10 +1376,10 @@ class YR {
       case "isEmpty":
         return DE(
           eT(E),
-          tE(E, "")
+          sE(E, "")
         );
       case "isNotEmpty":
-        return h(
+        return f(
           ST(E),
           RT(E, "")
         );
@@ -1394,7 +1394,7 @@ class YR {
     if (!R) return null;
     if (Array.isArray(R) && R.length >= 2) {
       const A = this.normalizeDate(R[0]), e = this.normalizeDate(R[1]);
-      return !A || !e ? null : h(
+      return !A || !e ? null : f(
         v(E, A),
         Q(E, e)
       );
@@ -1402,7 +1402,7 @@ class YR {
     if (typeof R == "string") {
       const A = this.parseRelativeDateRange(R);
       if (A)
-        return h(
+        return f(
           v(E, A.start),
           Q(E, A.end)
         );
@@ -1411,7 +1411,7 @@ class YR {
       const S = new Date(e);
       S.setUTCHours(0, 0, 0, 0);
       const N = new Date(e);
-      return N.setUTCHours(23, 59, 59, 999), h(
+      return N.setUTCHours(23, 59, 59, 999), f(
         v(E, S),
         Q(E, N)
       );
@@ -1423,74 +1423,74 @@ class YR {
    * Handles all 14 DATE_RANGE_OPTIONS from the client
    */
   parseRelativeDateRange(E) {
-    const R = /* @__PURE__ */ new Date(), A = E.toLowerCase().trim(), e = R.getUTCFullYear(), S = R.getUTCMonth(), N = R.getUTCDate(), s = R.getUTCDay();
+    const R = /* @__PURE__ */ new Date(), A = E.toLowerCase().trim(), e = R.getUTCFullYear(), S = R.getUTCMonth(), N = R.getUTCDate(), t = R.getUTCDay();
     if (A === "today") {
-      const t = new Date(R);
-      t.setUTCHours(0, 0, 0, 0);
+      const s = new Date(R);
+      s.setUTCHours(0, 0, 0, 0);
       const L = new Date(R);
-      return L.setUTCHours(23, 59, 59, 999), { start: t, end: L };
+      return L.setUTCHours(23, 59, 59, 999), { start: s, end: L };
     }
     if (A === "yesterday") {
-      const t = new Date(R);
-      t.setUTCDate(N - 1), t.setUTCHours(0, 0, 0, 0);
+      const s = new Date(R);
+      s.setUTCDate(N - 1), s.setUTCHours(0, 0, 0, 0);
       const L = new Date(R);
-      return L.setUTCDate(N - 1), L.setUTCHours(23, 59, 59, 999), { start: t, end: L };
+      return L.setUTCDate(N - 1), L.setUTCHours(23, 59, 59, 999), { start: s, end: L };
     }
     if (A === "this week") {
-      const t = s === 0 ? -6 : 1 - s, L = new Date(R);
-      L.setUTCDate(N + t), L.setUTCHours(0, 0, 0, 0);
+      const s = t === 0 ? -6 : 1 - t, L = new Date(R);
+      L.setUTCDate(N + s), L.setUTCHours(0, 0, 0, 0);
       const a = new Date(L);
       return a.setUTCDate(L.getUTCDate() + 6), a.setUTCHours(23, 59, 59, 999), { start: L, end: a };
     }
     if (A === "this month") {
-      const t = new Date(Date.UTC(e, S, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e, S + 1, 0, 23, 59, 59, 999));
-      return { start: t, end: L };
+      const s = new Date(Date.UTC(e, S, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e, S + 1, 0, 23, 59, 59, 999));
+      return { start: s, end: L };
     }
     if (A === "this quarter") {
-      const t = Math.floor(S / 3), L = new Date(Date.UTC(e, t * 3, 1, 0, 0, 0, 0)), a = new Date(Date.UTC(e, t * 3 + 3, 0, 23, 59, 59, 999));
+      const s = Math.floor(S / 3), L = new Date(Date.UTC(e, s * 3, 1, 0, 0, 0, 0)), a = new Date(Date.UTC(e, s * 3 + 3, 0, 23, 59, 59, 999));
       return { start: L, end: a };
     }
     if (A === "this year") {
-      const t = new Date(Date.UTC(e, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e, 11, 31, 23, 59, 59, 999));
-      return { start: t, end: L };
+      const s = new Date(Date.UTC(e, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e, 11, 31, 23, 59, 59, 999));
+      return { start: s, end: L };
     }
-    const _ = A.match(/^last\s+(\d+)\s+days?$/);
-    if (_) {
-      const t = parseInt(_[1], 10), L = new Date(R);
-      L.setUTCDate(N - t + 1), L.setUTCHours(0, 0, 0, 0);
+    const r = A.match(/^last\s+(\d+)\s+days?$/);
+    if (r) {
+      const s = parseInt(r[1], 10), L = new Date(R);
+      L.setUTCDate(N - s + 1), L.setUTCHours(0, 0, 0, 0);
       const a = new Date(R);
       return a.setUTCHours(23, 59, 59, 999), { start: L, end: a };
     }
     if (A === "last week") {
-      const t = s === 0 ? -13 : -6 - s, L = new Date(R);
-      L.setUTCDate(N + t), L.setUTCHours(0, 0, 0, 0);
+      const s = t === 0 ? -13 : -6 - t, L = new Date(R);
+      L.setUTCDate(N + s), L.setUTCHours(0, 0, 0, 0);
       const a = new Date(L);
       return a.setUTCDate(L.getUTCDate() + 6), a.setUTCHours(23, 59, 59, 999), { start: L, end: a };
     }
     if (A === "last month") {
-      const t = new Date(Date.UTC(e, S - 1, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e, S, 0, 23, 59, 59, 999));
-      return { start: t, end: L };
+      const s = new Date(Date.UTC(e, S - 1, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e, S, 0, 23, 59, 59, 999));
+      return { start: s, end: L };
     }
     if (A === "last quarter") {
-      const t = Math.floor(S / 3), L = t === 0 ? 3 : t - 1, a = t === 0 ? e - 1 : e, o = new Date(Date.UTC(a, L * 3, 1, 0, 0, 0, 0)), n = new Date(Date.UTC(a, L * 3 + 3, 0, 23, 59, 59, 999));
+      const s = Math.floor(S / 3), L = s === 0 ? 3 : s - 1, a = s === 0 ? e - 1 : e, o = new Date(Date.UTC(a, L * 3, 1, 0, 0, 0, 0)), n = new Date(Date.UTC(a, L * 3 + 3, 0, 23, 59, 59, 999));
       return { start: o, end: n };
     }
     if (A === "last year") {
-      const t = new Date(Date.UTC(e - 1, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e - 1, 11, 31, 23, 59, 59, 999));
-      return { start: t, end: L };
+      const s = new Date(Date.UTC(e - 1, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e - 1, 11, 31, 23, 59, 59, 999));
+      return { start: s, end: L };
     }
     if (A === "last 12 months") {
-      const t = new Date(Date.UTC(e, S - 11, 1, 0, 0, 0, 0)), L = new Date(R);
-      return L.setUTCHours(23, 59, 59, 999), { start: t, end: L };
+      const s = new Date(Date.UTC(e, S - 11, 1, 0, 0, 0, 0)), L = new Date(R);
+      return L.setUTCHours(23, 59, 59, 999), { start: s, end: L };
     }
     const I = A.match(/^last\s+(\d+)\s+months?$/);
     if (I) {
-      const t = parseInt(I[1], 10), L = new Date(Date.UTC(e, S - t + 1, 1, 0, 0, 0, 0)), a = new Date(R);
+      const s = parseInt(I[1], 10), L = new Date(Date.UTC(e, S - s + 1, 1, 0, 0, 0, 0)), a = new Date(R);
       return a.setUTCHours(23, 59, 59, 999), { start: L, end: a };
     }
     const O = A.match(/^last\s+(\d+)\s+years?$/);
     if (O) {
-      const t = parseInt(O[1], 10), L = new Date(Date.UTC(e - t, 0, 1, 0, 0, 0, 0)), a = new Date(R);
+      const s = parseInt(O[1], 10), L = new Date(Date.UTC(e - s, 0, 1, 0, 0, 0, 0)), a = new Date(R);
       return a.setUTCHours(23, 59, 59, 999), { start: L, end: a };
     }
     return null;
@@ -1523,11 +1523,11 @@ class YR {
     const S = [];
     if (!(R.measures && R.measures.length > 0))
       return [];
-    const s = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
+    const t = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
-      for (const _ of R.dimensions) {
-        const [I, O] = _.split("."), t = s.get(I);
-        if (t && t.dimensions && t.dimensions[O])
+      for (const r of R.dimensions) {
+        const [I, O] = r.split("."), s = t.get(I);
+        if (s && s.dimensions && s.dimensions[O])
           if (e?.preAggregationCTEs?.some((a) => a.cube.name === I)) {
             const a = e.preAggregationCTEs.find((n) => n.cube.name === I), o = a.joinKeys.find((n) => n.targetColumn === O);
             if (o && o.sourceColumnObj)
@@ -1537,20 +1537,20 @@ class YR {
               S.push(n);
             }
           } else {
-            const a = t.dimensions[O], o = $(a.sql, A);
+            const a = s.dimensions[O], o = $(a.sql, A);
             S.push(o);
           }
       }
     if (R.timeDimensions)
-      for (const _ of R.timeDimensions) {
-        const [I, O] = _.dimension.split("."), t = s.get(I);
-        if (t && t.dimensions && t.dimensions[O])
+      for (const r of R.timeDimensions) {
+        const [I, O] = r.dimension.split("."), s = t.get(I);
+        if (s && s.dimensions && s.dimensions[O])
           if (e?.preAggregationCTEs?.some((a) => a.cube.name === I)) {
             const a = e.preAggregationCTEs.find((n) => n.cube.name === I), o = a.joinKeys.find((n) => n.targetColumn === O);
             if (o && o.sourceColumnObj) {
               const n = this.buildTimeDimensionExpression(
                 o.sourceColumnObj,
-                _.granularity,
+                r.granularity,
                 A
               );
               S.push(n);
@@ -1559,9 +1559,9 @@ class YR {
               S.push(n);
             }
           } else {
-            const a = t.dimensions[O], o = this.buildTimeDimensionExpression(
+            const a = s.dimensions[O], o = this.buildTimeDimensionExpression(
               a.sql,
-              _.granularity,
+              r.granularity,
               A
             );
             S.push(o);
@@ -1582,15 +1582,15 @@ class YR {
       for (const [S, N] of Object.entries(E.order)) {
         if (!e.includes(S))
           throw new Error(`Cannot order by '${S}': field is not selected in the query`);
-        const s = N === "desc" ? oR(C.identifier(S)) : IT(C.identifier(S));
-        A.push(s);
+        const t = N === "desc" ? oR(C.identifier(S)) : IT(C.identifier(S));
+        A.push(t);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
       const S = new Set(Object.keys(E.order || {})), N = [...E.timeDimensions].sort(
-        (s, _) => s.dimension.localeCompare(_.dimension)
+        (t, r) => t.dimension.localeCompare(r.dimension)
       );
-      for (const s of N)
-        S.has(s.dimension) || A.push(IT(C.identifier(s.dimension)));
+      for (const t of N)
+        S.has(t.dimension) || A.push(IT(C.identifier(t.dimension)));
     }
     return A;
   }
@@ -1602,9 +1602,9 @@ class YR {
     const A = [], e = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.measures && A.push(...R.measures), R.dimensions)
       for (const S of R.dimensions) {
-        const [N, s] = S.split("."), _ = e.get(N);
-        if (_) {
-          const I = _.dimensions[s];
+        const [N, t] = S.split("."), r = e.get(N);
+        if (r) {
+          const I = r.dimensions[t];
           I && I.type === "number" && A.push(S);
         }
       }
@@ -1705,12 +1705,12 @@ class pR {
     const e = this.analyzeCubeUsage(R), S = Array.from(e);
     if (S.length === 0)
       throw new Error("No cubes found in query");
-    const N = this.choosePrimaryCube(S, R, E), s = E.get(N);
-    if (!s)
+    const N = this.choosePrimaryCube(S, R, E), t = E.get(N);
+    if (!t)
       throw new Error(`Primary cube '${N}' not found`);
     if (S.length === 1)
       return {
-        primaryCube: s,
+        primaryCube: t,
         joinCubes: [],
         // Empty for single cube
         selections: {},
@@ -1720,10 +1720,10 @@ class pR {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const _ = this.buildJoinPlan(E, s, S), I = this.planPreAggregationCTEs(E, s, _, R);
+    const r = this.buildJoinPlan(E, t, S), I = this.planPreAggregationCTEs(E, t, r, R);
     return {
-      primaryCube: s,
-      joinCubes: _,
+      primaryCube: t,
+      joinCubes: r,
       selections: {},
       // Will be built by QueryBuilder
       whereConditions: [],
@@ -1743,22 +1743,22 @@ class pR {
       for (const N of e)
         S.set(N, (S.get(N) || 0) + 1);
       if (S.size > 0) {
-        const N = Math.max(...S.values()), s = [...S.entries()].filter(([, _]) => _ === N).map(([_]) => _).sort();
-        for (const _ of s)
-          if (this.canReachAllCubes(_, E, A))
-            return _;
+        const N = Math.max(...S.values()), t = [...S.entries()].filter(([, r]) => r === N).map(([r]) => r).sort();
+        for (const r of t)
+          if (this.canReachAllCubes(r, E, A))
+            return r;
       }
     }
     if (A) {
       const e = /* @__PURE__ */ new Map();
       for (const S of E)
         if (this.canReachAllCubes(S, E, A)) {
-          const N = A.get(S), s = N?.joins ? Object.keys(N.joins).length : 0;
-          e.set(S, s);
+          const N = A.get(S), t = N?.joins ? Object.keys(N.joins).length : 0;
+          e.set(S, t);
         }
       if (e.size > 0) {
         const S = Math.max(...e.values());
-        return [...e.entries()].filter(([, s]) => s === S).map(([s]) => s).sort()[0];
+        return [...e.entries()].filter(([, t]) => t === S).map(([t]) => t).sort()[0];
       }
     }
     return [...E].sort()[0];
@@ -1780,18 +1780,18 @@ class pR {
    * Supports both direct joins and transitive joins through intermediate cubes
    */
   buildJoinPlan(E, R, A) {
-    const e = [], S = /* @__PURE__ */ new Set([R.name]), N = A.filter((s) => s !== R.name);
-    for (const s of N) {
-      if (S.has(s))
+    const e = [], S = /* @__PURE__ */ new Set([R.name]), N = A.filter((t) => t !== R.name);
+    for (const t of N) {
+      if (S.has(t))
         continue;
-      const _ = this.findJoinPath(E, R.name, s, S);
-      if (!_ || _.length === 0)
-        throw new Error(`No join path found from '${R.name}' to '${s}'`);
-      for (const { toCube: I, joinDef: O } of _) {
+      const r = this.findJoinPath(E, R.name, t, S);
+      if (!r || r.length === 0)
+        throw new Error(`No join path found from '${R.name}' to '${t}'`);
+      for (const { toCube: I, joinDef: O } of r) {
         if (S.has(I))
           continue;
-        const t = E.get(I);
-        if (!t)
+        const s = E.get(I);
+        if (!s)
           throw new Error(`Cube '${I}' not found`);
         const L = this.buildJoinCondition(
           O,
@@ -1801,7 +1801,7 @@ class pR {
           // No target alias needed - use the actual column 
         ), a = FR(O.relationship, O.sqlJoinType);
         e.push({
-          cube: t,
+          cube: s,
           alias: `${I.toLowerCase()}_cube`,
           joinType: a,
           joinCondition: L
@@ -1816,10 +1816,10 @@ class pR {
   buildJoinCondition(E, R, A) {
     const e = [];
     for (const S of E.on) {
-      const N = R ? C`${C.identifier(R)}.${C.identifier(S.source.name)}` : S.source, s = A ? C`${C.identifier(A)}.${C.identifier(S.target.name)}` : S.target, _ = S.as || tE;
-      e.push(_(N, s));
+      const N = R ? C`${C.identifier(R)}.${C.identifier(S.source.name)}` : S.source, t = A ? C`${C.identifier(A)}.${C.identifier(S.target.name)}` : S.target, r = S.as || sE;
+      e.push(r(N, t));
     }
-    return h(...e);
+    return f(...e);
   }
   /**
    * Find join path from source cube to target cube
@@ -1832,14 +1832,14 @@ class pR {
       { cube: R, path: [] }
     ], N = /* @__PURE__ */ new Set([R, ...e]);
     for (; S.length > 0; ) {
-      const { cube: s, path: _ } = S.shift(), I = E.get(s);
+      const { cube: t, path: r } = S.shift(), I = E.get(t);
       if (I?.joins)
         for (const [, O] of Object.entries(I.joins)) {
-          const L = sT(O.targetCube).name;
+          const L = tT(O.targetCube).name;
           if (N.has(L))
             continue;
-          const a = [..._, {
-            fromCube: s,
+          const a = [...r, {
+            fromCube: t,
             toCube: L,
             joinDef: O
           }];
@@ -1858,15 +1858,15 @@ class pR {
     if (!e.measures || e.measures.length === 0)
       return S;
     for (const N of A) {
-      const s = this.findHasManyJoinDef(R, N.cube.name);
-      if (!s)
+      const t = this.findHasManyJoinDef(R, N.cube.name);
+      if (!t)
         continue;
-      const _ = e.measures ? e.measures.filter(
+      const r = e.measures ? e.measures.filter(
         (L) => L.startsWith(N.cube.name + ".")
-      ) : [], I = this.extractMeasuresFromFilters(e, N.cube.name), O = [.../* @__PURE__ */ new Set([..._, ...I])];
+      ) : [], I = this.extractMeasuresFromFilters(e, N.cube.name), O = [.../* @__PURE__ */ new Set([...r, ...I])];
       if (O.length === 0)
         continue;
-      const t = s.on.map((L) => ({
+      const s = t.on.map((L) => ({
         sourceColumn: L.source.name,
         targetColumn: L.target.name,
         sourceColumnObj: L.source,
@@ -1876,7 +1876,7 @@ class pR {
         cube: N.cube,
         alias: N.alias,
         cteAlias: `${N.cube.name.toLowerCase()}_agg`,
-        joinKeys: t,
+        joinKeys: s,
         measures: O
       });
     }
@@ -1889,7 +1889,7 @@ class pR {
     if (!E.joins)
       return null;
     for (const [, A] of Object.entries(E.joins))
-      if (sT(A.targetCube).name === R && A.relationship === "hasMany")
+      if (tT(A.targetCube).name === R && A.relationship === "hasMany")
         return A;
     return null;
   }
@@ -1908,14 +1908,14 @@ class UE {
    */
   async execute(E, R, A) {
     try {
-      const e = sR(E, R);
+      const e = tR(E, R);
       if (!e.isValid)
         throw new Error(`Query validation failed: ${e.errors.join(", ")}`);
       const S = {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: A
-      }, N = this.queryPlanner.createQueryPlan(E, R, S), s = this.buildUnifiedQuery(N, R, S), _ = this.queryBuilder.collectNumericFields(E, R), I = await this.dbExecutor.execute(s, _), O = Array.isArray(I) ? I.map((L) => {
+      }, N = this.queryPlanner.createQueryPlan(E, R, S), t = this.buildUnifiedQuery(N, R, S), r = this.queryBuilder.collectNumericFields(E, R), I = await this.dbExecutor.execute(t, r), O = Array.isArray(I) ? I.map((L) => {
         const a = { ...L };
         if (R.timeDimensions) {
           for (const o of R.timeDimensions)
@@ -1929,10 +1929,10 @@ class UE {
             }
         }
         return a;
-      }) : [I], t = this.generateAnnotations(N, R);
+      }) : [I], s = this.generateAnnotations(N, R);
       return {
         data: O,
-        annotation: t
+        annotation: s
       };
     } catch (e) {
       throw new Error(`Query execution failed: ${e instanceof Error ? e.message : "Unknown error"}`);
@@ -1949,68 +1949,68 @@ class UE {
    * Build pre-aggregation CTE for hasMany relationships
    */
   buildPreAggregationCTE(E, R, A, e) {
-    const S = E.cube, N = S.sql(A), s = {};
+    const S = E.cube, N = S.sql(A), t = {};
     for (const n of E.joinKeys)
       if (n.targetColumnObj) {
-        s[n.targetColumn] = n.targetColumnObj;
+        t[n.targetColumn] = n.targetColumnObj;
         for (const [U, P] of Object.entries(S.dimensions || {}))
-          P.sql === n.targetColumnObj && U !== n.targetColumn && (s[U] = C`${n.targetColumnObj}`.as(U));
+          P.sql === n.targetColumnObj && U !== n.targetColumn && (t[U] = C`${n.targetColumnObj}`.as(U));
       }
     for (const n of E.measures) {
       const [, U] = n.split(".");
       if (S.measures && S.measures[U]) {
         const P = S.measures[U], l = this.queryBuilder.buildMeasureExpression(P, A);
-        s[U] = C`${l}`.as(U);
+        t[U] = C`${l}`.as(U);
       }
     }
-    const _ = S.name;
+    const r = S.name;
     if (R.dimensions)
       for (const n of R.dimensions) {
         const [U, P] = n.split(".");
-        if (U === _ && S.dimensions && S.dimensions[P]) {
+        if (U === r && S.dimensions && S.dimensions[P]) {
           const l = S.dimensions[P], c = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A);
-          s[P] = C`${c}`.as(P);
+          t[P] = C`${c}`.as(P);
         }
       }
     if (R.timeDimensions)
       for (const n of R.timeDimensions) {
         const [U, P] = n.dimension.split(".");
-        if (U === _ && S.dimensions && S.dimensions[P]) {
+        if (U === r && S.dimensions && S.dimensions[P]) {
           const l = S.dimensions[P], c = this.queryBuilder.buildTimeDimensionExpression(l.sql, n.granularity, A);
-          s[P] = C`${c}`.as(P);
+          t[P] = C`${c}`.as(P);
         }
       }
-    if (Object.keys(s).length === 0)
+    if (Object.keys(t).length === 0)
       return null;
-    let I = A.db.select(s).from(N.from);
+    let I = A.db.select(t).from(N.from);
     const O = e ? {
       ...e,
       preAggregationCTEs: e.preAggregationCTEs?.filter((n) => n.cube.name !== S.name)
-    } : void 0, t = this.queryBuilder.buildWhereConditions(S, R, A, O), L = [];
+    } : void 0, s = this.queryBuilder.buildWhereConditions(S, R, A, O), L = [];
     if (R.timeDimensions)
       for (const n of R.timeDimensions) {
         const [U, P] = n.dimension.split(".");
-        if (U === _ && S.dimensions && S.dimensions[P] && n.dateRange) {
-          const l = S.dimensions[P], c = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(c, n.dateRange);
-          B && L.push(B);
+        if (U === r && S.dimensions && S.dimensions[P] && n.dateRange) {
+          const l = S.dimensions[P], c = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A), m = this.queryBuilder.buildDateRangeCondition(c, n.dateRange);
+          m && L.push(m);
         }
       }
     if (R.filters) {
       for (const n of R.filters)
         if (!("and" in n) && !("or" in n) && "member" in n && "operator" in n) {
           const U = n, [P, l] = U.member.split(".");
-          if (P === _ && S.dimensions && S.dimensions[l]) {
+          if (P === r && S.dimensions && S.dimensions[l]) {
             const c = S.dimensions[l];
             if (U.operator === "inDateRange") {
-              const B = this.queryBuilder.buildMeasureExpression({ sql: c.sql, type: "number" }, A), p = this.queryBuilder.buildDateRangeCondition(B, U.values);
+              const m = this.queryBuilder.buildMeasureExpression({ sql: c.sql, type: "number" }, A), p = this.queryBuilder.buildDateRangeCondition(m, U.values);
               p && L.push(p);
             }
           }
         }
     }
     const a = [];
-    if (N.where && a.push(N.where), a.push(...t, ...L), a.length > 0) {
-      const n = a.length === 1 ? a[0] : h(...a);
+    if (N.where && a.push(N.where), a.push(...s, ...L), a.length > 0) {
+      const n = a.length === 1 ? a[0] : f(...a);
       I = I.where(n);
     }
     const o = [];
@@ -2019,7 +2019,7 @@ class UE {
     if (R.dimensions)
       for (const n of R.dimensions) {
         const [U, P] = n.split(".");
-        if (U === _ && S.dimensions && S.dimensions[P]) {
+        if (U === r && S.dimensions && S.dimensions[P]) {
           const l = S.dimensions[P], c = $(l.sql, A);
           o.push(c);
         }
@@ -2027,7 +2027,7 @@ class UE {
     if (R.timeDimensions)
       for (const n of R.timeDimensions) {
         const [U, P] = n.dimension.split(".");
-        if (U === _ && S.dimensions && S.dimensions[P]) {
+        if (U === r && S.dimensions && S.dimensions[P]) {
           const l = S.dimensions[P], c = this.queryBuilder.buildTimeDimensionExpression(l.sql, n.granularity, A);
           o.push(c);
         }
@@ -2044,10 +2044,10 @@ class UE {
       throw new Error(`CTE info not found for cube ${E.cube.name}`);
     const S = [];
     for (const N of e.joinKeys) {
-      const s = N.sourceColumnObj || C.identifier(N.sourceColumn), _ = C`${C.identifier(R)}.${C.identifier(N.targetColumn)}`;
-      S.push(tE(s, _));
+      const t = N.sourceColumnObj || C.identifier(N.sourceColumn), r = C`${C.identifier(R)}.${C.identifier(N.targetColumn)}`;
+      S.push(sE(t, r));
     }
-    return S.length === 1 ? S[0] : h(...S);
+    return S.length === 1 ? S[0] : f(...S);
   }
   /**
    * Build unified query that works for both single and multi-cube queries
@@ -2059,7 +2059,7 @@ class UE {
         const U = this.buildPreAggregationCTE(n, R, A, E);
         U && (e.push(U), S.set(n.cube.name, n.cteAlias));
       }
-    const N = E.primaryCube.sql(A), _ = { ...this.queryBuilder.buildSelections(
+    const N = E.primaryCube.sql(A), r = { ...this.queryBuilder.buildSelections(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -2069,12 +2069,12 @@ class UE {
       for (const n of E.preAggregationCTEs) {
         const U = n.cube.name;
         for (const P of n.measures)
-          if (_[P]) {
+          if (r[P]) {
             const [, l] = P.split("."), c = this.getCubesFromPlan(E).get(U);
             if (c && c.measures && c.measures[l]) {
-              const B = c.measures[l], p = C`${C.identifier(n.cteAlias)}.${C.identifier(l)}`;
+              const m = c.measures[l], p = C`${C.identifier(n.cteAlias)}.${C.identifier(l)}`;
               let V;
-              switch (B.type) {
+              switch (m.type) {
                 case "count":
                 case "countDistinct":
                 case "sum":
@@ -2095,26 +2095,26 @@ class UE {
                 default:
                   V = g(p);
               }
-              _[P] = C`${V}`.as(P);
+              r[P] = C`${V}`.as(P);
             }
           }
-        for (const P in _) {
+        for (const P in r) {
           const [l, c] = P.split(".");
           if (l === U) {
-            const B = this.getCubesFromPlan(E).get(U), p = B && B.dimensions?.[c], V = P.startsWith(U + ".");
+            const m = this.getCubesFromPlan(E).get(U), p = m && m.dimensions?.[c], V = P.startsWith(U + ".");
             if (p || V) {
               let x = n.joinKeys.find((LE) => LE.targetColumn === c);
-              if (!x && B?.dimensions?.[c]) {
-                const LE = B.dimensions[c].sql;
+              if (!x && m?.dimensions?.[c]) {
+                const LE = m.dimensions[c].sql;
                 x = n.joinKeys.find((LR) => LR.targetColumnObj === LE);
               }
-              x ? _[P] = C`${C.identifier(n.cteAlias)}.${C.identifier(c)}`.as(P) : V && B?.dimensions?.[c] && (_[P] = C`${C.identifier(n.cteAlias)}.${C.identifier(c)}`.as(P));
+              x ? r[P] = C`${C.identifier(n.cteAlias)}.${C.identifier(c)}`.as(P) : V && m?.dimensions?.[c] && (r[P] = C`${C.identifier(n.cteAlias)}.${C.identifier(c)}`.as(P));
             }
           }
         }
       }
-    let I = A.db.select(_).from(N.from);
-    if (e.length > 0 && (I = A.db.with(...e).select(_).from(N.from)), N.joins)
+    let I = A.db.select(r).from(N.from);
+    if (e.length > 0 && (I = A.db.with(...e).select(r).from(N.from)), N.joins)
       for (const n of N.joins)
         switch (n.type || "left") {
           case "left":
@@ -2161,7 +2161,7 @@ class UE {
         const P = n.cube.sql(A);
         P.where && O.push(P.where);
       }
-    const t = this.queryBuilder.buildWhereConditions(
+    const s = this.queryBuilder.buildWhereConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -2169,8 +2169,8 @@ class UE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (t.length > 0 && O.push(...t), O.length > 0) {
-      const n = O.length === 1 ? O[0] : h(...O);
+    if (s.length > 0 && O.push(...s), O.length > 0) {
+      const n = O.length === 1 ? O[0] : f(...O);
       I = I.where(n);
     }
     const L = this.queryBuilder.buildGroupByFields(
@@ -2191,7 +2191,7 @@ class UE {
       // Pass the queryPlan to handle CTE scenarios
     );
     if (a.length > 0) {
-      const n = a.length === 1 ? a[0] : h(...a);
+      const n = a.length === 1 ? a[0] : f(...a);
       I = I.having(n);
     }
     const o = this.queryBuilder.buildOrderBy(R);
@@ -2228,10 +2228,10 @@ class UE {
       db: this.dbExecutor.db,
       schema: this.dbExecutor.schema,
       securityContext: A
-    }, S = this.queryPlanner.createQueryPlan(E, R, e), s = this.buildUnifiedQuery(S, R, e).toSQL();
+    }, S = this.queryPlanner.createQueryPlan(E, R, e), t = this.buildUnifiedQuery(S, R, e).toSQL();
     return {
-      sql: s.sql,
-      params: s.params
+      sql: t.sql,
+      params: t.params
     };
   }
   /**
@@ -2239,40 +2239,40 @@ class UE {
    */
   generateAnnotations(E, R) {
     const A = {}, e = {}, S = {}, N = [E.primaryCube];
-    if (E.joinCubes && E.joinCubes.length > 0 && N.push(...E.joinCubes.map((s) => s.cube)), R.measures)
-      for (const s of R.measures) {
-        const [_, I] = s.split("."), O = N.find((t) => t.name === _);
+    if (E.joinCubes && E.joinCubes.length > 0 && N.push(...E.joinCubes.map((t) => t.cube)), R.measures)
+      for (const t of R.measures) {
+        const [r, I] = t.split("."), O = N.find((s) => s.name === r);
         if (O && O.measures[I]) {
-          const t = O.measures[I];
-          A[s] = {
-            title: t.title || I,
-            shortTitle: t.title || I,
-            type: t.type
+          const s = O.measures[I];
+          A[t] = {
+            title: s.title || I,
+            shortTitle: s.title || I,
+            type: s.type
           };
         }
       }
     if (R.dimensions)
-      for (const s of R.dimensions) {
-        const [_, I] = s.split("."), O = N.find((t) => t.name === _);
+      for (const t of R.dimensions) {
+        const [r, I] = t.split("."), O = N.find((s) => s.name === r);
         if (O && O.dimensions[I]) {
-          const t = O.dimensions[I];
-          e[s] = {
-            title: t.title || I,
-            shortTitle: t.title || I,
-            type: t.type
+          const s = O.dimensions[I];
+          e[t] = {
+            title: s.title || I,
+            shortTitle: s.title || I,
+            type: s.type
           };
         }
       }
     if (R.timeDimensions)
-      for (const s of R.timeDimensions) {
-        const [_, I] = s.dimension.split("."), O = N.find((t) => t.name === _);
+      for (const t of R.timeDimensions) {
+        const [r, I] = t.dimension.split("."), O = N.find((s) => s.name === r);
         if (O && O.dimensions && O.dimensions[I]) {
-          const t = O.dimensions[I];
-          S[s.dimension] = {
-            title: t.title || I,
-            shortTitle: t.title || I,
-            type: t.type,
-            granularity: s.granularity
+          const s = O.dimensions[I];
+          S[t.dimension] = {
+            title: s.title || I,
+            shortTitle: s.title || I,
+            type: s.type,
+            granularity: t.granularity
           };
         }
       }
@@ -2284,7 +2284,7 @@ class UE {
     };
   }
 }
-const r = (T) => T.flatMap(dR), dR = (T) => RE(hR(T)).map(fR), fR = (T) => T.replace(/ +/g, " ").trim(), hR = (T) => ({
+const _ = (T) => T.flatMap(dR), dR = (T) => RE(fR(T)).map(hR), hR = (T) => T.replace(/ +/g, " ").trim(), fR = (T) => ({
   type: "mandatory_block",
   items: jE(T, 0)[0]
 }), jE = (T, E, R) => {
@@ -2351,21 +2351,21 @@ const r = (T) => T.flatMap(dR), dR = (T) => RE(hR(T)).map(fR), fR = (T) => T.rep
 };
 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";
+  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_KEYWORD_PHRASE = "RESERVED_KEYWORD_PHRASE", T.RESERVED_DATA_TYPE_PHRASE = "RESERVED_DATA_TYPE_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 qT = (T) => ({
   type: D.EOF,
   raw: "«EOF»",
   text: "«EOF»",
   start: T
-}), j = qT(1 / 0), Z = (T) => (E) => E.type === T.type && E.text === T.text, J = {
+}), j = qT(1 / 0), Z = (T) => (E) => E.type === T.type && E.text === T.text, w = {
   ARRAY: Z({ text: "ARRAY", type: D.RESERVED_DATA_TYPE }),
   BY: Z({ text: "BY", type: D.RESERVED_KEYWORD }),
   SET: Z({ text: "SET", type: D.RESERVED_CLAUSE }),
   STRUCT: Z({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
   WINDOW: Z({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
   VALUES: Z({ text: "VALUES", type: D.RESERVED_CLAUSE })
-}, jT = (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, KR = (T) => T === D.AND || T === D.OR || T === D.XOR, $R = [
+}, jT = (T) => T === D.RESERVED_DATA_TYPE || T === D.RESERVED_KEYWORD || T === D.RESERVED_FUNCTION_NAME || T === D.RESERVED_KEYWORD_PHRASE || T === D.RESERVED_DATA_TYPE_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, KR = (T) => T === D.AND || T === D.OR || T === D.XOR, $R = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -3017,7 +3017,7 @@ const qT = (T) => ({
   "CASCADE",
   "RESTRICT",
   "DETERMINISTIC"
-], JR = [
+], wR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types
   "ARRAY",
   "BOOL",
@@ -3042,7 +3042,7 @@ const qT = (T) => ({
   "STRUCT",
   "TIME",
   "TIMEZONE"
-], wR = r(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), xR = r([
+], JR = _(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), xR = _([
   // Queries: https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax
   "WITH [RECURSIVE]",
   "FROM",
@@ -3071,9 +3071,9 @@ const qT = (T) => ({
   "WITH CONNECTION",
   "WITH PARTITION COLUMNS",
   "REMOTE WITH CONNECTION"
-]), CT = r([
+]), CT = _([
   "CREATE [OR REPLACE] [TEMP|TEMPORARY|SNAPSHOT|EXTERNAL] TABLE [IF NOT EXISTS]"
-]), GE = r([
+]), GE = _([
   // - create:
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -3161,15 +3161,15 @@ const qT = (T) => ({
   "ASSERT",
   // Other, https://cloud.google.com/bigquery/docs/reference/standard-sql/other-statements
   "EXPORT DATA"
-]), vR = r([
+]), vR = _([
   "UNION {ALL | DISTINCT}",
   "EXCEPT DISTINCT",
   "INTERSECT DISTINCT"
-]), QR = r([
+]), QR = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), ZR = r([
+]), ZR = _([
   // 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
@@ -3180,16 +3180,17 @@ const qT = (T) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), qR = {
+]), qR = _([]), jR = {
   name: "bigquery",
   tokenizerOptions: {
-    reservedSelect: wR,
+    reservedSelect: JR,
     reservedClauses: [...xR, ...GE, ...CT],
     reservedSetOperations: vR,
     reservedJoins: QR,
-    reservedPhrases: ZR,
+    reservedKeywordPhrases: ZR,
+    reservedDataTypePhrases: qR,
     reservedKeywords: gR,
-    reservedDataTypes: JR,
+    reservedDataTypes: wR,
     reservedFunctionNames: $R,
     extraParens: ["[]"],
     stringTypes: [
@@ -3208,27 +3209,27 @@ const qT = (T) => ({
     variableTypes: [{ regex: String.raw`@@\w+` }],
     lineCommentTypes: ["--", "#"],
     operators: ["&", "|", "^", "~", ">>", "<<", "||", "=>"],
-    postProcess: jR
+    postProcess: kR
   },
   formatOptions: {
     onelineClauses: [...CT, ...GE],
     tabularOnelineClauses: GE
   }
 };
-function jR(T) {
-  return kR(zR(T));
-}
 function kR(T) {
+  return zR(EA(T));
+}
+function zR(T) {
   let E = j;
   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 zR(T) {
+function EA(T) {
   var E;
   const R = [];
   for (let A = 0; A < T.length; A++) {
     const e = T[A];
-    if ((J.ARRAY(e) || J.STRUCT(e)) && ((E = T[A + 1]) === null || E === void 0 ? void 0 : E.text) === "<") {
-      const S = EA(T, A + 1), N = T.slice(A, S + 1);
+    if ((w.ARRAY(e) || w.STRUCT(e)) && ((E = T[A + 1]) === null || E === void 0 ? void 0 : E.text) === "<") {
+      const S = TA(T, A + 1), N = T.slice(A, S + 1);
       R.push({
         type: D.IDENTIFIER,
         raw: N.map(LT("raw")).join(""),
@@ -3241,7 +3242,7 @@ function zR(T) {
   return R;
 }
 const LT = (T) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[T] + " " : E[T];
-function EA(T, E) {
+function TA(T, E) {
   let R = 0;
   for (let A = E; A < T.length; A++) {
     const e = T[A];
@@ -3250,7 +3251,7 @@ function EA(T, E) {
   }
   return T.length - 1;
 }
-const TA = [
+const RA = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=bif-aggregate-functions
   "ARRAY_AGG",
   "AVG",
@@ -3570,7 +3571,7 @@ const TA = [
   "RATIO_TO_REPORT",
   // Type casting
   "CAST"
-], RA = [
+], AA = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=sql-reserved-schema-names-reserved-words
   "ACTIVATE",
   "ADD",
@@ -3971,7 +3972,7 @@ const TA = [
   "XMLNAMESPACES",
   "YEAR",
   "YEARS"
-], AA = [
+], eA = [
   // https://www.ibm.com/docs/en/db2-for-zos/12?topic=columns-data-types
   "ARRAY",
   "BIGINT",
@@ -4013,7 +4014,7 @@ const TA = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], eA = r(["SELECT [ALL | DISTINCT]"]), SA = r([
+], SA = _(["SELECT [ALL | DISTINCT]"]), IA = _([
   // queries
   "WITH",
   "FROM",
@@ -4042,9 +4043,9 @@ const TA = [
   "WHEN [NOT] MATCHED [THEN]",
   "UPDATE SET",
   "INSERT"
-]), _T = r([
+]), _T = _([
   "CREATE [GLOBAL TEMPORARY | EXTERNAL] TABLE [IF NOT EXISTS]"
-]), lE = r([
+]), lE = _([
   // - create:
   "CREATE [OR REPLACE] VIEW",
   // - update:
@@ -4247,26 +4248,27 @@ const TA = [
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}",
   "WHILE"
-]), IA = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), OA = r([
+]), OA = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), NA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), NA = r([
+]), sA = _([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), tA = {
+]), tA = _([]), CA = {
   name: "db2",
   tokenizerOptions: {
-    reservedSelect: eA,
-    reservedClauses: [...SA, ..._T, ...lE],
-    reservedSetOperations: IA,
-    reservedJoins: OA,
-    reservedPhrases: NA,
-    reservedKeywords: RA,
-    reservedDataTypes: AA,
-    reservedFunctionNames: TA,
+    reservedSelect: SA,
+    reservedClauses: [...IA, ..._T, ...lE],
+    reservedSetOperations: OA,
+    reservedJoins: NA,
+    reservedKeywordPhrases: sA,
+    reservedDataTypePhrases: tA,
+    reservedKeywords: AA,
+    reservedDataTypes: eA,
+    reservedFunctionNames: RA,
     extraParens: ["[]"],
     stringTypes: [
       { quote: "''-qq", prefixes: ["G", "N", "U&"] },
@@ -4300,7 +4302,7 @@ const TA = [
     onelineClauses: [..._T, ...lE],
     tabularOnelineClauses: lE
   }
-}, sA = [
+}, LA = [
   // 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",
@@ -4634,7 +4636,7 @@ const TA = [
   "ROW_NUMBER",
   // Type casting
   "CAST"
-], CA = [
+], _A = [
   // 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.
@@ -5130,7 +5132,7 @@ const TA = [
   "YEARS",
   "YES",
   "ZONE"
-], LA = [
+], rA = [
   // https://www.ibm.com/docs/en/i/7.2?topic=iaodsd-odbc-data-types-how-they-correspond-db2-i-database-types
   "ARRAY",
   "BIGINT",
@@ -5166,7 +5168,7 @@ const TA = [
   "VARCHAR",
   "VARGRAPHIC",
   "XML"
-], _A = r(["SELECT [ALL | DISTINCT]"]), rA = r([
+], nA = _(["SELECT [ALL | DISTINCT]"]), iA = _([
   // queries
   "WITH [RECURSIVE]",
   "INTO",
@@ -5196,7 +5198,7 @@ const TA = [
   "INSERT",
   // Data definition - table
   "FOR SYSTEM NAME"
-]), rT = r(["CREATE [OR REPLACE] TABLE"]), cE = r([
+]), rT = _(["CREATE [OR REPLACE] TABLE"]), cE = _([
   // - create:
   "CREATE [OR REPLACE] [RECURSIVE] VIEW",
   // - update:
@@ -5292,27 +5294,28 @@ const TA = [
   "TAG",
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}"
-]), nA = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), iA = r([
+]), DA = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), aA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "[LEFT | RIGHT] EXCEPTION JOIN",
   "{INNER | CROSS} JOIN"
-]), DA = r([
+]), oA = _([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), aA = {
+]), PA = _([]), MA = {
   name: "db2i",
   tokenizerOptions: {
-    reservedSelect: _A,
-    reservedClauses: [...rA, ...rT, ...cE],
-    reservedSetOperations: nA,
-    reservedJoins: iA,
-    reservedPhrases: DA,
-    reservedKeywords: CA,
-    reservedDataTypes: LA,
-    reservedFunctionNames: sA,
+    reservedSelect: nA,
+    reservedClauses: [...iA, ...rT, ...cE],
+    reservedSetOperations: DA,
+    reservedJoins: aA,
+    reservedKeywordPhrases: oA,
+    reservedDataTypePhrases: PA,
+    reservedKeywords: _A,
+    reservedDataTypes: rA,
+    reservedFunctionNames: LA,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     stringTypes: [
@@ -5329,7 +5332,7 @@ const TA = [
     onelineClauses: [...rT, ...cE],
     tabularOnelineClauses: cE
   }
-}, oA = [
+}, UA = [
   // Functions from DuckDB (excluding those that start with an underscore):
   // SELECT DISTINCT upper(function_name) AS function_name
   // FROM duckdb_functions()
@@ -5992,7 +5995,7 @@ const TA = [
   // 'NULL', we really prefer treating it as keyword
   "RANK",
   "ROW_NUMBER"
-], PA = [
+], GA = [
   // Keywords from DuckDB:
   // SELECT upper(keyword_name)
   // FROM duckdb_keywords()
@@ -6074,7 +6077,7 @@ const TA = [
   "WHERE",
   "WINDOW",
   "WITH"
-], MA = [
+], lA = [
   // Types from DuckDB:
   // SELECT DISTINCT upper(type_name)
   // FROM duckdb_types()
@@ -6154,7 +6157,7 @@ const TA = [
   "UUID",
   "VARBINARY",
   "VARCHAR"
-], UA = r(["SELECT [ALL | DISTINCT]"]), GA = r([
+], cA = _(["SELECT [ALL | DISTINCT]"]), uA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -6178,9 +6181,9 @@ const TA = [
   "SET",
   // other:
   "RETURNING"
-]), nT = r([
+]), nT = _([
   "CREATE [OR REPLACE] [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"
-]), uE = r([
+]), uE = _([
   // TABLE
   // - update:
   "UPDATE",
@@ -6258,11 +6261,11 @@ const TA = [
   "PREPARE",
   "EXECUTE",
   "DEALLOCATE [PREPARE]"
-]), lA = r([
+]), HA = _([
   "UNION [ALL | BY NAME]",
   "EXCEPT [ALL]",
   "INTERSECT [ALL]"
-]), cA = r([
+]), BA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -6271,25 +6274,26 @@ const TA = [
   "POSITIONAL JOIN",
   "ANTI JOIN",
   "SEMI JOIN"
-]), uA = r([
+]), mA = _([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "SIMILAR TO",
-  "IS [NOT] DISTINCT FROM",
-  "TIMESTAMP WITH TIME ZONE"
-]), HA = {
+  "IS [NOT] DISTINCT FROM"
+]), FA = _(["TIMESTAMP WITH TIME ZONE"]), YA = {
   name: "duckdb",
   tokenizerOptions: {
-    reservedSelect: UA,
-    reservedClauses: [...GA, ...nT, ...uE],
-    reservedSetOperations: lA,
-    reservedJoins: cA,
-    reservedPhrases: uA,
+    reservedSelect: cA,
+    reservedClauses: [...uA, ...nT, ...uE],
+    reservedSetOperations: HA,
+    reservedJoins: BA,
+    reservedKeywordPhrases: mA,
+    reservedDataTypePhrases: FA,
     supportsXor: !0,
-    reservedKeywords: PA,
-    reservedDataTypes: MA,
-    reservedFunctionNames: oA,
+    reservedKeywords: GA,
+    reservedDataTypes: lA,
+    reservedFunctionNames: UA,
     nestedBlockComments: !0,
     extraParens: ["[]", "{}"],
+    underscoresInNumbers: !0,
     stringTypes: [
       "$$",
       "''-qq",
@@ -6350,7 +6354,7 @@ const TA = [
     onelineClauses: [...nT, ...uE],
     tabularOnelineClauses: uE
   }
-}, BA = [
+}, pA = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+UDF
   // math
   "ABS",
@@ -6558,7 +6562,7 @@ const TA = [
   "CUME_DIST",
   "PERCENT_RANK",
   "NTILE"
-], mA = [
+], dA = [
   // 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",
@@ -6873,7 +6877,7 @@ const TA = [
   "JSONFILE",
   "INPUTFORMAT",
   "OUTPUTFORMAT"
-], FA = [
+], hA = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Types
   "ARRAY",
   "BIGINT",
@@ -6894,7 +6898,7 @@ const TA = [
   "STRUCT",
   "TIMESTAMP",
   "VARCHAR"
-], YA = r(["SELECT [ALL | DISTINCT]"]), pA = r([
+], fA = _(["SELECT [ALL | DISTINCT]"]), VA = _([
   // queries
   "WITH",
   "FROM",
@@ -6928,9 +6932,9 @@ const TA = [
   //   https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DML#LanguageManualDML-Loadingfilesintotables
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), iT = r([
+]), iT = _([
   "CREATE [TEMPORARY] [EXTERNAL] TABLE [IF NOT EXISTS]"
-]), HE = r([
+]), HE = _([
   // - create:
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
   // - update:
@@ -6955,23 +6959,24 @@ const TA = [
   "STORED AS",
   "STORED BY",
   "ROW FORMAT"
-]), dA = r(["UNION [ALL | DISTINCT]"]), fA = r([
+]), WA = _(["UNION [ALL | DISTINCT]"]), XA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "LEFT SEMI JOIN"
-]), hA = r(["{ROWS | RANGE} BETWEEN"]), VA = {
+]), bA = _(["{ROWS | RANGE} BETWEEN"]), yA = _([]), KA = {
   name: "hive",
   tokenizerOptions: {
-    reservedSelect: YA,
-    reservedClauses: [...pA, ...iT, ...HE],
-    reservedSetOperations: dA,
-    reservedJoins: fA,
-    reservedPhrases: hA,
-    reservedKeywords: mA,
-    reservedDataTypes: FA,
-    reservedFunctionNames: BA,
+    reservedSelect: fA,
+    reservedClauses: [...VA, ...iT, ...HE],
+    reservedSetOperations: WA,
+    reservedJoins: XA,
+    reservedKeywordPhrases: bA,
+    reservedDataTypePhrases: yA,
+    reservedKeywords: dA,
+    reservedDataTypes: hA,
+    reservedFunctionNames: pA,
     extraParens: ["[]"],
     stringTypes: ['""-bs', "''-bs"],
     identTypes: ["``"],
@@ -6986,13 +6991,13 @@ const TA = [
 function CE(T) {
   return T.map((E, R) => {
     const A = T[R + 1] || j;
-    if (J.SET(E) && A.text === "(")
+    if (w.SET(E) && A.text === "(")
       return Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME });
     const e = T[R - 1] || j;
-    return J.VALUES(E) && e.text === "=" ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E;
+    return w.VALUES(E) && e.text === "=" ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E;
   });
 }
-const WA = [
+const $A = [
   // https://mariadb.com/kb/en/reserved-words/
   "ACCESSIBLE",
   "ADD",
@@ -7209,7 +7214,7 @@ const WA = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], XA = [
+], gA = [
   // https://mariadb.com/kb/en/data-types/
   "BIGINT",
   "BINARY",
@@ -7260,7 +7265,7 @@ const WA = [
   "YEAR"
   // 'NUMBER', // ?? In oracle mode only
   // 'SET' // handled as special-case in postProcess
-], bA = [
+], wA = [
   // https://mariadb.com/kb/en/information-schema-sql_functions-table/
   "ADDDATE",
   "ADD_MONTHS",
@@ -7498,7 +7503,7 @@ const WA = [
   // CASE expression shorthands
   "COALESCE",
   "NULLIF"
-], yA = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), KA = r([
+], JA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), xA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -7520,9 +7525,9 @@ const WA = [
   "SET",
   // other
   "RETURNING"
-]), DT = r([
+]), DT = _([
   "CREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]"
-]), BE = r([
+]), BE = _([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -7729,12 +7734,12 @@ const WA = [
   "XA RECOVER",
   "XA ROLLBACK",
   "XA START"
-]), $A = r([
+]), vA = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]",
   "MINUS [ALL | DISTINCT]"
-]), gA = r([
+]), QA = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -7742,23 +7747,24 @@ const WA = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), JA = r([
+]), ZA = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), wA = {
+]), qA = _([]), jA = {
   name: "mariadb",
   tokenizerOptions: {
-    reservedSelect: yA,
-    reservedClauses: [...KA, ...DT, ...BE],
-    reservedSetOperations: $A,
-    reservedJoins: gA,
-    reservedPhrases: JA,
+    reservedSelect: JA,
+    reservedClauses: [...xA, ...DT, ...BE],
+    reservedSetOperations: vA,
+    reservedJoins: QA,
+    reservedKeywordPhrases: ZA,
+    reservedDataTypePhrases: qA,
     supportsXor: !0,
-    reservedKeywords: WA,
-    reservedDataTypes: XA,
-    reservedFunctionNames: bA,
+    reservedKeywords: $A,
+    reservedDataTypes: gA,
+    reservedFunctionNames: wA,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -7797,7 +7803,7 @@ const WA = [
     onelineClauses: [...DT, ...BE],
     tabularOnelineClauses: BE
   }
-}, xA = [
+}, kA = [
   // https://dev.mysql.com/doc/refman/8.0/en/keywords.html
   "ACCESSIBLE",
   "ADD",
@@ -8028,7 +8034,7 @@ const WA = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], vA = [
+], zA = [
   // https://dev.mysql.com/doc/refman/8.0/en/data-types.html
   "BIGINT",
   "BINARY",
@@ -8080,7 +8086,7 @@ const WA = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], QA = [
+], Ee = [
   // https://dev.mysql.com/doc/refman/8.0/en/built-in-function-reference.html
   "ABS",
   "ACOS",
@@ -8503,7 +8509,7 @@ const WA = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], ZA = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), qA = r([
+], Te = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), Re = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8523,7 +8529,7 @@ const WA = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), aT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), mE = r([
+]), aT = _(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), mE = _([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -8704,7 +8710,7 @@ const WA = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), jA = r(["UNION [ALL | DISTINCT]"]), kA = r([
+]), Ae = _(["UNION [ALL | DISTINCT]"]), ee = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8712,23 +8718,24 @@ const WA = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), zA = r([
+]), Se = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), Ee = {
+]), Ie = _([]), Oe = {
   name: "mysql",
   tokenizerOptions: {
-    reservedSelect: ZA,
-    reservedClauses: [...qA, ...aT, ...mE],
-    reservedSetOperations: jA,
-    reservedJoins: kA,
-    reservedPhrases: zA,
+    reservedSelect: Te,
+    reservedClauses: [...Re, ...aT, ...mE],
+    reservedSetOperations: Ae,
+    reservedJoins: ee,
+    reservedKeywordPhrases: Se,
+    reservedDataTypePhrases: Ie,
     supportsXor: !0,
-    reservedKeywords: xA,
-    reservedDataTypes: vA,
-    reservedFunctionNames: QA,
+    reservedKeywords: kA,
+    reservedDataTypes: zA,
+    reservedFunctionNames: Ee,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -8769,7 +8776,7 @@ const WA = [
     onelineClauses: [...aT, ...mE],
     tabularOnelineClauses: mE
   }
-}, Te = [
+}, Ne = [
   // https://docs.pingcap.com/tidb/stable/keywords
   "ADD",
   "ALL",
@@ -8961,7 +8968,7 @@ const WA = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], Re = [
+], se = [
   // https://docs.pingcap.com/tidb/stable/data-type-overview
   "BIGINT",
   "BINARY",
@@ -9008,7 +9015,7 @@ const WA = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], Ae = [
+], te = [
   // 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
@@ -9334,7 +9341,7 @@ const WA = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], ee = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), Se = r([
+], Ce = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), Le = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -9354,7 +9361,7 @@ const WA = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), oT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), FE = r([
+]), oT = _(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), FE = _([
   // https://docs.pingcap.com/tidb/stable/sql-statement-create-view
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // https://docs.pingcap.com/tidb/stable/sql-statement-update
@@ -9469,7 +9476,7 @@ const WA = [
   "UNLOCK TABLES",
   // https://docs.pingcap.com/tidb/stable/sql-statement-use
   "USE"
-]), Ie = r(["UNION [ALL | DISTINCT]"]), Oe = r([
+]), _e = _(["UNION [ALL | DISTINCT]"]), re = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -9477,23 +9484,24 @@ const WA = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), Ne = r([
+]), ne = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), te = {
+]), ie = _([]), De = {
   name: "tidb",
   tokenizerOptions: {
-    reservedSelect: ee,
-    reservedClauses: [...Se, ...oT, ...FE],
-    reservedSetOperations: Ie,
-    reservedJoins: Oe,
-    reservedPhrases: Ne,
+    reservedSelect: Ce,
+    reservedClauses: [...Le, ...oT, ...FE],
+    reservedSetOperations: _e,
+    reservedJoins: re,
+    reservedKeywordPhrases: ne,
+    reservedDataTypePhrases: ie,
     supportsXor: !0,
-    reservedKeywords: Te,
-    reservedDataTypes: Re,
-    reservedFunctionNames: Ae,
+    reservedKeywords: Ne,
+    reservedDataTypes: se,
+    reservedFunctionNames: te,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -9534,7 +9542,7 @@ const WA = [
     onelineClauses: [...oT, ...FE],
     tabularOnelineClauses: FE
   }
-}, se = [
+}, ae = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/functions.html
   "ABORT",
   "ABS",
@@ -9764,7 +9772,7 @@ const WA = [
   // 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"
-], Ce = [
+], oe = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/reservedwords.html
   "ADVISE",
   "ALL",
@@ -9970,7 +9978,7 @@ const WA = [
   "WITHIN",
   "WORK",
   "XOR"
-], Le = [
+], Pe = [
   // N1QL does not support any way of declaring types for columns.
   // It does not support the CREATE TABLE statement nor the CAST() expression.
   //
@@ -9979,7 +9987,7 @@ const WA = [
   // which it actually doesn't use.
   //
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/datatypes.html
-], _e = r(["SELECT [ALL | DISTINCT]"]), re = r([
+], Me = _(["SELECT [ALL | DISTINCT]"]), Ue = _([
   // queries
   "WITH",
   "FROM",
@@ -10006,7 +10014,7 @@ const WA = [
   "NEST",
   "UNNEST",
   "RETURNING"
-]), PT = r([
+]), PT = _([
   // - update:
   "UPDATE",
   // - delete:
@@ -10046,18 +10054,19 @@ const WA = [
   "SET CURRENT SCHEMA",
   "SHOW",
   "USE [PRIMARY] KEYS"
-]), ne = r(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), ie = r(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), De = r(["{ROWS | RANGE | GROUPS} BETWEEN"]), ae = {
+]), Ge = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), le = _(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), ce = _(["{ROWS | RANGE | GROUPS} BETWEEN"]), ue = _([]), He = {
   name: "n1ql",
   tokenizerOptions: {
-    reservedSelect: _e,
-    reservedClauses: [...re, ...PT],
-    reservedSetOperations: ne,
-    reservedJoins: ie,
-    reservedPhrases: De,
+    reservedSelect: Me,
+    reservedClauses: [...Ue, ...PT],
+    reservedSetOperations: Ge,
+    reservedJoins: le,
+    reservedKeywordPhrases: ce,
+    reservedDataTypePhrases: ue,
     supportsXor: !0,
-    reservedKeywords: Ce,
-    reservedDataTypes: Le,
-    reservedFunctionNames: se,
+    reservedKeywords: oe,
+    reservedDataTypes: Pe,
+    reservedFunctionNames: ae,
     // 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.
@@ -10071,7 +10080,7 @@ const WA = [
   formatOptions: {
     onelineClauses: PT
   }
-}, oe = [
+}, Be = [
   // https://docs.oracle.com/cd/B19306_01/appdev.102/b14261/reservewords.htm
   // 'A',
   "ADD",
@@ -10376,7 +10385,7 @@ const WA = [
   "WRITE",
   "YEAR",
   "ZONE"
-], Pe = [
+], me = [
   // https://www.ibm.com/docs/en/db2/10.5?topic=plsql-data-types
   "ARRAY",
   "BFILE_BASE",
@@ -10414,7 +10423,7 @@ const WA = [
   "UROWID",
   "VARCHAR",
   "VARCHAR2"
-], Me = [
+], Fe = [
   // https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions001.htm
   // numeric
   "ABS",
@@ -10679,7 +10688,7 @@ const WA = [
   "PRESENTNNV",
   "PRESENTV",
   "PREVIOUS"
-], Ue = r(["SELECT [ALL | DISTINCT | UNIQUE]"]), Ge = r([
+], Ye = _(["SELECT [ALL | DISTINCT | UNIQUE]"]), pe = _([
   // queries
   "WITH",
   "FROM",
@@ -10703,9 +10712,9 @@ const WA = [
   "UPDATE SET",
   // other
   "RETURNING"
-]), MT = r([
+]), MT = _([
   "CREATE [GLOBAL TEMPORARY | PRIVATE TEMPORARY | SHARDED | DUPLICATED | IMMUTABLE BLOCKCHAIN | BLOCKCHAIN | IMMUTABLE] TABLE"
-]), YE = r([
+]), YE = _([
   // - create:
   "CREATE [OR REPLACE] [NO FORCE | FORCE] [EDITIONING | EDITIONABLE | EDITIONABLE EDITIONING | NONEDITIONABLE] VIEW",
   "CREATE MATERIALIZED VIEW",
@@ -10733,7 +10742,7 @@ const WA = [
   "EXCEPTION",
   "LOOP",
   "START WITH"
-]), le = r(["UNION [ALL]", "MINUS", "INTERSECT"]), ce = r([
+]), de = _(["UNION [ALL]", "MINUS", "INTERSECT"]), he = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -10741,22 +10750,23 @@ const WA = [
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), ue = r([
+]), fe = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "ON COMMIT",
   "{ROWS | RANGE} BETWEEN"
-]), He = {
+]), Ve = _([]), We = {
   name: "plsql",
   tokenizerOptions: {
-    reservedSelect: Ue,
-    reservedClauses: [...Ge, ...MT, ...YE],
-    reservedSetOperations: le,
-    reservedJoins: ce,
-    reservedPhrases: ue,
+    reservedSelect: Ye,
+    reservedClauses: [...pe, ...MT, ...YE],
+    reservedSetOperations: de,
+    reservedJoins: he,
+    reservedKeywordPhrases: fe,
+    reservedDataTypePhrases: Ve,
     supportsXor: !0,
-    reservedKeywords: oe,
-    reservedDataTypes: Pe,
-    reservedFunctionNames: Me,
+    reservedKeywords: Be,
+    reservedDataTypes: me,
+    reservedFunctionNames: Fe,
     stringTypes: [
       { quote: "''-qq", prefixes: ["N"] },
       { quote: "q''", prefixes: ["N"] }
@@ -10781,7 +10791,7 @@ const WA = [
       "@",
       "||"
     ],
-    postProcess: Be
+    postProcess: Xe
   },
   formatOptions: {
     alwaysDenseOperators: ["@"],
@@ -10789,11 +10799,11 @@ const WA = [
     tabularOnelineClauses: YE
   }
 };
-function Be(T) {
+function Xe(T) {
   let E = j;
-  return T.map((R) => J.SET(R) && J.BY(E) ? Object.assign(Object.assign({}, R), { type: D.RESERVED_KEYWORD }) : (jT(R.type) && (E = R), R));
+  return T.map((R) => w.SET(R) && w.BY(E) ? Object.assign(Object.assign({}, R), { type: D.RESERVED_KEYWORD }) : (jT(R.type) && (E = R), R));
 }
-const me = [
+const be = [
   // https://www.postgresql.org/docs/14/functions.html
   //
   // https://www.postgresql.org/docs/14/functions-math.html
@@ -11477,7 +11487,7 @@ const me = [
   "PG_MCV_LIST_ITEMS",
   // cast
   "CAST"
-], Fe = [
+], ye = [
   // https://www.postgresql.org/docs/14/sql-keywords-appendix.html
   "ALL",
   "ANALYSE",
@@ -11596,7 +11606,7 @@ const me = [
   "WITHOUT",
   "YEAR"
   // requires AS
-], Ye = [
+], Ke = [
   // https://www.postgresql.org/docs/current/datatype.html
   "ARRAY",
   "BIGINT",
@@ -11630,7 +11640,7 @@ const me = [
   "VARCHAR",
   "XML",
   "ZONE"
-], pe = r(["SELECT [ALL | DISTINCT]"]), de = r([
+], $e = _(["SELECT [ALL | DISTINCT]"]), ge = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -11653,9 +11663,9 @@ const me = [
   "SET",
   // other
   "RETURNING"
-]), UT = r([
+]), UT = _([
   "CREATE [GLOBAL | LOCAL] [TEMPORARY | TEMP | UNLOGGED] TABLE [IF NOT EXISTS]"
-]), pE = r([
+]), pE = _([
   // - create
   "CREATE [OR REPLACE] [TEMP | TEMPORARY] [RECURSIVE] VIEW",
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -11853,42 +11863,45 @@ const me = [
   "START TRANSACTION",
   "UNLISTEN",
   "VACUUM"
-]), fe = r([
+]), we = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), he = r([
+]), Je = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), Ve = r([
+]), xe = _([
   "PRIMARY KEY",
   "GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY",
   "ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]",
   "DO {NOTHING | UPDATE}",
   "AS MATERIALIZED",
   "{ROWS | RANGE | GROUPS} BETWEEN",
-  // https://www.postgresql.org/docs/current/datatype-datetime.html
-  "[TIMESTAMP | TIME] {WITH | WITHOUT} TIME ZONE",
   // comparison operator
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), We = {
+]), ve = _([
+  // https://www.postgresql.org/docs/current/datatype-datetime.html
+  "[TIMESTAMP | TIME] {WITH | WITHOUT} TIME ZONE"
+]), Qe = {
   name: "postgresql",
   tokenizerOptions: {
-    reservedSelect: pe,
-    reservedClauses: [...de, ...UT, ...pE],
-    reservedSetOperations: fe,
-    reservedJoins: he,
-    reservedPhrases: Ve,
-    reservedKeywords: Fe,
-    reservedDataTypes: Ye,
-    reservedFunctionNames: me,
+    reservedSelect: $e,
+    reservedClauses: [...ge, ...UT, ...pE],
+    reservedSetOperations: we,
+    reservedJoins: Je,
+    reservedKeywordPhrases: xe,
+    reservedDataTypePhrases: ve,
+    reservedKeywords: ye,
+    reservedDataTypes: Ke,
+    reservedFunctionNames: be,
     nestedBlockComments: !0,
     extraParens: ["[]"],
+    underscoresInNumbers: !0,
     stringTypes: [
       "$$",
       { quote: "''-qq", prefixes: ["U&"] },
@@ -12000,7 +12013,7 @@ const me = [
     onelineClauses: [...UT, ...pE],
     tabularOnelineClauses: pE
   }
-}, Xe = [
+}, Ze = [
   // https://docs.aws.amazon.com/redshift/latest/dg/c_Aggregate_Functions.html
   "ANY_VALUE",
   "APPROXIMATE PERCENTILE_DISC",
@@ -12017,7 +12030,7 @@ const me = [
   "VAR_SAMP",
   "VAR_POP",
   // https://docs.aws.amazon.com/redshift/latest/dg/c_Array_Functions.html
-  "array",
+  // 'array',
   "array_concat",
   "array_flatten",
   "get_array_length",
@@ -12346,7 +12359,7 @@ const me = [
   "SLICE_NUM",
   "USER",
   "VERSION"
-], be = [
+], qe = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_pg_keywords.html
   "AES128",
   "AES256",
@@ -12535,7 +12548,7 @@ const me = [
    * SVL: https://docs.aws.amazon.com/redshift/latest/dg/svl_views.html
    * SVV: https://docs.aws.amazon.com/redshift/latest/dg/svv_views.html
    */
-], ye = [
+], je = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_Character_types.html#r_Character_types-text-and-bpchar-types
   "ARRAY",
   "BIGINT",
@@ -12556,7 +12569,7 @@ const me = [
   "TEXT",
   "VARBYTE",
   "VARCHAR"
-], Ke = r(["SELECT [ALL | DISTINCT]"]), $e = r([
+], ke = _(["SELECT [ALL | DISTINCT]"]), ze = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -12574,9 +12587,9 @@ const me = [
   "VALUES",
   // - update:
   "SET"
-]), GT = r([
+]), GT = _([
   "CREATE [TEMPORARY | TEMP | LOCAL TEMPORARY | LOCAL TEMP] TABLE [IF NOT EXISTS]"
-]), dE = r([
+]), dE = _([
   // - create:
   "CREATE [OR REPLACE | MATERIALIZED] VIEW",
   // - update:
@@ -12667,13 +12680,13 @@ const me = [
   "START TRANSACTION",
   "UNLOAD",
   "VACUUM"
-]), ge = r(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), Je = r([
+]), ES = _(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), TS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), we = r([
+]), RS = _([
   // 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
@@ -12681,17 +12694,19 @@ const me = [
   "HIVE METASTORE",
   // in window specifications
   "{ROWS | RANGE} BETWEEN"
-]), xe = {
+]), AS = _([]), eS = {
   name: "redshift",
   tokenizerOptions: {
-    reservedSelect: Ke,
-    reservedClauses: [...$e, ...GT, ...dE],
-    reservedSetOperations: ge,
-    reservedJoins: Je,
-    reservedPhrases: we,
-    reservedKeywords: be,
-    reservedDataTypes: ye,
-    reservedFunctionNames: Xe,
+    reservedSelect: ke,
+    reservedClauses: [...ze, ...GT, ...dE],
+    reservedSetOperations: ES,
+    reservedJoins: TS,
+    reservedKeywordPhrases: RS,
+    reservedDataTypePhrases: AS,
+    reservedKeywords: qe,
+    reservedDataTypes: je,
+    reservedFunctionNames: Ze,
+    extraParens: ["[]"],
     stringTypes: ["''-qq"],
     identTypes: ['""-qq'],
     identChars: { first: "#" },
@@ -12717,7 +12732,7 @@ const me = [
     onelineClauses: [...GT, ...dE],
     tabularOnelineClauses: dE
   }
-}, ve = [
+}, SS = [
   // https://deepkb.com/CO_000013/en/kb/IMPORT-fbfa59f0-2bf1-31fe-bb7b-0f9efe9932c6/spark-sql-keywords
   "ADD",
   "AFTER",
@@ -12984,7 +12999,7 @@ const me = [
   "UNSIGNED",
   "VARIABLES",
   "YEAR_MONTH"
-], Qe = [
+], IS = [
   // https://spark.apache.org/docs/latest/sql-ref-datatypes.html
   "ARRAY",
   "BIGINT",
@@ -13014,7 +13029,7 @@ const me = [
   "TINYINT",
   "VARCHAR"
   // No varchar type in Spark, only STRING. Added for the sake of tests
-], Ze = [
+], OS = [
   // http://spark.apache.org/docs/latest/sql-ref-functions.html
   //
   // http://spark.apache.org/docs/latest/sql-ref-functions-builtin.html#aggregate-functions
@@ -13335,7 +13350,7 @@ const me = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], qe = r(["SELECT [ALL | DISTINCT]"]), je = r([
+], NS = _(["SELECT [ALL | DISTINCT]"]), sS = _([
   // queries
   "WITH",
   "FROM",
@@ -13360,7 +13375,7 @@ const me = [
   //   https://spark.apache.org/docs/latest/sql-ref-syntax-dml-load.html
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), lT = r(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), fE = r([
+]), lT = _(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), hE = _([
   // - create:
   "CREATE [OR REPLACE] [GLOBAL TEMPORARY | TEMPORARY] VIEW [IF NOT EXISTS]",
   // - drop table:
@@ -13416,11 +13431,11 @@ const me = [
   "SHOW TBLPROPERTIES",
   "SHOW VIEWS",
   "UNCACHE TABLE"
-]), ke = r([
+]), tS = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), ze = r([
+]), CS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -13429,23 +13444,24 @@ const me = [
   // non-standard-joins
   "[LEFT] {ANTI | SEMI} JOIN",
   "NATURAL [LEFT] {ANTI | SEMI} JOIN"
-]), ES = r([
+]), LS = _([
   "ON DELETE",
   "ON UPDATE",
   "CURRENT ROW",
   "{ROWS | RANGE} BETWEEN"
-]), TS = {
+]), _S = _([]), rS = {
   name: "spark",
   tokenizerOptions: {
-    reservedSelect: qe,
-    reservedClauses: [...je, ...lT, ...fE],
-    reservedSetOperations: ke,
-    reservedJoins: ze,
-    reservedPhrases: ES,
+    reservedSelect: NS,
+    reservedClauses: [...sS, ...lT, ...hE],
+    reservedSetOperations: tS,
+    reservedJoins: CS,
+    reservedKeywordPhrases: LS,
+    reservedDataTypePhrases: _S,
     supportsXor: !0,
-    reservedKeywords: ve,
-    reservedDataTypes: Qe,
-    reservedFunctionNames: Ze,
+    reservedKeywords: SS,
+    reservedDataTypes: IS,
+    reservedFunctionNames: OS,
     extraParens: ["[]"],
     stringTypes: [
       "''-bs",
@@ -13457,20 +13473,20 @@ const me = [
     identChars: { allowFirstCharNumber: !0 },
     variableTypes: [{ quote: "{}", prefixes: ["$"], requirePrefix: !0 }],
     operators: ["%", "~", "^", "|", "&", "<=>", "==", "!", "||", "->"],
-    postProcess: RS
+    postProcess: nS
   },
   formatOptions: {
-    onelineClauses: [...lT, ...fE],
-    tabularOnelineClauses: fE
+    onelineClauses: [...lT, ...hE],
+    tabularOnelineClauses: hE
   }
 };
-function RS(T) {
+function nS(T) {
   return T.map((E, R) => {
     const A = T[R - 1] || j, e = T[R + 1] || j;
-    return J.WINDOW(E) && e.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" && e.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: D.IDENTIFIER, text: E.raw }) : E;
+    return w.WINDOW(E) && e.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" && e.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: D.IDENTIFIER, text: E.raw }) : E;
   });
 }
-const AS = [
+const iS = [
   // https://www.sqlite.org/lang_corefunc.html
   "ABS",
   "CHANGES",
@@ -13594,7 +13610,7 @@ const AS = [
   "JSON_TREE",
   // cast
   "CAST"
-], eS = [
+], DS = [
   // 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.
@@ -13747,7 +13763,7 @@ const AS = [
   "WINDOW",
   "WITH",
   "WITHOUT"
-], SS = [
+], aS = [
   // 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.
@@ -13768,7 +13784,7 @@ const AS = [
   "TEXT",
   "VARCHAR",
   "VARYING CHARACTER"
-], IS = r(["SELECT [ALL | DISTINCT]"]), OS = r([
+], oS = _(["SELECT [ALL | DISTINCT]"]), PS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -13786,8 +13802,10 @@ const AS = [
   "REPLACE INTO",
   "VALUES",
   // - update:
-  "SET"
-]), cT = r(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), hE = r([
+  "SET",
+  // other:
+  "RETURNING"
+]), cT = _(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), fE = _([
   // - create:
   "CREATE [TEMPORARY | TEMP] VIEW [IF NOT EXISTS]",
   // - update:
@@ -13806,27 +13824,28 @@ const AS = [
   "RENAME TO",
   // - set schema
   "SET SCHEMA"
-]), NS = r(["UNION [ALL]", "EXCEPT", "INTERSECT"]), tS = r([
+]), MS = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), US = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), sS = r([
+]), GS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "DO UPDATE"
-]), CS = {
+]), lS = _([]), cS = {
   name: "sqlite",
   tokenizerOptions: {
-    reservedSelect: IS,
-    reservedClauses: [...OS, ...cT, ...hE],
-    reservedSetOperations: NS,
-    reservedJoins: tS,
-    reservedPhrases: sS,
-    reservedKeywords: eS,
-    reservedDataTypes: SS,
-    reservedFunctionNames: AS,
+    reservedSelect: oS,
+    reservedClauses: [...PS, ...cT, ...fE],
+    reservedSetOperations: MS,
+    reservedJoins: US,
+    reservedKeywordPhrases: GS,
+    reservedDataTypePhrases: lS,
+    reservedKeywords: DS,
+    reservedDataTypes: aS,
+    reservedFunctionNames: iS,
     stringTypes: [
       "''-qq",
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -13839,10 +13858,10 @@ const AS = [
     operators: ["%", "~", "&", "|", "<<", ">>", "==", "->", "->>", "||"]
   },
   formatOptions: {
-    onelineClauses: [...cT, ...hE],
-    tabularOnelineClauses: hE
+    onelineClauses: [...cT, ...fE],
+    tabularOnelineClauses: fE
   }
-}, LS = [
+}, uS = [
   // 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
@@ -13939,7 +13958,7 @@ const AS = [
   "ASIN",
   "ACOS",
   "ATAN"
-], _S = [
+], HS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#reserved-word
   "ALL",
   "ALLOCATE",
@@ -14137,7 +14156,7 @@ const AS = [
   "WITHIN",
   "WITHOUT",
   "YEAR"
-], rS = [
+], BS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_1_data_type
   "ARRAY",
   "BIGINT",
@@ -14177,7 +14196,7 @@ const AS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], nS = r(["SELECT [ALL | DISTINCT]"]), iS = r([
+], mS = _(["SELECT [ALL | DISTINCT]"]), FS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14196,7 +14215,7 @@ const AS = [
   "VALUES",
   // - update:
   "SET"
-]), uT = r(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), VE = r([
+]), uT = _(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), VE = _([
   // - create:
   "CREATE [RECURSIVE] VIEW",
   // - update:
@@ -14221,30 +14240,31 @@ const AS = [
   "TRUNCATE TABLE",
   // other
   "SET SCHEMA"
-]), DS = r([
+]), YS = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), aS = r([
+]), pS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), oS = r([
+]), dS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), PS = {
+]), hS = _([]), fS = {
   name: "sql",
   tokenizerOptions: {
-    reservedSelect: nS,
-    reservedClauses: [...iS, ...uT, ...VE],
-    reservedSetOperations: DS,
-    reservedJoins: aS,
-    reservedPhrases: oS,
-    reservedKeywords: _S,
-    reservedDataTypes: rS,
-    reservedFunctionNames: LS,
+    reservedSelect: mS,
+    reservedClauses: [...FS, ...uT, ...VE],
+    reservedSetOperations: YS,
+    reservedJoins: pS,
+    reservedKeywordPhrases: dS,
+    reservedDataTypePhrases: hS,
+    reservedKeywords: HS,
+    reservedDataTypes: BS,
+    reservedFunctionNames: uS,
     stringTypes: [
       { quote: "''-qq-bs", prefixes: ["N", "U&"] },
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -14257,7 +14277,7 @@ const AS = [
     onelineClauses: [...uT, ...VE],
     tabularOnelineClauses: VE
   }
-}, MS = [
+}, VS = [
   // 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
@@ -14691,7 +14711,7 @@ const AS = [
   "NEXT",
   "PERMUTE",
   "PREV"
-], US = [
+], WS = [
   // https://github.com/trinodb/trino/blob/432d2897bdef99388c1a47188743a061c4ac1f34/core/trino-parser/src/main/antlr4/io/trino/sql/parser/SqlBase.g4#L858-L1128
   "ABSENT",
   "ADD",
@@ -14928,7 +14948,7 @@ const AS = [
   "WRAPPER",
   "WRITE",
   "ZONE"
-], GS = [
+], XS = [
   // 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",
@@ -14967,7 +14987,7 @@ const AS = [
   "CODEPOINTS",
   "FUNCTION",
   "JSONPATH"
-], lS = r(["SELECT [ALL | DISTINCT]"]), cS = r([
+], bS = _(["SELECT [ALL | DISTINCT]"]), yS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14995,7 +15015,7 @@ const AS = [
   "PATTERN",
   "SUBSET",
   "DEFINE"
-]), HT = r(["CREATE TABLE [IF NOT EXISTS]"]), WE = r([
+]), HT = _(["CREATE TABLE [IF NOT EXISTS]"]), WE = _([
   // - create:
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW",
   // - update:
@@ -15053,31 +15073,32 @@ const AS = [
   "SHOW ROLE GRANTS",
   "SHOW FUNCTIONS",
   "SHOW SESSION"
-]), uS = r([
+]), KS = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), HS = r([
+]), $S = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), BS = r([
+]), gS = _([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), mS = {
+]), wS = _([]), JS = {
   name: "trino",
   tokenizerOptions: {
-    reservedSelect: lS,
-    reservedClauses: [...cS, ...HT, ...WE],
-    reservedSetOperations: uS,
-    reservedJoins: HS,
-    reservedPhrases: BS,
-    reservedKeywords: US,
-    reservedDataTypes: GS,
-    reservedFunctionNames: MS,
+    reservedSelect: bS,
+    reservedClauses: [...yS, ...HT, ...WE],
+    reservedSetOperations: KS,
+    reservedJoins: $S,
+    reservedKeywordPhrases: gS,
+    reservedDataTypePhrases: wS,
+    reservedKeywords: WS,
+    reservedDataTypes: XS,
+    reservedFunctionNames: VS,
     // Trino also supports {- ... -} parenthesis.
     // The formatting of these currently works out as a result of { and -
     // not getting a space added in-between.
@@ -15109,7 +15130,7 @@ const AS = [
     onelineClauses: [...HT, ...WE],
     tabularOnelineClauses: WE
   }
-}, FS = [
+}, xS = [
   // https://docs.microsoft.com/en-us/sql/t-sql/functions/functions?view=sql-server-ver15
   // aggregate
   "APPROX_COUNT_DISTINCT",
@@ -15414,7 +15435,7 @@ const AS = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], YS = [
+], vS = [
   // https://docs.microsoft.com/en-us/sql/t-sql/language-elements/reserved-keywords-transact-sql?view=sql-server-ver15
   // standard
   "ADD",
@@ -15595,7 +15616,7 @@ const AS = [
   "WRITETEXT",
   // https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql?view=sql-server-ver16#action
   "$ACTION"
-], pS = [
+], QS = [
   // https://learn.microsoft.com/en-us/sql/t-sql/data-types/data-types-transact-sql?view=sql-server-ver15
   "BINARY",
   "BIT",
@@ -15622,7 +15643,7 @@ const AS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], dS = r(["SELECT [ALL | DISTINCT]"]), fS = r([
+], ZS = _(["SELECT [ALL | DISTINCT]"]), qS = _([
   // queries
   "WITH",
   "INTO",
@@ -15646,10 +15667,8 @@ const AS = [
   // - merge:
   "MERGE [INTO]",
   "WHEN [NOT] MATCHED [BY TARGET | BY SOURCE] [THEN]",
-  "UPDATE SET",
-  // Data definition
-  "CREATE [OR ALTER] {PROC | PROCEDURE}"
-]), BT = r(["CREATE TABLE"]), XE = r([
+  "UPDATE SET"
+]), BT = _(["CREATE TABLE"]), XE = _([
   // - create:
   "CREATE [OR ALTER] [MATERIALIZED] VIEW",
   // - update:
@@ -15672,6 +15691,10 @@ const AS = [
   "CREATE DATABASE",
   "ALTER DATABASE",
   "DROP DATABASE [IF EXISTS]",
+  // functions/procedures
+  "CREATE [OR ALTER] [PARTITION] {FUNCTION | PROCEDURE | PROC}",
+  "ALTER [PARTITION] {FUNCTION | PROCEDURE | PROC}",
+  "DROP [PARTITION] {FUNCTION | PROCEDURE | PROC} [IF EXISTS]",
   // other statements
   "GO",
   "USE",
@@ -15703,7 +15726,6 @@ const AS = [
   "CERTIFICATE",
   "CLOSE MASTER KEY",
   "CLOSE SYMMETRIC KEY",
-  "COLLATE",
   "COLUMN ENCRYPTION KEY",
   "COLUMN MASTER KEY",
   "COLUMNSTORE INDEX",
@@ -15744,7 +15766,6 @@ const AS = [
   "FULLTEXT CATALOG",
   "FULLTEXT INDEX",
   "FULLTEXT STOPLIST",
-  "FUNCTION",
   "GET CONVERSATION GROUP",
   "GET_TRANSMISSION_STATUS",
   "GRANT",
@@ -15765,9 +15786,7 @@ const AS = [
   "OPEN MASTER KEY",
   "OPEN SYMMETRIC KEY",
   "PARSEONLY",
-  "PARTITION FUNCTION",
   "PARTITION SCHEME",
-  "PROCEDURE",
   "QUERY_GOVERNOR_COST_LIMIT",
   "QUEUE",
   "QUOTED_IDENTIFIER",
@@ -15829,26 +15848,27 @@ const AS = [
   "XACT_ABORT",
   "XML INDEX",
   "XML SCHEMA COLLECTION"
-]), hS = r(["UNION [ALL]", "EXCEPT", "INTERSECT"]), VS = r([
+]), jS = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), kS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), WS = r([
+]), zS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), XS = {
+]), EI = _([]), TI = {
   name: "transactsql",
   tokenizerOptions: {
-    reservedSelect: dS,
-    reservedClauses: [...fS, ...BT, ...XE],
-    reservedSetOperations: hS,
-    reservedJoins: VS,
-    reservedPhrases: WS,
-    reservedKeywords: YS,
-    reservedDataTypes: pS,
-    reservedFunctionNames: FS,
+    reservedSelect: ZS,
+    reservedClauses: [...qS, ...BT, ...XE],
+    reservedSetOperations: jS,
+    reservedJoins: kS,
+    reservedKeywordPhrases: zS,
+    reservedDataTypePhrases: EI,
+    reservedKeywords: vS,
+    reservedDataTypes: QS,
+    reservedFunctionNames: xS,
     nestedBlockComments: !0,
     stringTypes: [{ quote: "''-qq", prefixes: ["N"] }, "{}"],
     identTypes: ['""-qq', "[]"],
@@ -15881,7 +15901,7 @@ const AS = [
     onelineClauses: [...BT, ...XE],
     tabularOnelineClauses: XE
   }
-}, bS = [
+}, RI = [
   // 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
@@ -16094,7 +16114,7 @@ const AS = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], yS = [
+], AI = [
   // https://docs.singlestore.com/cloud/reference/sql-reference/data-types/
   "BIGINT",
   "BINARY",
@@ -16143,7 +16163,7 @@ const AS = [
   "VARCHAR",
   "VARCHARACTER",
   "YEAR"
-], KS = [
+], eI = [
   // 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
@@ -16423,7 +16443,7 @@ const AS = [
   "WEEKDAY",
   "WEEKOFYEAR",
   "YEAR"
-], $S = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), gS = r([
+], SI = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), II = _([
   // queries
   "WITH",
   "FROM",
@@ -16445,9 +16465,9 @@ const AS = [
   // Data definition
   "CREATE [OR REPLACE] [TEMPORARY] PROCEDURE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [EXTERNAL] FUNCTION"
-]), mT = r([
+]), mT = _([
   "CREATE [ROWSTORE] [REFERENCE | TEMPORARY | GLOBAL TEMPORARY] TABLE [IF NOT EXISTS]"
-]), bE = r([
+]), bE = _([
   // - create:
   "CREATE VIEW",
   // - update:
@@ -16624,35 +16644,36 @@ const AS = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), JS = r([
+]), OI = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT",
   "INTERSECT",
   "MINUS"
-]), wS = r([
+]), NI = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), xS = r([
+]), sI = _([
   "ON DELETE",
   "ON UPDATE",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), vS = {
+]), tI = _([]), CI = {
   name: "singlestoredb",
   tokenizerOptions: {
-    reservedSelect: $S,
-    reservedClauses: [...gS, ...mT, ...bE],
-    reservedSetOperations: JS,
-    reservedJoins: wS,
-    reservedPhrases: xS,
-    reservedKeywords: bS,
-    reservedDataTypes: yS,
-    reservedFunctionNames: KS,
+    reservedSelect: SI,
+    reservedClauses: [...II, ...mT, ...bE],
+    reservedSetOperations: OI,
+    reservedJoins: NI,
+    reservedKeywordPhrases: sI,
+    reservedDataTypePhrases: tI,
+    reservedKeywords: RI,
+    reservedDataTypes: AI,
+    reservedFunctionNames: eI,
     // TODO: support _binary"some string" prefix
     stringTypes: [
       '""-qq-bs',
@@ -16692,7 +16713,7 @@ const AS = [
     onelineClauses: [...mT, ...bE],
     tabularOnelineClauses: bE
   }
-}, QS = [
+}, LI = [
   // https://docs.snowflake.com/en/sql-reference-functions.html
   //
   // https://docs.snowflake.com/en/sql-reference/functions-all.html
@@ -16913,6 +16934,7 @@ const AS = [
   "HOUR",
   "MINUTE",
   "SECOND",
+  "IDENTIFIER",
   "IFF",
   "IFNULL",
   "ILIKE",
@@ -17299,7 +17321,7 @@ const AS = [
   "QUARTER",
   "ZEROIFNULL",
   "ZIPF"
-], ZS = [
+], _I = [
   // 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)
@@ -17396,7 +17418,7 @@ const AS = [
   "WITH",
   // These are definitely keywords, but haven't found a definite list in the docs
   "COMMENT"
-], qS = [
+], rI = [
   "NUMBER",
   "DECIMAL",
   "NUMERIC",
@@ -17433,7 +17455,7 @@ const AS = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], jS = r(["SELECT [ALL | DISTINCT]"]), kS = r([
+], nI = _(["SELECT [ALL | DISTINCT]"]), iI = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -17461,10 +17483,10 @@ const AS = [
   "WHEN MATCHED [AND]",
   "THEN {UPDATE SET | DELETE}",
   "WHEN NOT MATCHED THEN INSERT"
-]), FT = r([
+]), FT = _([
   "CREATE [OR REPLACE] [VOLATILE] TABLE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [LOCAL | GLOBAL] {TEMP|TEMPORARY} TABLE [IF NOT EXISTS]"
-]), yE = r([
+]), yE = _([
   // - create:
   "CREATE [OR REPLACE] [SECURE] [RECURSIVE] VIEW [IF NOT EXISTS]",
   // - update:
@@ -17705,24 +17727,25 @@ const AS = [
   "USE SCHEMA",
   "USE SECONDARY ROLES",
   "USE WAREHOUSE"
-]), zS = r(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), EI = r([
+]), DI = _(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), aI = _([
   "[INNER] JOIN",
   "[NATURAL] {LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{CROSS | NATURAL} JOIN"
-]), TI = r([
+]), oI = _([
   "{ROWS | RANGE} BETWEEN",
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]"
-]), RI = {
+]), PI = _([]), MI = {
   name: "snowflake",
   tokenizerOptions: {
-    reservedSelect: jS,
-    reservedClauses: [...kS, ...FT, ...yE],
-    reservedSetOperations: zS,
-    reservedJoins: EI,
-    reservedPhrases: TI,
-    reservedKeywords: ZS,
-    reservedDataTypes: qS,
-    reservedFunctionNames: QS,
+    reservedSelect: nI,
+    reservedClauses: [...iI, ...FT, ...yE],
+    reservedSetOperations: DI,
+    reservedJoins: aI,
+    reservedKeywordPhrases: oI,
+    reservedDataTypePhrases: PI,
+    reservedKeywords: _I,
+    reservedDataTypes: rI,
+    reservedFunctionNames: LI,
     stringTypes: ["$$", "''-qq-bs"],
     identTypes: ['""-qq'],
     variableTypes: [
@@ -17755,51 +17778,51 @@ const AS = [
     onelineClauses: [...FT, ...yE],
     tabularOnelineClauses: yE
   }
-}, AI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, UI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  bigquery: qR,
-  db2: tA,
-  db2i: aA,
-  duckdb: HA,
-  hive: VA,
-  mariadb: wA,
-  mysql: Ee,
-  n1ql: ae,
-  plsql: He,
-  postgresql: We,
-  redshift: xe,
-  singlestoredb: vS,
-  snowflake: RI,
-  spark: TS,
-  sql: PS,
-  sqlite: CS,
-  tidb: te,
-  transactsql: XS,
-  trino: mS
-}, Symbol.toStringTag, { value: "Module" })), EE = (T) => T[T.length - 1], kT = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), AE = (T) => T.replace(/\s+/gu, " "), KE = (T) => /\n/.test(T), X = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), YT = /\s+/uy, w = (T) => new RegExp(`(?:${T})`, "uy"), eI = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), SI = (T) => T + "(?:-" + T + ")*", II = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(eI).join("|")}${E ? "" : "|"})`, OI = (T) => new RegExp(`(?:${T.map(X).join("|")}).*?(?=\r
+  bigquery: jR,
+  db2: CA,
+  db2i: MA,
+  duckdb: YA,
+  hive: KA,
+  mariadb: jA,
+  mysql: Oe,
+  n1ql: He,
+  plsql: We,
+  postgresql: Qe,
+  redshift: eS,
+  singlestoredb: CI,
+  snowflake: MI,
+  spark: rS,
+  sql: fS,
+  sqlite: cS,
+  tidb: De,
+  transactsql: TI,
+  trino: JS
+}, Symbol.toStringTag, { value: "Module" })), EE = (T) => T[T.length - 1], kT = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), AE = (T) => T.replace(/\s+/gu, " "), KE = (T) => /\n/.test(T), X = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), YT = /\s+/uy, J = (T) => new RegExp(`(?:${T})`, "uy"), GI = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), lI = (T) => T + "(?:-" + T + ")*", cI = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(GI).join("|")}${E ? "" : "|"})`, uI = (T) => new RegExp(`(?:${T.map(X).join("|")}).*?(?=\r
 |\r|
 |$)`, "uy"), pT = (T, E = []) => {
   const R = T === "open" ? 0 : 1, A = ["()", ...E].map((e) => e[R]);
-  return w(A.map(X).join("|"));
-}, dT = (T) => w(`${kT(T).map(X).join("|")}`), NI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", y = (T, E = {}) => {
+  return J(A.map(X).join("|"));
+}, dT = (T) => J(`${kT(T).map(X).join("|")}`), HI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", y = (T, E = {}) => {
   if (T.length === 0)
     return /^\b$/u;
-  const R = NI(E), A = kT(T).map(X).join("|").replace(/ /gu, "\\s+");
+  const R = HI(E), A = kT(T).map(X).join("|").replace(/ /gu, "\\s+");
   return new RegExp(`(?:${A})${R}\\b`, "iuy");
 }, $E = (T, E) => {
   if (!T.length)
     return;
   const R = T.map(X).join("|");
-  return w(`(?:${R})(?:${E})`);
-}, tI = () => {
+  return J(`(?:${R})(?:${E})`);
+}, BI = () => {
   const T = {
     "<": ">",
     "[": "]",
     "(": ")",
     "{": "}"
-  }, E = "{left}(?:(?!{right}').)*?{right}", R = Object.entries(T).map(([N, s]) => E.replace(/{left}/g, X(N)).replace(/{right}/g, X(s))), A = X(Object.keys(T).join(""));
+  }, E = "{left}(?:(?!{right}').)*?{right}", R = Object.entries(T).map(([N, t]) => E.replace(/{left}/g, X(N)).replace(/{right}/g, X(t))), A = X(Object.keys(T).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${A}])(?:(?!\k<tag>').)*?\k<tag>`}|${R.join("|")})'`;
-}, fT = {
+}, hT = {
   // - backtick quoted (using `` to escape)
   "``": "(?:`[^`]*`)+",
   // - Transact-SQL square bracket quoted (using ]] to escape)
@@ -17823,16 +17846,16 @@ const AS = [
   // Hive and Spark variables: ${name}
   "{}": String.raw`(?:\{[^\}]*\})`,
   // Oracle q'' strings: q'<text>' q'|text|' ...
-  "q''": tI()
-}, zT = (T) => typeof T == "string" ? fT[T] : "regex" in T ? T.regex : II(T) + fT[T.quote], sI = (T) => w(T.map((E) => "regex" in E ? E.regex : zT(E)).join("|")), ER = (T) => T.map(zT).join("|"), hT = (T) => w(ER(T)), CI = (T = {}) => w(TR(T)), TR = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
-  const e = "\\p{Alphabetic}\\p{Mark}_", S = "\\p{Decimal_Number}", N = X(T ?? ""), s = X(E ?? ""), _ = A ? `[${e}${S}${N}][${e}${S}${s}]*` : `[${e}${N}][${e}${S}${s}]*`;
-  return R ? SI(_) : _;
+  "q''": BI()
+}, zT = (T) => typeof T == "string" ? hT[T] : "regex" in T ? T.regex : cI(T) + hT[T.quote], mI = (T) => J(T.map((E) => "regex" in E ? E.regex : zT(E)).join("|")), ER = (T) => T.map(zT).join("|"), fT = (T) => J(ER(T)), FI = (T = {}) => J(TR(T)), TR = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
+  const e = "\\p{Alphabetic}\\p{Mark}_", S = "\\p{Decimal_Number}", N = X(T ?? ""), t = X(E ?? ""), r = A ? `[${e}${S}${N}][${e}${S}${t}]*` : `[${e}${N}][${e}${S}${t}]*`;
+  return R ? lI(r) : r;
 };
 function RR(T, E) {
   const R = T.slice(0, E).split(/\n/);
   return { line: R.length, col: R[R.length - 1].length + 1 };
 }
-class LI {
+class YI {
   constructor(E, R) {
     this.rules = E, this.dialectName = R, this.input = "", this.index = 0;
   }
@@ -17894,8 +17917,8 @@ If possible, please select a more specific dialect (like sqlite, postgresql, etc
     }
   }
 }
-const VT = /\/\*/uy, _I = /[\s\S]/uy, rI = /\*\//uy;
-class nI {
+const VT = /\/\*/uy, pI = /[\s\S]/uy, dI = /\*\//uy;
+class hI {
   constructor() {
     this.lastIndex = 0;
   }
@@ -17908,9 +17931,9 @@ class nI {
     for (; e > 0; )
       if (A = this.matchSection(VT, E))
         R += A, e++;
-      else if (A = this.matchSection(rI, E))
+      else if (A = this.matchSection(dI, E))
         R += A, e--;
-      else if (A = this.matchSection(_I, E))
+      else if (A = this.matchSection(pI, E))
         R += A;
       else
         return null;
@@ -17922,7 +17945,7 @@ class nI {
     return A && (this.lastIndex += A[0].length), A ? A[0] : null;
   }
 }
-class iI {
+class fI {
   constructor(E, R) {
     this.cfg = E, this.dialectName = R, this.rulesBeforeParams = this.buildRulesBeforeParams(E), this.rulesAfterParams = this.buildRulesAfterParams(E);
   }
@@ -17931,110 +17954,115 @@ class iI {
       ...this.rulesBeforeParams,
       ...this.buildParamRules(this.cfg, R),
       ...this.rulesAfterParams
-    ], e = new LI(A, this.dialectName).tokenize(E);
+    ], e = new YI(A, this.dialectName).tokenize(E);
     return this.cfg.postProcess ? this.cfg.postProcess(e) : e;
   }
   // These rules can be cached as they only depend on
   // the Tokenizer config options specified for each SQL dialect
   buildRulesBeforeParams(E) {
-    var R, A;
+    var R, A, e;
     return this.validRules([
       {
-        type: D.BLOCK_COMMENT,
+        type: D.DISABLE_COMMENT,
         regex: /(\/\* *sql-formatter-disable *\*\/[\s\S]*?(?:\/\* *sql-formatter-enable *\*\/|$))/uy
       },
       {
         type: D.BLOCK_COMMENT,
-        regex: E.nestedBlockComments ? new nI() : /(\/\*[^]*?\*\/)/uy
+        regex: E.nestedBlockComments ? new hI() : /(\/\*[^]*?\*\/)/uy
       },
       {
         type: D.LINE_COMMENT,
-        regex: OI((R = E.lineCommentTypes) !== null && R !== void 0 ? R : ["--"])
+        regex: uI((R = E.lineCommentTypes) !== null && R !== void 0 ? R : ["--"])
       },
       {
         type: D.QUOTED_IDENTIFIER,
-        regex: hT(E.identTypes)
+        regex: fT(E.identTypes)
       },
       {
         type: D.NUMBER,
-        regex: /(?:0x[0-9a-fA-F]+|0b[01]+|(?:-\s*)?(?:[0-9]*\.[0-9]+|[0-9]+(?:\.[0-9]*)?)(?:[eE][-+]?[0-9]+(?:\.[0-9]+)?)?)(?![\w\p{Alphabetic}])/uy
+        regex: E.underscoresInNumbers ? /(?:0x[0-9a-fA-F_]+|0b[01_]+|(?:-\s*)?(?:[0-9_]*\.[0-9_]+|[0-9_]+(?:\.[0-9_]*)?)(?:[eE][-+]?[0-9_]+(?:\.[0-9_]+)?)?)(?![\w\p{Alphabetic}])/uy : /(?:0x[0-9a-fA-F]+|0b[01]+|(?:-\s*)?(?:[0-9]*\.[0-9]+|[0-9]+(?:\.[0-9]*)?)(?:[eE][-+]?[0-9]+(?:\.[0-9]+)?)?)(?![\w\p{Alphabetic}])/uy
       },
-      // RESERVED_PHRASE is matched before all other keyword tokens
+      // RESERVED_KEYWORD_PHRASE and RESERVED_DATA_TYPE_PHRASE  is matched before all other keyword tokens
       // to e.g. prioritize matching "TIMESTAMP WITH TIME ZONE" phrase over "WITH" clause.
       {
-        type: D.RESERVED_PHRASE,
-        regex: y((A = E.reservedPhrases) !== null && A !== void 0 ? A : [], E.identChars),
-        text: m
+        type: D.RESERVED_KEYWORD_PHRASE,
+        regex: y((A = E.reservedKeywordPhrases) !== null && A !== void 0 ? A : [], E.identChars),
+        text: B
+      },
+      {
+        type: D.RESERVED_DATA_TYPE_PHRASE,
+        regex: y((e = E.reservedDataTypePhrases) !== null && e !== void 0 ? e : [], E.identChars),
+        text: B
       },
       {
         type: D.CASE,
         regex: /CASE\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.END,
         regex: /END\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.BETWEEN,
         regex: /BETWEEN\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.LIMIT,
         regex: E.reservedClauses.includes("LIMIT") ? /LIMIT\b/iuy : void 0,
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_CLAUSE,
         regex: y(E.reservedClauses, E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_SELECT,
         regex: y(E.reservedSelect, E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_SET_OPERATION,
         regex: y(E.reservedSetOperations, E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.WHEN,
         regex: /WHEN\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.ELSE,
         regex: /ELSE\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.THEN,
         regex: /THEN\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_JOIN,
         regex: y(E.reservedJoins, E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.AND,
         regex: /AND\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.OR,
         regex: /OR\b/iuy,
-        text: m
+        text: B
       },
       {
         type: D.XOR,
         regex: E.supportsXor ? /XOR\b/iuy : void 0,
-        text: m
+        text: B
       },
       ...E.operatorKeyword ? [
         {
@@ -18045,17 +18073,17 @@ class iI {
       {
         type: D.RESERVED_FUNCTION_NAME,
         regex: y(E.reservedFunctionNames, E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_DATA_TYPE,
         regex: y(E.reservedDataTypes, E.identChars),
-        text: m
+        text: B
       },
       {
         type: D.RESERVED_KEYWORD,
         regex: y(E.reservedKeywords, E.identChars),
-        text: m
+        text: B
       }
     ]);
   }
@@ -18066,12 +18094,12 @@ class iI {
     return this.validRules([
       {
         type: D.VARIABLE,
-        regex: E.variableTypes ? sI(E.variableTypes) : void 0
+        regex: E.variableTypes ? mI(E.variableTypes) : void 0
       },
-      { type: D.STRING, regex: hT(E.stringTypes) },
+      { type: D.STRING, regex: fT(E.stringTypes) },
       {
         type: D.IDENTIFIER,
-        regex: CI(E.identChars)
+        regex: FI(E.identChars)
       },
       { type: D.DELIMITER, regex: /[;]/uy },
       { type: D.COMMA, regex: /[,]/y },
@@ -18110,43 +18138,43 @@ class iI {
   // 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, e, S, N, s;
-    const _ = {
+    var A, e, S, N, t;
+    const r = {
       named: R?.named || ((A = E.paramTypes) === null || A === void 0 ? void 0 : A.named) || [],
       quoted: R?.quoted || ((e = E.paramTypes) === null || e === void 0 ? void 0 : e.quoted) || [],
       numbered: R?.numbered || ((S = E.paramTypes) === null || S === void 0 ? void 0 : S.numbered) || [],
       positional: typeof R?.positional == "boolean" ? R.positional : (N = E.paramTypes) === null || N === void 0 ? void 0 : N.positional,
-      custom: R?.custom || ((s = E.paramTypes) === null || s === void 0 ? void 0 : s.custom) || []
+      custom: R?.custom || ((t = E.paramTypes) === null || t === void 0 ? void 0 : t.custom) || []
     };
     return this.validRules([
       {
         type: D.NAMED_PARAMETER,
-        regex: $E(_.named, TR(E.paramChars || E.identChars)),
+        regex: $E(r.named, TR(E.paramChars || E.identChars)),
         key: (I) => I.slice(1)
       },
       {
         type: D.QUOTED_PARAMETER,
-        regex: $E(_.quoted, ER(E.identTypes)),
-        key: (I) => (({ tokenKey: O, quoteChar: t }) => O.replace(new RegExp(X("\\" + t), "gu"), t))({
+        regex: $E(r.quoted, ER(E.identTypes)),
+        key: (I) => (({ tokenKey: O, quoteChar: s }) => O.replace(new RegExp(X("\\" + s), "gu"), s))({
           tokenKey: I.slice(2, -1),
           quoteChar: I.slice(-1)
         })
       },
       {
         type: D.NUMBERED_PARAMETER,
-        regex: $E(_.numbered, "[0-9]+"),
+        regex: $E(r.numbered, "[0-9]+"),
         key: (I) => I.slice(1)
       },
       {
         type: D.POSITIONAL_PARAMETER,
-        regex: _.positional ? /[?]/y : void 0
+        regex: r.positional ? /[?]/y : void 0
       },
-      ..._.custom.map((I) => {
+      ...r.custom.map((I) => {
         var O;
         return {
           type: D.CUSTOM_PARAMETER,
-          regex: w(I.regex),
-          key: (O = I.key) !== null && O !== void 0 ? O : ((t) => t)
+          regex: J(I.regex),
+          key: (O = I.key) !== null && O !== void 0 ? O : ((s) => s)
         };
       })
     ]);
@@ -18156,13 +18184,13 @@ class iI {
     return E.filter((R) => !!R.regex);
   }
 }
-const m = (T) => AE(T.toUpperCase()), WT = /* @__PURE__ */ new Map(), DI = (T) => {
+const B = (T) => AE(T.toUpperCase()), WT = /* @__PURE__ */ new Map(), VI = (T) => {
   let E = WT.get(T);
-  return E || (E = aI(T), WT.set(T, E)), E;
-}, aI = (T) => ({
-  tokenizer: new iI(T.tokenizerOptions, T.name),
-  formatOptions: oI(T.formatOptions)
-}), oI = (T) => {
+  return E || (E = WI(T), WT.set(T, E)), E;
+}, WI = (T) => ({
+  tokenizer: new fI(T.tokenizerOptions, T.name),
+  formatOptions: XI(T.formatOptions)
+}), XI = (T) => {
   var E;
   return {
     alwaysDenseOperators: T.alwaysDenseOperators || [],
@@ -18170,13 +18198,13 @@ const m = (T) => AE(T.toUpperCase()), WT = /* @__PURE__ */ new Map(), DI = (T) =
     tabularOnelineClauses: Object.fromEntries(((E = T.tabularOnelineClauses) !== null && E !== void 0 ? E : T.onelineClauses).map((R) => [R, !0]))
   };
 };
-function PI(T) {
+function bI(T) {
   return T.indentStyle === "tabularLeft" || T.indentStyle === "tabularRight" ? " ".repeat(10) : T.useTabs ? "	" : " ".repeat(T.tabWidth);
 }
 function q(T) {
   return T.indentStyle === "tabularLeft" || T.indentStyle === "tabularRight";
 }
-class MI {
+class yI {
   constructor(E) {
     this.params = E, this.index = 0;
   }
@@ -18199,24 +18227,24 @@ class MI {
     this.index = E;
   }
 }
-function UI(T) {
+function KI(T) {
   return T && T.__esModule && Object.prototype.hasOwnProperty.call(T, "default") ? T.default : T;
 }
-var eE = { exports: {} }, GI = eE.exports, XT;
-function lI() {
+var eE = { exports: {} }, $I = eE.exports, XT;
+function gI() {
   return XT || (XT = 1, (function(T) {
     (function(E, R) {
       T.exports ? T.exports = R() : E.nearley = R();
-    })(GI, function() {
-      function E(I, O, t) {
-        return this.id = ++E.highestId, this.name = I, this.symbols = O, this.postprocess = t, this;
+    })($I, function() {
+      function E(I, O, s) {
+        return this.id = ++E.highestId, this.name = I, this.symbols = O, this.postprocess = s, this;
       }
       E.highestId = 0, E.prototype.toString = function(I) {
-        var O = typeof I > "u" ? this.symbols.map(_).join(" ") : this.symbols.slice(0, I).map(_).join(" ") + " ● " + this.symbols.slice(I).map(_).join(" ");
+        var O = typeof I > "u" ? this.symbols.map(r).join(" ") : this.symbols.slice(0, I).map(r).join(" ") + " ● " + this.symbols.slice(I).map(r).join(" ");
         return this.name + " → " + O;
       };
-      function R(I, O, t, L) {
-        this.rule = I, this.dot = O, this.reference = t, this.data = [], this.wantedBy = L, this.isComplete = this.dot === I.symbols.length;
+      function R(I, O, s, L) {
+        this.rule = I, this.dot = O, this.reference = s, this.data = [], this.wantedBy = L, this.isComplete = this.dot === I.symbols.length;
       }
       R.prototype.toString = function() {
         return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
@@ -18236,7 +18264,7 @@ function lI() {
         this.grammar = I, this.index = O, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
       }
       A.prototype.process = function(I) {
-        for (var O = this.states, t = this.wants, L = this.completed, a = 0; a < O.length; a++) {
+        for (var O = this.states, s = this.wants, L = this.completed, a = 0; a < O.length; a++) {
           var o = O[a];
           if (o.isComplete) {
             if (o.finish(), o.data !== N.fail) {
@@ -18255,39 +18283,39 @@ function lI() {
               this.scannable.push(o);
               continue;
             }
-            if (t[l]) {
-              if (t[l].push(o), L.hasOwnProperty(l))
+            if (s[l]) {
+              if (s[l].push(o), L.hasOwnProperty(l))
                 for (var c = L[l], U = 0; U < c.length; U++) {
-                  var B = c[U];
-                  this.complete(o, B);
+                  var m = c[U];
+                  this.complete(o, m);
                 }
             } else
-              t[l] = [o], this.predict(l);
+              s[l] = [o], this.predict(l);
           }
         }
       }, A.prototype.predict = function(I) {
-        for (var O = this.grammar.byName[I] || [], t = 0; t < O.length; t++) {
-          var L = O[t], a = this.wants[I], o = new R(L, 0, this.index, a);
+        for (var O = this.grammar.byName[I] || [], s = 0; s < O.length; s++) {
+          var L = O[s], a = this.wants[I], o = new R(L, 0, this.index, a);
           this.states.push(o);
         }
       }, A.prototype.complete = function(I, O) {
-        var t = I.nextState(O);
-        this.states.push(t);
+        var s = I.nextState(O);
+        this.states.push(s);
       };
       function e(I, O) {
         this.rules = I, this.start = O || this.rules[0].name;
-        var t = this.byName = {};
+        var s = this.byName = {};
         this.rules.forEach(function(L) {
-          t.hasOwnProperty(L.name) || (t[L.name] = []), t[L.name].push(L);
+          s.hasOwnProperty(L.name) || (s[L.name] = []), s[L.name].push(L);
         });
       }
       e.fromCompiled = function(L, O) {
-        var t = L.Lexer;
+        var s = L.Lexer;
         L.ParserStart && (O = L.ParserStart, L = L.ParserRules);
         var L = L.map(function(o) {
           return new E(o.name, o.symbols, o.postprocess);
         }), a = new e(L, O);
-        return a.lexer = t, a;
+        return a.lexer = s, a;
       };
       function S() {
         this.reset("");
@@ -18306,15 +18334,15 @@ function lI() {
           col: this.index - this.lastLineBreak
         };
       }, S.prototype.formatError = function(I, O) {
-        var t = this.buffer;
-        if (typeof t == "string") {
-          var L = t.split(`
+        var s = this.buffer;
+        if (typeof s == "string") {
+          var L = s.split(`
 `).slice(
             Math.max(0, this.line - 5),
             this.line
-          ), a = t.indexOf(`
+          ), a = s.indexOf(`
 `, this.index);
-          a === -1 && (a = t.length);
+          a === -1 && (a = s.length);
           var o = this.index - this.lastLineBreak, n = String(this.line).length;
           return O += " at line " + this.line + " col " + o + `:
 
@@ -18331,17 +18359,17 @@ function lI() {
           return Array(l - c.length + 1).join(" ") + c;
         }
       };
-      function N(I, O, t) {
+      function N(I, O, s) {
         if (I instanceof e)
-          var L = I, t = O;
+          var L = I, s = O;
         else
           var L = e.fromCompiled(I, O);
         this.grammar = L, this.options = {
           keepHistory: !1,
           lexer: L.lexer || new S()
         };
-        for (var a in t || {})
-          this.options[a] = t[a];
+        for (var a in s || {})
+          this.options[a] = s[a];
         this.lexer = this.options.lexer, this.lexerState = void 0;
         var o = new A(L, 0);
         this.table = [o], o.wants[L.start] = [], o.predict(L.start), o.process(), this.current = 0;
@@ -18349,9 +18377,9 @@ function lI() {
       N.fail = {}, N.prototype.feed = function(I) {
         var O = this.lexer;
         O.reset(I, this.lexerState);
-        for (var t; ; ) {
+        for (var s; ; ) {
           try {
-            if (t = O.next(), !t)
+            if (s = O.next(), !s)
               break;
           } catch (x) {
             var n = new A(this.grammar, this.current + 1);
@@ -18363,62 +18391,62 @@ function lI() {
           this.options.keepHistory || delete this.table[this.current - 1];
           var o = this.current + 1, n = new A(this.grammar, o);
           this.table.push(n);
-          for (var U = t.text !== void 0 ? t.text : t.value, P = O.constructor === S ? t.value : t, l = a.scannable, c = l.length; c--; ) {
-            var B = l[c], p = B.rule.symbols[B.dot];
-            if (p.test ? p.test(P) : p.type ? p.type === t.type : p.literal === U) {
-              var V = B.nextState({ data: P, token: t, isToken: !0, reference: o - 1 });
+          for (var U = s.text !== void 0 ? s.text : s.value, P = O.constructor === S ? s.value : s, l = a.scannable, c = l.length; c--; ) {
+            var m = l[c], p = m.rule.symbols[m.dot];
+            if (p.test ? p.test(P) : p.type ? p.type === s.type : p.literal === U) {
+              var V = m.nextState({ data: P, token: s, isToken: !0, reference: o - 1 });
               n.states.push(V);
             }
           }
           if (n.process(), n.states.length === 0) {
-            var L = new Error(this.reportError(t));
-            throw L.offset = this.current, L.token = t, L;
+            var L = new Error(this.reportError(s));
+            throw L.offset = this.current, L.token = s, L;
           }
           this.options.keepHistory && (a.lexerState = O.save()), this.current++;
         }
         return a && (this.lexerState = O.save()), this.results = this.finish(), this;
       }, N.prototype.reportLexerError = function(I) {
-        var O, t, L = I.token;
-        return L ? (O = "input " + JSON.stringify(L.text[0]) + " (lexer error)", t = this.lexer.formatError(L, "Syntax error")) : (O = "input (lexer error)", t = I.message), this.reportErrorCommon(t, O);
+        var O, s, L = I.token;
+        return L ? (O = "input " + JSON.stringify(L.text[0]) + " (lexer error)", s = this.lexer.formatError(L, "Syntax error")) : (O = "input (lexer error)", s = I.message), this.reportErrorCommon(s, O);
       }, N.prototype.reportError = function(I) {
-        var O = (I.type ? I.type + " token: " : "") + JSON.stringify(I.value !== void 0 ? I.value : I), t = this.lexer.formatError(I, "Syntax error");
-        return this.reportErrorCommon(t, O);
+        var O = (I.type ? I.type + " token: " : "") + JSON.stringify(I.value !== void 0 ? I.value : I), s = this.lexer.formatError(I, "Syntax error");
+        return this.reportErrorCommon(s, O);
       }, N.prototype.reportErrorCommon = function(I, O) {
-        var t = [];
-        t.push(I);
+        var s = [];
+        s.push(I);
         var L = this.table.length - 2, a = this.table[L], o = a.states.filter(function(U) {
           var P = U.rule.symbols[U.dot];
           return P && typeof P != "string";
         });
         if (o.length === 0)
-          t.push("Unexpected " + O + `. I did not expect any more input. Here is the state of my parse table:
-`), this.displayStateStack(a.states, t);
+          s.push("Unexpected " + O + `. I did not expect any more input. Here is the state of my parse table:
+`), this.displayStateStack(a.states, s);
         else {
-          t.push("Unexpected " + O + `. Instead, I was expecting to see one of the following:
+          s.push("Unexpected " + O + `. Instead, I was expecting to see one of the following:
 `);
           var n = o.map(function(U) {
             return this.buildFirstStateStack(U, []) || [U];
           }, this);
           n.forEach(function(U) {
             var P = U[0], l = P.rule.symbols[P.dot], c = this.getSymbolDisplay(l);
-            t.push("A " + c + " based on:"), this.displayStateStack(U, t);
+            s.push("A " + c + " based on:"), this.displayStateStack(U, s);
           }, this);
         }
-        return t.push(""), t.join(`
+        return s.push(""), s.join(`
 `);
       }, N.prototype.displayStateStack = function(I, O) {
-        for (var t, L = 0, a = 0; a < I.length; a++) {
+        for (var s, L = 0, a = 0; a < I.length; a++) {
           var o = I[a], n = o.rule.toString(o.dot);
-          n === t ? L++ : (L > 0 && O.push("    ^ " + L + " more lines identical to this"), L = 0, O.push("    " + n)), t = n;
+          n === s ? L++ : (L > 0 && O.push("    ^ " + L + " more lines identical to this"), L = 0, O.push("    " + n)), s = n;
         }
       }, N.prototype.getSymbolDisplay = function(I) {
-        return s(I);
+        return t(I);
       }, N.prototype.buildFirstStateStack = function(I, O) {
         if (O.indexOf(I) !== -1)
           return null;
         if (I.wantedBy.length === 0)
           return [I];
-        var t = I.wantedBy[0], L = [I].concat(O), a = this.buildFirstStateStack(t, L);
+        var s = I.wantedBy[0], L = [I].concat(O), a = this.buildFirstStateStack(s, L);
         return a === null ? null : [I].concat(a);
       }, N.prototype.save = function() {
         var I = this.table[this.current];
@@ -18431,14 +18459,14 @@ function lI() {
           throw new Error("set option `keepHistory` to enable rewinding");
         this.restore(this.table[I]);
       }, N.prototype.finish = function() {
-        var I = [], O = this.grammar.start, t = this.table[this.table.length - 1];
-        return t.states.forEach(function(L) {
+        var I = [], O = this.grammar.start, s = this.table[this.table.length - 1];
+        return s.states.forEach(function(L) {
           L.rule.name === O && L.dot === L.rule.symbols.length && L.reference === 0 && L.data !== N.fail && I.push(L);
         }), I.map(function(L) {
           return L.data;
         });
       };
-      function s(I) {
+      function t(I) {
         var O = typeof I;
         if (O === "string")
           return I;
@@ -18454,7 +18482,7 @@ function lI() {
           throw new Error("Unknown symbol type: " + I);
         }
       }
-      function _(I) {
+      function r(I) {
         var O = typeof I;
         if (O === "string")
           return I;
@@ -18478,14 +18506,14 @@ function lI() {
     });
   })(eE)), eE.exports;
 }
-var cI = lI();
-const uI = /* @__PURE__ */ UI(cI);
-function HI(T) {
-  return T.map(BI).map(mI).map(FI).map(YI).map(pI);
+var wI = gI();
+const JI = /* @__PURE__ */ KI(wI);
+function xI(T) {
+  return T.map(vI).map(QI).map(ZI).map(qI).map(jI);
 }
-const BI = (T, E, R) => {
+const vI = (T, E, R) => {
   if (jT(T.type)) {
-    const A = dI(R, E);
+    const A = kI(R, E);
     if (A && A.type === D.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
     const e = k(R, E);
@@ -18493,40 +18521,40 @@ const BI = (T, E, R) => {
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
-}, mI = (T, E, R) => {
+}, QI = (T, E, R) => {
   if (T.type === D.RESERVED_FUNCTION_NAME) {
     const A = k(R, E);
     if (!A || !AR(A))
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
-}, FI = (T, E, R) => {
+}, ZI = (T, E, R) => {
   if (T.type === D.RESERVED_DATA_TYPE) {
     const A = k(R, E);
     if (A && AR(A))
       return Object.assign(Object.assign({}, T), { type: D.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return T;
-}, YI = (T, E, R) => {
+}, qI = (T, E, R) => {
   if (T.type === D.IDENTIFIER) {
     const A = k(R, E);
     if (A && eR(A))
       return Object.assign(Object.assign({}, T), { type: D.ARRAY_IDENTIFIER });
   }
   return T;
-}, pI = (T, E, R) => {
+}, jI = (T, E, R) => {
   if (T.type === D.RESERVED_DATA_TYPE) {
     const A = k(R, E);
     if (A && eR(A))
       return Object.assign(Object.assign({}, T), { type: D.ARRAY_KEYWORD });
   }
   return T;
-}, dI = (T, E) => k(T, E, -1), k = (T, E, R = 1) => {
+}, kI = (T, E) => k(T, E, -1), k = (T, E, R = 1) => {
   let A = 1;
-  for (; T[E + A * R] && fI(T[E + A * R]); )
+  for (; T[E + A * R] && zI(T[E + A * R]); )
     A++;
   return T[E + A * R];
-}, AR = (T) => T.type === D.OPEN_PAREN && T.text === "(", eR = (T) => T.type === D.OPEN_PAREN && T.text === "[", fI = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
+}, AR = (T) => T.type === D.OPEN_PAREN && T.text === "(", eR = (T) => T.type === D.OPEN_PAREN && T.text === "[", zI = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
 class SR {
   constructor(E) {
     this.tokenize = E, this.index = 0, this.tokens = [], this.input = "";
@@ -18563,7 +18591,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
   type: M.data_type,
   text: T.text,
   raw: T.raw
-}), Y = (T, { leading: E, trailing: R }) => (E?.length && (T = Object.assign(Object.assign({}, T), { leadingComments: E })), R?.length && (T = Object.assign(Object.assign({}, T), { trailingComments: R })), T), hI = (T, { leading: E, trailing: R }) => {
+}), Y = (T, { leading: E, trailing: R }) => (E?.length && (T = Object.assign(Object.assign({}, T), { leadingComments: E })), R?.length && (T = Object.assign(Object.assign({}, T), { trailingComments: R })), T), EO = (T, { leading: E, trailing: R }) => {
   if (E?.length) {
     const [A, ...e] = T;
     T = [Y(A, { leading: E }), ...e];
@@ -18573,7 +18601,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
     T = [...A, Y(e, { trailing: R })];
   }
   return T;
-}, VI = {
+}, TO = {
   Lexer: G,
   ParserRules: [
     { name: "main$ebnf$1", symbols: [] },
@@ -18838,7 +18866,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       postprocess: ([T, E, R, A, e, S, N]) => ({
         type: M.between_predicate,
         betweenKw: F(T),
-        expr1: hI(R, { leading: E, trailing: A }),
+        expr1: EO(R, { leading: E, trailing: A }),
         andKw: F(e),
         expr2: [Y(N, { leading: S })]
       })
@@ -18898,7 +18926,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
     { name: "literal$subexpression$1", symbols: [G.has("STRING") ? { type: "STRING" } : STRING] },
     { name: "literal", symbols: ["literal$subexpression$1"], postprocess: ([[T]]) => ({ type: M.literal, text: T.text }) },
     { name: "keyword$subexpression$1", symbols: [G.has("RESERVED_KEYWORD") ? { type: "RESERVED_KEYWORD" } : RESERVED_KEYWORD] },
-    { name: "keyword$subexpression$1", symbols: [G.has("RESERVED_PHRASE") ? { type: "RESERVED_PHRASE" } : RESERVED_PHRASE] },
+    { name: "keyword$subexpression$1", symbols: [G.has("RESERVED_KEYWORD_PHRASE") ? { type: "RESERVED_KEYWORD_PHRASE" } : RESERVED_KEYWORD_PHRASE] },
     { name: "keyword$subexpression$1", symbols: [G.has("RESERVED_JOIN") ? { type: "RESERVED_JOIN" } : RESERVED_JOIN] },
     {
       name: "keyword",
@@ -18906,6 +18934,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       postprocess: ([[T]]) => F(T)
     },
     { name: "data_type$subexpression$1", symbols: [G.has("RESERVED_DATA_TYPE") ? { type: "RESERVED_DATA_TYPE" } : RESERVED_DATA_TYPE] },
+    { name: "data_type$subexpression$1", symbols: [G.has("RESERVED_DATA_TYPE_PHRASE") ? { type: "RESERVED_DATA_TYPE_PHRASE" } : RESERVED_DATA_TYPE_PHRASE] },
     {
       name: "data_type",
       symbols: ["data_type$subexpression$1"],
@@ -18969,13 +18998,13 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
     }
   ],
   ParserStart: "main"
-}, { Parser: WI, Grammar: XI } = uI;
-function bI(T) {
+}, { Parser: RO, Grammar: AO } = JI;
+function eO(T) {
   let E = {};
   const R = new SR((e) => [
-    ...HI(T.tokenize(e, E)),
+    ...xI(T.tokenize(e, E)),
     qT(e.length)
-  ]), A = new WI(XI.fromCompiled(VI), { lexer: R });
+  ]), A = new RO(AO.fromCompiled(TO), { lexer: R });
   return {
     parse: (e, S) => {
       E = S;
@@ -19027,11 +19056,11 @@ class IR {
       }
   }
   trimHorizontalWhitespace() {
-    for (; yI(EE(this.items)); )
+    for (; SO(EE(this.items)); )
       this.items.pop();
   }
   trimWhitespace() {
-    for (; KI(EE(this.items)); )
+    for (; IO(EE(this.items)); )
       this.items.pop();
   }
   addNewline(E) {
@@ -19078,7 +19107,7 @@ class IR {
     }
   }
 }
-const yI = (T) => T === i.SPACE || T === i.SINGLE_INDENT, KI = (T) => T === i.SPACE || T === i.SINGLE_INDENT || T === i.NEWLINE;
+const SO = (T) => T === i.SPACE || T === i.SINGLE_INDENT, IO = (T) => T === i.SPACE || T === i.SINGLE_INDENT || T === i.NEWLINE;
 function yT(T, E) {
   if (E === "standard")
     return T;
@@ -19088,7 +19117,7 @@ function yT(T, E) {
 function KT(T) {
   return KR(T) || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.LIMIT;
 }
-const JE = "top-level", $I = "block-level";
+const wE = "top-level", OO = "block-level";
 class NR {
   /**
    * @param {string} indent A string to indent with
@@ -19112,20 +19141,20 @@ class NR {
    * Increases indentation by one top-level indent.
    */
   increaseTopLevel() {
-    this.indentTypes.push(JE);
+    this.indentTypes.push(wE);
   }
   /**
    * Increases indentation by one block-level indent.
    */
   increaseBlockLevel() {
-    this.indentTypes.push($I);
+    this.indentTypes.push(OO);
   }
   /**
    * Decreases indentation by one top-level indent.
    * Does nothing when the previous indent is not top-level.
    */
   decreaseTopLevel() {
-    this.indentTypes.length > 0 && EE(this.indentTypes) === JE && this.indentTypes.pop();
+    this.indentTypes.length > 0 && EE(this.indentTypes) === wE && this.indentTypes.pop();
   }
   /**
    * Decreases indentation by one block-level indent.
@@ -19133,11 +19162,11 @@ class NR {
    * throws away these as well.
    */
   decreaseBlockLevel() {
-    for (; this.indentTypes.length > 0 && this.indentTypes.pop() === JE; )
+    for (; this.indentTypes.length > 0 && this.indentTypes.pop() === wE; )
       ;
   }
 }
-class gI extends IR {
+class NO extends IR {
   constructor(E) {
     super(new NR("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
   }
@@ -19158,7 +19187,7 @@ class gI extends IR {
 }
 class QE extends Error {
 }
-class sE {
+class tE {
   constructor({ cfg: E, dialectCfg: R, params: A, layout: e, inline: S = !1 }) {
     this.inline = !1, this.nodes = [], this.index = -1, this.cfg = E, this.dialectCfg = R, this.inline = S, this.params = A, this.layout = e;
   }
@@ -19366,7 +19395,7 @@ class sE {
     return this.isDocComment(E) ? E.split(/\n/).map((R) => /^\s*\*/.test(R) ? " " + R.replace(/^\s*/, "") : R) : E.split(/\n/).map((R) => R.replace(/^\s*/, ""));
   }
   formatSubExpression(E) {
-    return new sE({
+    return new tE({
       cfg: this.cfg,
       dialectCfg: this.dialectCfg,
       params: this.params,
@@ -19377,11 +19406,11 @@ class sE {
   formatInlineExpression(E) {
     const R = this.params.getPositionalParameterIndex();
     try {
-      return new sE({
+      return new tE({
         cfg: this.cfg,
         dialectCfg: this.dialectCfg,
         params: this.params,
-        layout: new gI(this.cfg.expressionWidth),
+        layout: new NO(this.cfg.expressionWidth),
         inline: !0
       }).format(E);
     } catch (A) {
@@ -19467,9 +19496,9 @@ class sE {
     }
   }
 }
-class JI {
+class sO {
   constructor(E, R) {
-    this.dialect = E, this.cfg = R, this.params = new MI(this.cfg.params);
+    this.dialect = E, this.cfg = R, this.params = new yI(this.cfg.params);
   }
   /**
    * Formats an SQL query.
@@ -19481,25 +19510,25 @@ class JI {
     return this.formatAst(R).trimEnd();
   }
   parse(E) {
-    return bI(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
+    return eO(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
   }
   formatAst(E) {
     return E.map((R) => this.formatStatement(R)).join(`
 `.repeat(this.cfg.linesBetweenQueries + 1));
   }
   formatStatement(E) {
-    const R = new sE({
+    const R = new tE({
       cfg: this.cfg,
       dialectCfg: this.dialect.formatOptions,
       params: this.params,
-      layout: new IR(new NR(PI(this.cfg)))
+      layout: new IR(new NR(bI(this.cfg)))
     }).format(E.children);
     return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? R.add(i.NEWLINE, ";") : R.add(i.NO_NEWLINE, ";")), R.toString();
   }
 }
 class SE extends Error {
 }
-function wI(T) {
+function tO(T) {
   const E = [
     "multilineLists",
     "newlineBeforeOpenParen",
@@ -19513,17 +19542,17 @@ function wI(T) {
       throw new SE(`${R} config is no more supported.`);
   if (T.expressionWidth <= 0)
     throw new SE(`expressionWidth config must be positive number. Received ${T.expressionWidth} instead.`);
-  if (T.params && !xI(T.params) && console.warn('WARNING: All "params" option values should be strings.'), T.paramTypes && !vI(T.paramTypes))
+  if (T.params && !CO(T.params) && console.warn('WARNING: All "params" option values should be strings.'), T.paramTypes && !LO(T.paramTypes))
     throw new SE("Empty regex given in custom paramTypes. That would result in matching infinite amount of parameters.");
   return T;
 }
-function xI(T) {
+function CO(T) {
   return (T instanceof Array ? T : Object.values(T)).every((R) => typeof R == "string");
 }
-function vI(T) {
+function LO(T) {
   return T.custom && Array.isArray(T.custom) ? T.custom.every((E) => E.regex !== "") : !0;
 }
-var QI = function(T, E) {
+var _O = 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")
@@ -19531,7 +19560,7 @@ var QI = function(T, E) {
       E.indexOf(A[e]) < 0 && Object.prototype.propertyIsEnumerable.call(T, A[e]) && (R[A[e]] = T[A[e]]);
   return R;
 };
-const tR = {
+const sR = {
   bigquery: "bigquery",
   db2: "db2",
   db2i: "db2i",
@@ -19552,7 +19581,7 @@ const tR = {
   tsql: "transactsql",
   singlestoredb: "singlestoredb",
   snowflake: "snowflake"
-}, ZI = Object.keys(tR), qI = {
+}, rO = Object.keys(sR), nO = {
   tabWidth: 2,
   useTabs: !1,
   keywordCase: "preserve",
@@ -19565,27 +19594,27 @@ const tR = {
   linesBetweenQueries: 1,
   denseOperators: !1,
   newlineBeforeSemicolon: !1
-}, jI = (T, E = {}) => {
-  if (typeof E.language == "string" && !ZI.includes(E.language))
+}, iO = (T, E = {}) => {
+  if (typeof E.language == "string" && !rO.includes(E.language))
     throw new SE(`Unsupported SQL dialect: ${E.language}`);
-  const R = tR[E.language || "sql"];
-  return kI(T, Object.assign(Object.assign({}, E), { dialect: AI[R] }));
-}, kI = (T, E) => {
-  var { dialect: R } = E, A = QI(E, ["dialect"]);
+  const R = sR[E.language || "sql"];
+  return DO(T, Object.assign(Object.assign({}, E), { dialect: UI[R] }));
+}, DO = (T, E) => {
+  var { dialect: R } = E, A = _O(E, ["dialect"]);
   if (typeof T != "string")
     throw new Error("Invalid query argument. Expected string, instead got " + typeof T);
-  const e = wI(Object.assign(Object.assign({}, qI), A));
-  return new JI(DI(R), e).format(T);
+  const e = tO(Object.assign(Object.assign({}, nO), A));
+  return new sO(VI(R), e).format(T);
 };
-function zI(T) {
+function aO(T) {
   let E = 0;
   return E += (T.measures?.length || 0) * 1, E += (T.dimensions?.length || 0) * 1, E += (T.filters?.length || 0) * 2, E += (T.timeDimensions?.length || 0) * 3, E <= 5 ? "low" : E <= 15 ? "medium" : "high";
 }
-function EO() {
+function oO() {
   const T = Date.now(), E = Math.random().toString(36).substring(2, 9);
   return `${T}-${E}`;
 }
-function TO(T) {
+function PO(T) {
   const E = T.dimensions || [], R = T.timeDimensions || [], A = T.measures || [];
   return {
     sortedDimensions: E,
@@ -19610,7 +19639,7 @@ function TO(T) {
     hasMultiStage: !1
   };
 }
-function RO(T) {
+function MO(T) {
   if (T.hasExecutor()) {
     const E = T.databaseExecutor;
     if (E?.engineType)
@@ -19618,23 +19647,23 @@ function RO(T) {
   }
   return "postgres";
 }
-async function eO(T, E, R) {
+async function GO(T, E, R) {
   const A = R.validateQuery(T);
   if (!A.isValid)
     throw new Error(`Query validation failed: ${A.errors.join(", ")}`);
   const e = /* @__PURE__ */ new Set();
-  T.measures?.forEach((_) => {
-    const I = _.split(".")[0];
+  T.measures?.forEach((r) => {
+    const I = r.split(".")[0];
     e.add(I);
-  }), T.dimensions?.forEach((_) => {
-    const I = _.split(".")[0];
+  }), T.dimensions?.forEach((r) => {
+    const I = r.split(".")[0];
     e.add(I);
-  }), T.timeDimensions?.forEach((_) => {
-    const I = _.dimension.split(".")[0];
+  }), T.timeDimensions?.forEach((r) => {
+    const I = r.dimension.split(".")[0];
     e.add(I);
-  }), T.filters?.forEach((_) => {
-    if ("member" in _) {
-      const I = _.member.split(".")[0];
+  }), T.filters?.forEach((r) => {
+    if ("member" in r) {
+      const I = r.member.split(".")[0];
       e.add(I);
     }
   });
@@ -19643,14 +19672,14 @@ async function eO(T, E, R) {
   if (S)
     N = await R.generateMultiCubeSQL(T, E);
   else {
-    const _ = Array.from(e)[0];
-    N = await R.generateSQL(_, T, E);
+    const r = Array.from(e)[0];
+    N = await R.generateSQL(r, T, E);
   }
-  const s = Array.from(e).map((_) => ({
-    cube: _,
+  const t = Array.from(e).map((r) => ({
+    cube: r,
     query: {
-      measures: T.measures?.filter((I) => I.startsWith(_ + ".")) || [],
-      dimensions: T.dimensions?.filter((I) => I.startsWith(_ + ".")) || [],
+      measures: T.measures?.filter((I) => I.startsWith(r + ".")) || [],
+      dimensions: T.dimensions?.filter((I) => I.startsWith(r + ".")) || [],
       filters: T.filters || [],
       timeDimensions: T.timeDimensions || [],
       order: T.order || {},
@@ -19660,9 +19689,9 @@ async function eO(T, E, R) {
   }));
   return {
     queryType: "regularQuery",
-    normalizedQueries: s,
+    normalizedQueries: t,
     queryOrder: Array.from(e),
-    transformedQueries: s,
+    transformedQueries: t,
     pivotQuery: {
       query: T,
       cubes: Array.from(e)
@@ -19671,15 +19700,15 @@ async function eO(T, E, R) {
       sql: [N.sql],
       params: N.params || []
     },
-    complexity: zI(T),
+    complexity: aO(T),
     valid: !0,
     cubesUsed: Array.from(e),
     joinType: S ? "multi_cube_join" : "single_cube",
     query: T
   };
 }
-function SO(T, E, R) {
-  const A = RO(R), e = EO(), S = (/* @__PURE__ */ new Date()).toISOString(), N = TO(T);
+function lO(T, E, R) {
+  const A = MO(R), e = oO(), S = (/* @__PURE__ */ new Date()).toISOString(), N = PO(T);
   return {
     queryType: "regularQuery",
     results: [{
@@ -19705,7 +19734,7 @@ function SO(T, E, R) {
 }
 function $T(T, E) {
   try {
-    return jI(T, {
+    return iO(T, {
       language: {
         postgres: "postgresql",
         mysql: "mysql",
@@ -19721,25 +19750,25 @@ function $T(T, E) {
     return console.warn("SQL formatting failed:", R), T;
   }
 }
-function IO(T, E) {
+function cO(T, E) {
   return {
     sql: E.sql,
     params: E.params || [],
     query: T
   };
 }
-function OO(T) {
+function uO(T) {
   return {
     cubes: T
   };
 }
-function NO(T, E = 500) {
+function HO(T, E = 500) {
   return {
     error: T instanceof Error ? T.message : T,
     status: E
   };
 }
-class AO {
+class UO {
   cubes = /* @__PURE__ */ new Map();
   dbExecutor;
   metadataCache;
@@ -19747,7 +19776,7 @@ class AO {
   METADATA_CACHE_TTL = 300 * 1e3;
   // 5 minutes in milliseconds
   constructor(E) {
-    E?.databaseExecutor ? this.dbExecutor = E.databaseExecutor : E?.drizzle && (this.dbExecutor = tT(
+    E?.databaseExecutor ? this.dbExecutor = E.databaseExecutor : E?.drizzle && (this.dbExecutor = sT(
       E.drizzle,
       E.schema,
       E.engineType
@@ -19769,7 +19798,7 @@ class AO {
    * Set Drizzle instance and schema directly
    */
   setDrizzle(E, R, A) {
-    this.dbExecutor = tT(E, R, A);
+    this.dbExecutor = sT(E, R, A);
   }
   /**
    * Check if database executor is configured
@@ -19856,24 +19885,24 @@ class AO {
    */
   generateCubeMetadata(E) {
     const R = Object.keys(E.measures), A = Object.keys(E.dimensions), e = new Array(R.length), S = new Array(A.length);
-    for (let s = 0; s < R.length; s++) {
-      const _ = R[s], I = E.measures[_];
-      e[s] = {
-        name: `${E.name}.${_}`,
-        title: I.title || _,
-        shortTitle: I.title || _,
+    for (let t = 0; t < R.length; t++) {
+      const r = R[t], I = E.measures[r];
+      e[t] = {
+        name: `${E.name}.${r}`,
+        title: I.title || r,
+        shortTitle: I.title || r,
         type: I.type,
         format: void 0,
         // Measure doesn't have format field
         description: I.description
       };
     }
-    for (let s = 0; s < A.length; s++) {
-      const _ = A[s], I = E.dimensions[_];
-      S[s] = {
-        name: `${E.name}.${_}`,
-        title: I.title || _,
-        shortTitle: I.title || _,
+    for (let t = 0; t < A.length; t++) {
+      const r = A[t], I = E.dimensions[r];
+      S[t] = {
+        name: `${E.name}.${r}`,
+        title: I.title || r,
+        shortTitle: I.title || r,
         type: I.type,
         format: void 0,
         // Dimension doesn't have format field
@@ -19882,12 +19911,12 @@ class AO {
     }
     const N = [];
     if (E.joins)
-      for (const [, s] of Object.entries(E.joins)) {
-        const _ = typeof s.targetCube == "function" ? s.targetCube() : s.targetCube;
+      for (const [, t] of Object.entries(E.joins)) {
+        const r = typeof t.targetCube == "function" ? t.targetCube() : t.targetCube;
         N.push({
-          targetCube: _.name,
-          relationship: s.relationship,
-          joinFields: s.on.map((I) => ({
+          targetCube: r.name,
+          relationship: t.relationship,
+          joinFields: t.on.map((I) => ({
             sourceField: this.getColumnName(I.source),
             targetField: this.getColumnName(I.target)
           }))
@@ -19913,9 +19942,9 @@ class AO {
       throw new Error(`Cube '${E}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const N = await new UE(this.dbExecutor).generateSQL(e, R, A), s = this.dbExecutor.getEngineType();
+    const N = await new UE(this.dbExecutor).generateSQL(e, R, A), t = this.dbExecutor.getEngineType();
     return {
-      sql: $T(N.sql, s),
+      sql: $T(N.sql, t),
       params: N.params
     };
   }
@@ -19968,10 +19997,10 @@ class AO {
    * Ensures all referenced cubes and fields exist
    */
   validateQuery(E) {
-    return sR(this.cubes, E);
+    return tR(this.cubes, E);
   }
 }
-function sR(T, E) {
+function tR(T, E) {
   const R = [], A = /* @__PURE__ */ new Set();
   if (E.measures)
     for (const e of E.measures) {
@@ -19981,12 +20010,12 @@ function sR(T, E) {
         continue;
       }
       A.add(S);
-      const s = T.get(S);
-      if (!s) {
+      const t = T.get(S);
+      if (!t) {
         R.push(`Cube '${S}' not found (referenced in measure '${e}')`);
         continue;
       }
-      s.measures[N] || R.push(`Measure '${N}' not found on cube '${S}'`);
+      t.measures[N] || R.push(`Measure '${N}' not found on cube '${S}'`);
     }
   if (E.dimensions)
     for (const e of E.dimensions) {
@@ -19996,12 +20025,12 @@ function sR(T, E) {
         continue;
       }
       A.add(S);
-      const s = T.get(S);
-      if (!s) {
+      const t = T.get(S);
+      if (!t) {
         R.push(`Cube '${S}' not found (referenced in dimension '${e}')`);
         continue;
       }
-      s.dimensions[N] || R.push(`Dimension '${N}' not found on cube '${S}'`);
+      t.dimensions[N] || R.push(`Dimension '${N}' not found on cube '${S}'`);
     }
   if (E.timeDimensions)
     for (const e of E.timeDimensions) {
@@ -20011,12 +20040,12 @@ function sR(T, E) {
         continue;
       }
       A.add(S);
-      const s = T.get(S);
-      if (!s) {
+      const t = T.get(S);
+      if (!t) {
         R.push(`Cube '${S}' not found (referenced in timeDimension '${e.dimension}')`);
         continue;
       }
-      s.dimensions[N] || R.push(`TimeDimension '${N}' not found on cube '${S}' (must be a dimension with time type)`);
+      t.dimensions[N] || R.push(`TimeDimension '${N}' not found on cube '${S}' (must be a dimension with time type)`);
     }
   if (E.filters)
     for (const e of E.filters)
@@ -20028,9 +20057,9 @@ function sR(T, E) {
 }
 function CR(T, E, R, A) {
   if ("and" in T || "or" in T) {
-    const s = T.and || T.or || [];
-    for (const _ of s)
-      CR(_, E, R, A);
+    const t = T.and || T.or || [];
+    for (const r of t)
+      CR(r, E, R, A);
     return;
   }
   if (!("member" in T)) {
@@ -20050,12 +20079,12 @@ function CR(T, E, R, A) {
   }
   !N.dimensions[S] && !N.measures[S] && R.push(`Filter field '${S}' not found on cube '${e}' (must be a dimension or measure)`);
 }
-new AO();
+new UO();
 export {
-  AO as S,
-  OO as a,
-  IO as b,
-  NO as c,
-  SO as f,
-  eO as h
+  UO as S,
+  uO as a,
+  cO as b,
+  HO as c,
+  lO as f,
+  GO as h
 };