drizzle-cube 0.1.35 → 0.1.37

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

@@ -1,27 +1,27 @@
-const h = Symbol.for("drizzle:entityKind");
-function H(T, E) {
+const f = Symbol.for("drizzle:entityKind");
+function m(T, E) {
   if (!T || typeof T != "object")
     return !1;
   if (T instanceof E)
     return !0;
-  if (!Object.prototype.hasOwnProperty.call(E, h))
+  if (!Object.prototype.hasOwnProperty.call(E, f))
     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 (h in R && R[h] === E[h])
+      if (f in R && R[f] === E[f])
         return !0;
       R = Object.getPrototypeOf(R);
     }
   return !1;
 }
-class TE {
+class RE {
   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 [h] = "Column";
+  static [f] = "Column";
   name;
   keyAsName;
   primary;
@@ -51,11 +51,11 @@ class TE {
   }
 }
 const _E = Symbol.for("drizzle:Name"), kE = Symbol.for("drizzle:isPgEnum");
-function _R(T) {
+function rR(T) {
   return !!T && typeof T == "function" && kE in T && T[kE] === !0;
 }
 class gT {
-  static [h] = "Subquery";
+  static [f] = "Subquery";
   constructor(E, R, A, e = !1, S = []) {
     this._ = {
       brand: "Subquery",
@@ -70,13 +70,13 @@ class gT {
   // 	return new SQL([this]);
   // }
 }
-const rR = {
+const nR = {
   startActiveSpan(T, E) {
     return E();
   }
-}, 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");
+}, EE = 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"), OE = Symbol.for("drizzle:IsAlias"), TT = Symbol.for("drizzle:ExtraConfigBuilder"), iR = Symbol.for("drizzle:IsDrizzleTable");
 class W {
-  static [h] = "Table";
+  static [f] = "Table";
   /** @internal */
   static Symbol = {
     Name: _E,
@@ -85,7 +85,7 @@ class W {
     Columns: zE,
     ExtraConfigColumns: ET,
     BaseName: iE,
-    IsAlias: IE,
+    IsAlias: OE,
     ExtraConfigBuilder: TT
   };
   /**
@@ -110,9 +110,9 @@ class W {
    */
   [iE];
   /** @internal */
-  [IE] = !1;
+  [OE] = !1;
   /** @internal */
-  [nR] = !0;
+  [iR] = !0;
   /** @internal */
   [TT] = void 0;
   constructor(E, R, A) {
@@ -122,14 +122,14 @@ class W {
 function wT(T) {
   return T != null && typeof T.getSQL == "function";
 }
-function iR(T) {
+function DR(T) {
   const E = { sql: "", params: [] };
   for (const R of T)
     E.sql += R.sql, E.params.push(...R.params), R.typings?.length && (E.typings || (E.typings = []), E.typings.push(...R.typings));
   return E;
 }
 class d {
-  static [h] = "StringChunk";
+  static [f] = "StringChunk";
   value;
   constructor(E) {
     this.value = Array.isArray(E) ? E : [E];
@@ -142,14 +142,14 @@ class u {
   constructor(E) {
     this.queryChunks = E;
     for (const R of E)
-      if (H(R, W)) {
+      if (m(R, W)) {
         const A = R[W.Symbol.Schema];
         this.usedTables.push(
           A === void 0 ? R[W.Symbol.Name] : A + "." + R[W.Symbol.Name]
         );
       }
   }
-  static [h] = "SQL";
+  static [f] = "SQL";
   /** @internal */
   decoder = JT;
   shouldInlineParams = !1;
@@ -159,7 +159,7 @@ class u {
     return this.queryChunks.push(...E.queryChunks), this;
   }
   toQuery(E) {
-    return rR.startActiveSpan("drizzle.buildSQL", (R) => {
+    return nR.startActiveSpan("drizzle.buildSQL", (R) => {
       const A = this.buildQueryFromSourceParams(this.queryChunks, E);
       return R?.setAttributes({
         "drizzle.query.text": A.sql,
@@ -177,71 +177,71 @@ class u {
       escapeParam: N,
       prepareTyping: t,
       inlineParams: r,
-      paramStartIndex: I
+      paramStartIndex: O
     } = A;
-    return iR(E.map((O) => {
-      if (H(O, d))
-        return { sql: O.value.join(""), params: [] };
-      if (H(O, JE))
-        return { sql: S(O.value), params: [] };
-      if (O === void 0)
+    return DR(E.map((I) => {
+      if (m(I, d))
+        return { sql: I.value.join(""), params: [] };
+      if (m(I, JE))
+        return { sql: S(I.value), params: [] };
+      if (I === void 0)
         return { sql: "", params: [] };
-      if (Array.isArray(O)) {
+      if (Array.isArray(I)) {
         const s = [new d("(")];
-        for (const [L, a] of O.entries())
-          s.push(a), L < O.length - 1 && s.push(new d(", "));
+        for (const [L, a] of I.entries())
+          s.push(a), L < I.length - 1 && s.push(new d(", "));
         return s.push(new d(")")), this.buildQueryFromSourceParams(s, A);
       }
-      if (H(O, u))
-        return this.buildQueryFromSourceParams(O.queryChunks, {
+      if (m(I, u))
+        return this.buildQueryFromSourceParams(I.queryChunks, {
           ...A,
-          inlineParams: r || O.shouldInlineParams
+          inlineParams: r || I.shouldInlineParams
         });
-      if (H(O, W)) {
-        const s = O[W.Symbol.Schema], L = O[W.Symbol.Name];
+      if (m(I, W)) {
+        const s = I[W.Symbol.Schema], L = I[W.Symbol.Name];
         return {
-          sql: s === void 0 || O[IE] ? S(L) : S(s) + "." + S(L),
+          sql: s === void 0 || I[OE] ? S(L) : S(s) + "." + S(L),
           params: []
         };
       }
-      if (H(O, TE)) {
-        const s = e.getColumnCasing(O);
+      if (m(I, RE)) {
+        const s = e.getColumnCasing(I);
         if (R.invokeSource === "indexes")
           return { sql: S(s), params: [] };
-        const L = O.table[W.Symbol.Schema];
+        const L = I.table[W.Symbol.Schema];
         return {
-          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),
+          sql: I.table[OE] || L === void 0 ? S(I.table[W.Symbol.Name]) + "." + S(s) : S(L) + "." + S(I.table[W.Symbol.Name]) + "." + S(s),
           params: []
         };
       }
-      if (H(O, vT)) {
-        const s = O[z].schema, L = O[z].name;
+      if (m(I, vT)) {
+        const s = I[EE].schema, L = I[EE].name;
         return {
-          sql: s === void 0 || O[z].isAlias ? S(L) : S(s) + "." + S(L),
+          sql: s === void 0 || I[EE].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 s = O.value === null ? null : O.encoder.mapToDriverValue(O.value);
-        if (H(s, u))
+      if (m(I, NE)) {
+        if (m(I.value, sE))
+          return { sql: N(O.value++, I), params: [I], typings: ["none"] };
+        const s = I.value === null ? null : I.encoder.mapToDriverValue(I.value);
+        if (m(s, u))
           return this.buildQueryFromSourceParams([s], A);
         if (r)
           return { sql: this.mapInlineParam(s, A), params: [] };
         let L = ["none"];
-        return t && (L = [t(O.encoder)]), { sql: N(I.value++, s), params: [s], typings: L };
+        return t && (L = [t(I.encoder)]), { sql: N(O.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([
+      return m(I, sE) ? { sql: N(O.value++, I), params: [I], typings: ["none"] } : m(I, u.Aliased) && I.fieldAlias !== void 0 ? { sql: S(I.fieldAlias), params: [] } : m(I, gT) ? I._.isWith ? { sql: S(I._.alias), params: [] } : this.buildQueryFromSourceParams([
         new d("("),
-        O._.sql,
+        I._.sql,
         new d(") "),
-        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 JE(I._.alias)
+      ], A) : rR(I) ? I.schema ? { sql: S(I.schema) + "." + S(I.enumName), params: [] } : { sql: S(I.enumName), params: [] } : wT(I) ? I.shouldOmitSQLParens?.() ? this.buildQueryFromSourceParams([I.getSQL()], A) : this.buildQueryFromSourceParams([
         new d("("),
-        O.getSQL(),
+        I.getSQL(),
         new d(")")
-      ], A) : r ? { sql: this.mapInlineParam(O, A), params: [] } : { sql: N(I.value++, O), params: [O], typings: ["none"] };
+      ], A) : r ? { sql: this.mapInlineParam(I, A), params: [] } : { sql: N(O.value++, I), params: [I], typings: ["none"] };
     }));
   }
   mapInlineParam(E, { escapeString: R }) {
@@ -283,13 +283,13 @@ class JE {
   constructor(E) {
     this.value = E;
   }
-  static [h] = "Name";
+  static [f] = "Name";
   brand;
   getSQL() {
     return new u([this]);
   }
 }
-function DR(T) {
+function aR(T) {
   return typeof T == "object" && T !== null && "mapToDriverValue" in T && typeof T.mapToDriverValue == "function";
 }
 const JT = {
@@ -301,7 +301,7 @@ const JT = {
   ...JT,
   ...xT
 });
-class OE {
+class NE {
   /**
    * @param value - Parameter value
    * @param encoder - Encoder to convert the value to a driver parameter
@@ -309,7 +309,7 @@ class OE {
   constructor(E, R = xT) {
     this.value = E, this.encoder = R;
   }
-  static [h] = "Param";
+  static [f] = "Param";
   brand;
   getSQL() {
     return new u([this]);
@@ -335,11 +335,11 @@ function C(T, ...E) {
     return new u([new d(r)]);
   }
   T.raw = A;
-  function e(r, I) {
-    const O = [];
+  function e(r, O) {
+    const I = [];
     for (const [s, L] of r.entries())
-      s > 0 && I !== void 0 && O.push(I), O.push(L);
-    return new u(O);
+      s > 0 && O !== void 0 && I.push(O), I.push(L);
+    return new u(I);
   }
   T.join = e;
   function S(r) {
@@ -347,11 +347,11 @@ function C(T, ...E) {
   }
   T.identifier = S;
   function N(r) {
-    return new NE(r);
+    return new sE(r);
   }
   T.placeholder = N;
-  function t(r, I) {
-    return new OE(r, I);
+  function t(r, O) {
+    return new NE(r, O);
   }
   T.param = t;
 })(C || (C = {}));
@@ -360,7 +360,7 @@ function C(T, ...E) {
     constructor(A, e) {
       this.sql = A, this.fieldAlias = e;
     }
-    static [h] = "SQL.Aliased";
+    static [f] = "SQL.Aliased";
     /** @internal */
     isSelectionField = !1;
     getSQL() {
@@ -373,24 +373,24 @@ function C(T, ...E) {
   }
   T.Aliased = E;
 })(u || (u = {}));
-class NE {
+class sE {
   constructor(E) {
     this.name = E;
   }
-  static [h] = "Placeholder";
+  static [f] = "Placeholder";
   getSQL() {
     return new u([this]);
   }
 }
-const aR = Symbol.for("drizzle:IsDrizzleView");
+const oR = Symbol.for("drizzle:IsDrizzleView");
 class vT {
-  static [h] = "View";
+  static [f] = "View";
   /** @internal */
-  [z];
+  [EE];
   /** @internal */
-  [aR] = !0;
+  [oR] = !0;
   constructor({ name: E, schema: R, selectedFields: A, query: e }) {
-    this[z] = {
+    this[EE] = {
       name: E,
       originalName: E,
       schema: R,
@@ -404,7 +404,7 @@ class vT {
     return new u([this]);
   }
 }
-TE.prototype.getSQL = function() {
+RE.prototype.getSQL = function() {
   return new u([this]);
 };
 W.prototype.getSQL = function() {
@@ -414,10 +414,10 @@ gT.prototype.getSQL = function() {
   return new u([this]);
 };
 function b(T, E) {
-  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;
+  return aR(E) && !wT(T) && !m(T, NE) && !m(T, sE) && !m(T, RE) && !m(T, W) && !m(T, vT) ? new NE(T, E) : T;
 }
-const sE = (T, E) => C`${T} = ${b(E, T)}`, RT = (T, E) => C`${T} <> ${b(E, T)}`;
-function f(...T) {
+const j = (T, E) => C`${T} = ${b(E, T)}`, RT = (T, E) => C`${T} <> ${b(E, T)}`;
+function h(...T) {
   const E = T.filter(
     (R) => R !== void 0
   );
@@ -455,23 +455,23 @@ function ST(T) {
 function IT(T) {
   return C`${T} asc`;
 }
-function oR(T) {
+function PR(T) {
   return C`${T} desc`;
 }
 function ME(T) {
   return C`count(${T || C.raw("*")})`.mapWith(Number);
 }
-function PR(T) {
+function MR(T) {
   return C`count(distinct ${T})`.mapWith(Number);
 }
 function g(T) {
   return C`sum(${T})`.mapWith(String);
 }
 function xE(T) {
-  return C`max(${T})`.mapWith(H(T, TE) ? T : String);
+  return C`max(${T})`.mapWith(m(T, RE) ? T : String);
 }
 function vE(T) {
-  return C`min(${T})`.mapWith(H(T, TE) ? T : String);
+  return C`min(${T})`.mapWith(m(T, RE) ? T : String);
 }
 class ZE {
   /**
@@ -492,7 +492,7 @@ class ZE {
     }
   }
 }
-class MR extends ZE {
+class UR extends ZE {
   getEngineType() {
     return "postgres";
   }
@@ -741,7 +741,7 @@ class QT extends ZE {
     return E;
   }
 }
-class UR extends ZE {
+class GR extends ZE {
   getEngineType() {
     return "sqlite";
   }
@@ -877,7 +877,7 @@ class UR extends ZE {
     return E;
   }
 }
-class GR extends QT {
+class lR extends QT {
   getEngineType() {
     return "singlestore";
   }
@@ -890,16 +890,16 @@ class GR extends QT {
   // These limitations are typically handled at the query building level
   // rather than in the adapter, but can be addressed here if needed
 }
-function lR(T) {
+function cR(T) {
   switch (T) {
     case "postgres":
-      return new MR();
+      return new UR();
     case "mysql":
       return new QT();
     case "sqlite":
-      return new UR();
-    case "singlestore":
       return new GR();
+    case "singlestore":
+      return new lR();
     default:
       throw new Error(`Unsupported database engine: ${T}`);
   }
@@ -908,11 +908,11 @@ class qE {
   constructor(E, R, A) {
     this.db = E, this.schema = R;
     const e = A || this.getEngineType();
-    this.databaseAdapter = lR(e);
+    this.databaseAdapter = cR(e);
   }
   databaseAdapter;
 }
-class cR extends qE {
+class uR extends qE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const e = await E.execute();
@@ -964,7 +964,7 @@ class cR extends qE {
   }
 }
 function OT(T, E) {
-  return new cR(T, E, "postgres");
+  return new uR(T, E, "postgres");
 }
 class ZT extends qE {
   async execute(E, R) {
@@ -1004,10 +1004,10 @@ class ZT extends qE {
     return "mysql";
   }
 }
-function uR(T, E) {
+function HR(T, E) {
   return new ZT(T, E, "mysql");
 }
-class HR extends qE {
+class BR extends qE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const A = await E.execute();
@@ -1054,9 +1054,9 @@ class HR extends qE {
   }
 }
 function NT(T, E) {
-  return new HR(T, E, "sqlite");
+  return new BR(T, E, "sqlite");
 }
-class BR extends ZT {
+class mR extends ZT {
   getEngineType() {
     return "singlestore";
   }
@@ -1064,8 +1064,8 @@ class BR extends ZT {
   // For now, we inherit all behavior from MySQLExecutor since
   // SingleStore is largely MySQL-compatible
 }
-function mR(T, E) {
-  return new BR(T, E);
+function FR(T, E) {
+  return new mR(T, E);
 }
 function sT(T, E, R) {
   if (R)
@@ -1073,11 +1073,11 @@ function sT(T, E, R) {
       case "postgres":
         return OT(T, E);
       case "mysql":
-        return uR(T, E);
+        return HR(T, E);
       case "sqlite":
         return NT(T, E);
       case "singlestore":
-        return mR(T, E);
+        return FR(T, E);
     }
   if (T.all && T.run)
     return NT(T, E);
@@ -1088,7 +1088,7 @@ function sT(T, E, R) {
 function tT(T) {
   return typeof T == "function" ? T() : T;
 }
-function FR(T, E) {
+function qT(T, E) {
   if (E) return E;
   switch (T) {
     case "belongsTo":
@@ -1100,6 +1100,9 @@ function FR(T, E) {
     case "hasMany":
       return "left";
     // Parent may have no children
+    case "belongsToMany":
+      return "left";
+    // Many-to-many through junction table
     default:
       return "left";
   }
@@ -1107,7 +1110,43 @@ function FR(T, E) {
 function $(T, E) {
   return typeof T == "function" ? T(E) : T;
 }
-class YR {
+function YR(T, E) {
+  if (T.relationship !== "belongsToMany" || !T.through)
+    throw new Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
+  const { table: R, sourceKey: A, targetKey: e, securitySql: S } = T.through, N = [];
+  for (const I of A) {
+    const s = I.as || j;
+    N.push(s(I.source, I.target));
+  }
+  const t = [];
+  for (const I of e) {
+    const s = I.as || j;
+    t.push(s(I.source, I.target));
+  }
+  let r;
+  if (S) {
+    const I = S(E);
+    r = Array.isArray(I) ? I : [I];
+  }
+  const O = qT("belongsToMany", T.sqlJoinType);
+  return {
+    junctionJoins: [
+      {
+        joinType: O,
+        table: R,
+        condition: h(...N)
+      },
+      {
+        joinType: O,
+        table: R,
+        // This will be replaced with target cube table in query planner
+        condition: h(...t)
+      }
+    ],
+    junctionSecurityConditions: r
+  };
+}
+class pR {
   constructor(E) {
     this.databaseAdapter = E;
   }
@@ -1119,26 +1158,26 @@ 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 [t, r] = N.split("."), I = S.get(t);
-        if (I && I.dimensions && I.dimensions[r]) {
-          const O = I.dimensions[r], s = $(O.sql, A);
+        const [t, r] = N.split("."), O = S.get(t);
+        if (O && O.dimensions && O.dimensions[r]) {
+          const I = O.dimensions[r], s = $(I.sql, A);
           e[N] = C`${s}`.as(N);
         }
       }
     if (R.measures)
       for (const N of R.measures) {
-        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);
+        const [t, r] = N.split("."), O = S.get(t);
+        if (O && O.measures && O.measures[r]) {
+          const I = O.measures[r], s = this.buildMeasureExpression(I, A);
           e[N] = C`${s}`.as(N);
         }
       }
     if (R.timeDimensions)
       for (const N of R.timeDimensions) {
-        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,
+        const [t, r] = N.dimension.split("."), O = S.get(t);
+        if (O && O.dimensions && O.dimensions[r]) {
+          const I = O.dimensions[r], s = this.buildTimeDimensionExpression(
+            I.sql,
             N.granularity,
             A
           );
@@ -1183,7 +1222,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] : f(...e);
+        const S = e.length === 1 ? e[0] : h(...e);
         A = this.databaseAdapter.buildCaseWhen([
           { when: S, then: A }
         ]);
@@ -1193,7 +1232,7 @@ class YR {
       case "count":
         return ME(A);
       case "countDistinct":
-        return PR(A);
+        return MR(A);
       case "sum":
         return g(A);
       case "avg":
@@ -1228,11 +1267,11 @@ class YR {
       }
     if (R.timeDimensions)
       for (const t of R.timeDimensions) {
-        const [r, I] = t.dimension.split("."), O = N.get(r);
-        if (O && O.dimensions[I] && t.dateRange) {
+        const [r, O] = t.dimension.split("."), I = N.get(r);
+        if (I && I.dimensions[O] && t.dateRange) {
           if (e?.preAggregationCTEs && e.preAggregationCTEs.some((n) => n.cube.name === r))
             continue;
-          const s = O.dimensions[I], L = $(s.sql, A), a = this.buildDateRangeCondition(L, t.dateRange);
+          const s = I.dimensions[O], L = $(s.sql, A), a = this.buildDateRangeCondition(L, t.dateRange);
           a && S.push(a);
         }
       }
@@ -1260,21 +1299,21 @@ 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 ? f(...o) : null;
+        return o.length > 0 ? h(...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, [t, r] = N.member.split("."), I = R.get(t);
-    if (!I) return null;
-    const O = I.dimensions[r], s = I.measures[r], L = O || s;
+    const N = E, [t, r] = N.member.split("."), O = R.get(t);
+    if (!O) return null;
+    const I = O.dimensions[r], s = O.measures[r], L = I || s;
     if (!L) return null;
-    if (e === "where" && O) {
+    if (e === "where" && I) {
       if (S?.preAggregationCTEs && S.preAggregationCTEs.some((n) => n.cube.name === t))
         return null;
-      const a = $(O.sql, A);
+      const a = $(I.sql, A);
       return this.buildFilterCondition(a, N.operator, N.values, L);
     } else {
       if (e === "where" && s)
@@ -1306,7 +1345,7 @@ class YR {
           return PE(E, S);
         } else if (S.length === 1) {
           const t = e?.type === "time" && this.normalizeDate(N) || N;
-          return sE(E, t);
+          return j(E, t);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
@@ -1335,7 +1374,7 @@ class YR {
         if (S.length >= 2) {
           const t = this.normalizeDate(S[0]), r = this.normalizeDate(S[1]);
           if (t && r)
-            return f(
+            return h(
               v(E, t),
               Q(E, r)
             );
@@ -1350,7 +1389,7 @@ class YR {
         return t ? aE(E, t) : null;
       }
       case "between":
-        return S.length >= 2 ? f(
+        return S.length >= 2 ? h(
           v(E, S[0]),
           Q(E, S[1])
         ) : null;
@@ -1376,10 +1415,10 @@ class YR {
       case "isEmpty":
         return DE(
           eT(E),
-          sE(E, "")
+          j(E, "")
         );
       case "isNotEmpty":
-        return f(
+        return h(
           ST(E),
           RT(E, "")
         );
@@ -1394,7 +1433,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 : f(
+      return !A || !e ? null : h(
         v(E, A),
         Q(E, e)
       );
@@ -1402,7 +1441,7 @@ class YR {
     if (typeof R == "string") {
       const A = this.parseRelativeDateRange(R);
       if (A)
-        return f(
+        return h(
           v(E, A.start),
           Q(E, A.end)
         );
@@ -1411,7 +1450,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), f(
+      return N.setUTCHours(23, 59, 59, 999), h(
         v(E, S),
         Q(E, N)
       );
@@ -1483,14 +1522,14 @@ class YR {
       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 s = parseInt(I[1], 10), L = new Date(Date.UTC(e, S - s + 1, 1, 0, 0, 0, 0)), a = new Date(R);
+    const O = A.match(/^last\s+(\d+)\s+months?$/);
+    if (O) {
+      const s = parseInt(O[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 s = parseInt(O[1], 10), L = new Date(Date.UTC(e - s, 0, 1, 0, 0, 0, 0)), a = new Date(R);
+    const I = A.match(/^last\s+(\d+)\s+years?$/);
+    if (I) {
+      const s = parseInt(I[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;
@@ -1526,27 +1565,27 @@ class YR {
     const t = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
       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);
+        const [O, I] = r.split("."), s = t.get(O);
+        if (s && s.dimensions && s.dimensions[I])
+          if (e?.preAggregationCTEs?.some((a) => a.cube.name === O)) {
+            const a = e.preAggregationCTEs.find((n) => n.cube.name === O), o = a.joinKeys.find((n) => n.targetColumn === I);
             if (o && o.sourceColumnObj)
               S.push(o.sourceColumnObj);
             else {
-              const n = C`${C.identifier(a.cteAlias)}.${C.identifier(O)}`;
+              const n = C`${C.identifier(a.cteAlias)}.${C.identifier(I)}`;
               S.push(n);
             }
           } else {
-            const a = s.dimensions[O], o = $(a.sql, A);
+            const a = s.dimensions[I], o = $(a.sql, A);
             S.push(o);
           }
       }
     if (R.timeDimensions)
       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);
+        const [O, I] = r.dimension.split("."), s = t.get(O);
+        if (s && s.dimensions && s.dimensions[I])
+          if (e?.preAggregationCTEs?.some((a) => a.cube.name === O)) {
+            const a = e.preAggregationCTEs.find((n) => n.cube.name === O), o = a.joinKeys.find((n) => n.targetColumn === I);
             if (o && o.sourceColumnObj) {
               const n = this.buildTimeDimensionExpression(
                 o.sourceColumnObj,
@@ -1555,11 +1594,11 @@ class YR {
               );
               S.push(n);
             } else {
-              const n = C`${C.identifier(a.cteAlias)}.${C.identifier(O)}`;
+              const n = C`${C.identifier(a.cteAlias)}.${C.identifier(I)}`;
               S.push(n);
             }
           } else {
-            const a = s.dimensions[O], o = this.buildTimeDimensionExpression(
+            const a = s.dimensions[I], o = this.buildTimeDimensionExpression(
               a.sql,
               r.granularity,
               A
@@ -1582,7 +1621,7 @@ 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 t = N === "desc" ? oR(C.identifier(S)) : IT(C.identifier(S));
+        const t = N === "desc" ? PR(C.identifier(S)) : IT(C.identifier(S));
         A.push(t);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
@@ -1604,8 +1643,8 @@ class YR {
       for (const S of R.dimensions) {
         const [N, t] = S.split("."), r = e.get(N);
         if (r) {
-          const I = r.dimensions[t];
-          I && I.type === "number" && A.push(S);
+          const O = r.dimensions[t];
+          O && O.type === "number" && A.push(S);
         }
       }
     return A;
@@ -1631,7 +1670,7 @@ class YR {
     return e;
   }
 }
-class pR {
+class dR {
   /**
    * Analyze a semantic query to determine which cubes are involved
    */
@@ -1720,7 +1759,7 @@ class pR {
         groupByFields: []
         // Will be built by QueryBuilder
       };
-    const r = this.buildJoinPlan(E, t, S), I = this.planPreAggregationCTEs(E, t, r, R);
+    const r = this.buildJoinPlan(E, t, S, A), O = this.planPreAggregationCTEs(E, t, r, R);
     return {
       primaryCube: t,
       joinCubes: r,
@@ -1730,7 +1769,7 @@ class pR {
       // Will be built by QueryBuilder
       groupByFields: [],
       // Will be built by QueryBuilder
-      preAggregationCTEs: I
+      preAggregationCTEs: O
     };
   }
   /**
@@ -1779,36 +1818,56 @@ class pR {
    * Build join plan for multi-cube query
    * 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((t) => t !== R.name);
-    for (const t of N) {
-      if (S.has(t))
+  buildJoinPlan(E, R, A, e) {
+    const S = [], N = /* @__PURE__ */ new Set([R.name]), t = A.filter((r) => r !== R.name);
+    for (const r of t) {
+      if (N.has(r))
         continue;
-      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))
+      const O = this.findJoinPath(E, R.name, r, N);
+      if (!O || O.length === 0)
+        throw new Error(`No join path found from '${R.name}' to '${r}'`);
+      for (const { toCube: I, joinDef: s } of O) {
+        if (N.has(I))
           continue;
-        const s = E.get(I);
-        if (!s)
+        const L = E.get(I);
+        if (!L)
           throw new Error(`Cube '${I}' not found`);
-        const L = this.buildJoinCondition(
-          O,
-          null,
-          // No source alias needed - use the actual column
-          null
-          // No target alias needed - use the actual column 
-        ), a = FR(O.relationship, O.sqlJoinType);
-        e.push({
-          cube: s,
-          alias: `${I.toLowerCase()}_cube`,
-          joinType: a,
-          joinCondition: L
-        }), S.add(I);
+        if (s.relationship === "belongsToMany" && s.through) {
+          const a = YR(s, e.securityContext);
+          S.push({
+            cube: L,
+            alias: `${I.toLowerCase()}_cube`,
+            joinType: a.junctionJoins[1].joinType,
+            // Use the target join type
+            joinCondition: a.junctionJoins[1].condition,
+            // Target join condition
+            junctionTable: {
+              table: s.through.table,
+              alias: `junction_${I.toLowerCase()}`,
+              joinType: a.junctionJoins[0].joinType,
+              joinCondition: a.junctionJoins[0].condition,
+              securitySql: s.through.securitySql
+            }
+          });
+        } else {
+          const a = this.buildJoinCondition(
+            s,
+            null,
+            // No source alias needed - use the actual column
+            null
+            // No target alias needed - use the actual column
+          ), o = qT(s.relationship, s.sqlJoinType);
+          S.push({
+            cube: L,
+            alias: `${I.toLowerCase()}_cube`,
+            joinType: o,
+            joinCondition: a
+          });
+        }
+        N.add(I);
       }
     }
-    return e;
+    return S;
   }
   /**
    * Build join condition from new array-based join definition
@@ -1816,10 +1875,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, t = A ? C`${C.identifier(A)}.${C.identifier(S.target.name)}` : S.target, r = S.as || sE;
+      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 || j;
       e.push(r(N, t));
     }
-    return f(...e);
+    return h(...e);
   }
   /**
    * Find join path from source cube to target cube
@@ -1832,16 +1891,16 @@ class pR {
       { cube: R, path: [] }
     ], N = /* @__PURE__ */ new Set([R, ...e]);
     for (; S.length > 0; ) {
-      const { cube: t, path: r } = S.shift(), I = E.get(t);
-      if (I?.joins)
-        for (const [, O] of Object.entries(I.joins)) {
-          const L = tT(O.targetCube).name;
+      const { cube: t, path: r } = S.shift(), O = E.get(t);
+      if (O?.joins)
+        for (const [, I] of Object.entries(O.joins)) {
+          const L = tT(I.targetCube).name;
           if (N.has(L))
             continue;
           const a = [...r, {
             fromCube: t,
             toCube: L,
-            joinDef: O
+            joinDef: I
           }];
           if (L === A)
             return a;
@@ -1852,6 +1911,8 @@ class pR {
   }
   /**
    * Plan pre-aggregation CTEs for hasMany relationships to prevent fan-out
+   * Note: belongsToMany relationships handle fan-out differently through their junction table structure
+   * and don't require CTEs - the two-hop join with the junction table provides natural grouping
    */
   planPreAggregationCTEs(E, R, A, e) {
     const S = [];
@@ -1863,8 +1924,8 @@ class pR {
         continue;
       const r = e.measures ? e.measures.filter(
         (L) => L.startsWith(N.cube.name + ".")
-      ) : [], I = this.extractMeasuresFromFilters(e, N.cube.name), O = [.../* @__PURE__ */ new Set([...r, ...I])];
-      if (O.length === 0)
+      ) : [], O = this.extractMeasuresFromFilters(e, N.cube.name), I = [.../* @__PURE__ */ new Set([...r, ...O])];
+      if (I.length === 0)
         continue;
       const s = t.on.map((L) => ({
         sourceColumn: L.source.name,
@@ -1877,7 +1938,7 @@ class pR {
         alias: N.alias,
         cteAlias: `${N.cube.name.toLowerCase()}_agg`,
         joinKeys: s,
-        measures: O
+        measures: I
       });
     }
     return S;
@@ -1898,7 +1959,7 @@ class UE {
   constructor(E) {
     if (this.dbExecutor = E, this.databaseAdapter = E.databaseAdapter, !this.databaseAdapter)
       throw new Error("DatabaseExecutor must have a databaseAdapter property");
-    this.queryBuilder = new YR(this.databaseAdapter), this.queryPlanner = new pR();
+    this.queryBuilder = new pR(this.databaseAdapter), this.queryPlanner = new dR();
   }
   queryBuilder;
   queryPlanner;
@@ -1908,14 +1969,14 @@ class UE {
    */
   async execute(E, R, A) {
     try {
-      const e = tR(E, R);
+      const e = CR(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), 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) => {
+      }, N = this.queryPlanner.createQueryPlan(E, R, S), t = this.buildUnifiedQuery(N, R, S), r = this.queryBuilder.collectNumericFields(E, R), O = await this.dbExecutor.execute(t, r), I = Array.isArray(O) ? O.map((L) => {
         const a = { ...L };
         if (R.timeDimensions) {
           for (const o of R.timeDimensions)
@@ -1929,9 +1990,9 @@ class UE {
             }
         }
         return a;
-      }) : [I], s = this.generateAnnotations(N, R);
+      }) : [O], s = this.generateAnnotations(N, R);
       return {
-        data: O,
+        data: I,
         annotation: s
       };
     } catch (e) {
@@ -1959,8 +2020,8 @@ class UE {
     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);
-        t[U] = C`${l}`.as(U);
+        const P = S.measures[U], c = this.queryBuilder.buildMeasureExpression(P, A);
+        t[U] = C`${c}`.as(U);
       }
     }
     const r = S.name;
@@ -1968,50 +2029,50 @@ class UE {
       for (const n of R.dimensions) {
         const [U, P] = n.split(".");
         if (U === r && S.dimensions && S.dimensions[P]) {
-          const l = S.dimensions[P], c = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A);
-          t[P] = C`${c}`.as(P);
+          const c = S.dimensions[P], l = this.queryBuilder.buildMeasureExpression({ sql: c.sql, type: "number" }, A);
+          t[P] = C`${l}`.as(P);
         }
       }
     if (R.timeDimensions)
       for (const n of R.timeDimensions) {
         const [U, P] = n.dimension.split(".");
         if (U === r && S.dimensions && S.dimensions[P]) {
-          const l = S.dimensions[P], c = this.queryBuilder.buildTimeDimensionExpression(l.sql, n.granularity, A);
-          t[P] = C`${c}`.as(P);
+          const c = S.dimensions[P], l = this.queryBuilder.buildTimeDimensionExpression(c.sql, n.granularity, A);
+          t[P] = C`${l}`.as(P);
         }
       }
     if (Object.keys(t).length === 0)
       return null;
-    let I = A.db.select(t).from(N.from);
-    const O = e ? {
+    let O = A.db.select(t).from(N.from);
+    const I = e ? {
       ...e,
       preAggregationCTEs: e.preAggregationCTEs?.filter((n) => n.cube.name !== S.name)
-    } : void 0, s = this.queryBuilder.buildWhereConditions(S, R, A, O), L = [];
+    } : void 0, s = this.queryBuilder.buildWhereConditions(S, R, A, I), L = [];
     if (R.timeDimensions)
       for (const n of R.timeDimensions) {
         const [U, P] = n.dimension.split(".");
         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);
+          const c = S.dimensions[P], l = this.queryBuilder.buildMeasureExpression({ sql: c.sql, type: "number" }, A), H = this.queryBuilder.buildDateRangeCondition(l, n.dateRange);
+          H && L.push(H);
         }
       }
     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 === r && S.dimensions && S.dimensions[l]) {
-            const c = S.dimensions[l];
+          const U = n, [P, c] = U.member.split(".");
+          if (P === r && S.dimensions && S.dimensions[c]) {
+            const l = S.dimensions[c];
             if (U.operator === "inDateRange") {
-              const m = this.queryBuilder.buildMeasureExpression({ sql: c.sql, type: "number" }, A), p = this.queryBuilder.buildDateRangeCondition(m, U.values);
-              p && L.push(p);
+              const H = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(H, U.values);
+              B && L.push(B);
             }
           }
         }
     }
     const 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 n = a.length === 1 ? a[0] : h(...a);
+      O = O.where(n);
     }
     const o = [];
     for (const n of E.joinKeys)
@@ -2020,19 +2081,19 @@ class UE {
       for (const n of R.dimensions) {
         const [U, P] = n.split(".");
         if (U === r && S.dimensions && S.dimensions[P]) {
-          const l = S.dimensions[P], c = $(l.sql, A);
-          o.push(c);
+          const c = S.dimensions[P], l = $(c.sql, A);
+          o.push(l);
         }
       }
     if (R.timeDimensions)
       for (const n of R.timeDimensions) {
         const [U, P] = n.dimension.split(".");
         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);
+          const c = S.dimensions[P], l = this.queryBuilder.buildTimeDimensionExpression(c.sql, n.granularity, A);
+          o.push(l);
         }
       }
-    return o.length > 0 && (I = I.groupBy(...o)), A.db.$with(E.cteAlias).as(I);
+    return o.length > 0 && (O = O.groupBy(...o)), A.db.$with(E.cteAlias).as(O);
   }
   // Removed unused getActualJoinTargetColumn method
   /**
@@ -2045,9 +2106,9 @@ class UE {
     const S = [];
     for (const N of e.joinKeys) {
       const t = N.sourceColumnObj || C.identifier(N.sourceColumn), r = C`${C.identifier(R)}.${C.identifier(N.targetColumn)}`;
-      S.push(sE(t, r));
+      S.push(j(t, r));
     }
-    return S.length === 1 ? S[0] : f(...S);
+    return S.length === 1 ? S[0] : h(...S);
   }
   /**
    * Build unified query that works for both single and multi-cube queries
@@ -2070,49 +2131,50 @@ class UE {
         const U = n.cube.name;
         for (const P of n.measures)
           if (r[P]) {
-            const [, l] = P.split("."), c = this.getCubesFromPlan(E).get(U);
-            if (c && c.measures && c.measures[l]) {
-              const m = c.measures[l], p = C`${C.identifier(n.cteAlias)}.${C.identifier(l)}`;
+            const [, c] = P.split("."), l = this.getCubesFromPlan(E).get(U);
+            if (l && l.measures && l.measures[c]) {
+              const H = l.measures[c], B = C`${C.identifier(n.cteAlias)}.${C.identifier(c)}`;
               let V;
-              switch (m.type) {
+              switch (H.type) {
                 case "count":
                 case "countDistinct":
                 case "sum":
-                  V = g(p);
+                  V = g(B);
                   break;
                 case "avg":
-                  V = this.databaseAdapter.buildAvg(p);
+                  V = this.databaseAdapter.buildAvg(B);
                   break;
                 case "min":
-                  V = vE(p);
+                  V = vE(B);
                   break;
                 case "max":
-                  V = xE(p);
+                  V = xE(B);
                   break;
                 case "number":
-                  V = g(p);
+                  V = g(B);
                   break;
                 default:
-                  V = g(p);
+                  V = g(B);
               }
               r[P] = C`${V}`.as(P);
             }
           }
         for (const P in r) {
-          const [l, c] = P.split(".");
-          if (l === 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 && m?.dimensions?.[c]) {
-                const LE = m.dimensions[c].sql;
-                x = n.joinKeys.find((LR) => LR.targetColumnObj === LE);
+          const [c, l] = P.split(".");
+          if (c === U) {
+            const H = this.getCubesFromPlan(E).get(U), B = H && H.dimensions?.[l], V = P.startsWith(U + ".");
+            if (B || V) {
+              let x = n.joinKeys.find((LE) => LE.targetColumn === l);
+              if (!x && H?.dimensions?.[l]) {
+                const LE = H.dimensions[l].sql;
+                x = n.joinKeys.find((_R) => _R.targetColumnObj === LE);
               }
-              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));
+              x ? r[P] = C`${C.identifier(n.cteAlias)}.${C.identifier(l)}`.as(P) : V && H?.dimensions?.[l] && (r[P] = C`${C.identifier(n.cteAlias)}.${C.identifier(l)}`.as(P));
             }
           }
         }
       }
+    const O = [];
     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)
@@ -2133,27 +2195,51 @@ class UE {
     if (E.joinCubes && E.joinCubes.length > 0)
       for (const n of E.joinCubes) {
         const U = S.get(n.cube.name);
-        let P, l;
-        U ? (P = C`${C.identifier(U)}`, l = this.buildCTEJoinCondition(n, U, E)) : (P = n.cube.sql(A).from, l = n.joinCondition);
+        if (n.junctionTable) {
+          const l = n.junctionTable, H = [];
+          if (l.securitySql) {
+            const B = l.securitySql(A.securityContext);
+            Array.isArray(B) ? H.push(...B) : H.push(B);
+          }
+          try {
+            switch (l.joinType || "left") {
+              case "left":
+                I = I.leftJoin(l.table, l.joinCondition);
+                break;
+              case "inner":
+                I = I.innerJoin(l.table, l.joinCondition);
+                break;
+              case "right":
+                I = I.rightJoin(l.table, l.joinCondition);
+                break;
+              case "full":
+                I = I.fullJoin(l.table, l.joinCondition);
+                break;
+            }
+            H.length > 0 && O.push(...H);
+          } catch {
+          }
+        }
+        let P, c;
+        U ? (P = C`${C.identifier(U)}`, c = this.buildCTEJoinCondition(n, U, E)) : (P = n.cube.sql(A).from, c = n.joinCondition);
         try {
           switch (n.joinType || "left") {
             case "left":
-              I = I.leftJoin(P, l);
+              I = I.leftJoin(P, c);
               break;
             case "inner":
-              I = I.innerJoin(P, l);
+              I = I.innerJoin(P, c);
               break;
             case "right":
-              I = I.rightJoin(P, l);
+              I = I.rightJoin(P, c);
               break;
             case "full":
-              I = I.fullJoin(P, l);
+              I = I.fullJoin(P, c);
               break;
           }
         } catch {
         }
       }
-    const O = [];
     if (N.where && O.push(N.where), E.joinCubes && E.joinCubes.length > 0)
       for (const n of E.joinCubes) {
         if (S.get(n.cube.name))
@@ -2170,7 +2256,7 @@ class UE {
       // Pass the queryPlan to handle CTE scenarios
     );
     if (s.length > 0 && O.push(...s), O.length > 0) {
-      const n = O.length === 1 ? O[0] : f(...O);
+      const n = O.length === 1 ? O[0] : h(...O);
       I = I.where(n);
     }
     const L = this.queryBuilder.buildGroupByFields(
@@ -2191,7 +2277,7 @@ class UE {
       // Pass the queryPlan to handle CTE scenarios
     );
     if (a.length > 0) {
-      const n = a.length === 1 ? a[0] : f(...a);
+      const n = a.length === 1 ? a[0] : h(...a);
       I = I.having(n);
     }
     const o = this.queryBuilder.buildOrderBy(R);
@@ -2241,36 +2327,36 @@ class UE {
     const A = {}, e = {}, S = {}, N = [E.primaryCube];
     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 s = O.measures[I];
+        const [r, O] = t.split("."), I = N.find((s) => s.name === r);
+        if (I && I.measures[O]) {
+          const s = I.measures[O];
           A[t] = {
-            title: s.title || I,
-            shortTitle: s.title || I,
+            title: s.title || O,
+            shortTitle: s.title || O,
             type: s.type
           };
         }
       }
     if (R.dimensions)
       for (const t of R.dimensions) {
-        const [r, I] = t.split("."), O = N.find((s) => s.name === r);
-        if (O && O.dimensions[I]) {
-          const s = O.dimensions[I];
+        const [r, O] = t.split("."), I = N.find((s) => s.name === r);
+        if (I && I.dimensions[O]) {
+          const s = I.dimensions[O];
           e[t] = {
-            title: s.title || I,
-            shortTitle: s.title || I,
+            title: s.title || O,
+            shortTitle: s.title || O,
             type: s.type
           };
         }
       }
     if (R.timeDimensions)
       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 s = O.dimensions[I];
+        const [r, O] = t.dimension.split("."), I = N.find((s) => s.name === r);
+        if (I && I.dimensions && I.dimensions[O]) {
+          const s = I.dimensions[O];
           S[t.dimension] = {
-            title: s.title || I,
-            shortTitle: s.title || I,
+            title: s.title || O,
+            shortTitle: s.title || O,
             type: s.type,
             granularity: t.granularity
           };
@@ -2284,13 +2370,13 @@ class UE {
     };
   }
 }
-const _ = (T) => T.flatMap(dR), dR = (T) => RE(fR(T)).map(hR), hR = (T) => T.replace(/ +/g, " ").trim(), fR = (T) => ({
+const _ = (T) => T.flatMap(hR), hR = (T) => AE(VR(T)).map(fR), fR = (T) => T.replace(/ +/g, " ").trim(), VR = (T) => ({
   type: "mandatory_block",
   items: jE(T, 0)[0]
 }), jE = (T, E, R) => {
   const A = [];
   for (; T[E]; ) {
-    const [e, S] = VR(T, E);
+    const [e, S] = WR(T, E);
     if (A.push(e), E = S, T[E] === "|")
       E++;
     else if (T[E] === "}" || T[E] === "]") {
@@ -2305,44 +2391,44 @@ const _ = (T) => T.flatMap(dR), dR = (T) => RE(fR(T)).map(hR), hR = (T) => T.rep
       throw new Error(`Unexpected "${T[E]}"`);
   }
   return [A, E];
-}, VR = (T, E) => {
+}, WR = (T, E) => {
   const R = [];
   for (; ; ) {
-    const [A, e] = WR(T, E);
+    const [A, e] = XR(T, E);
     if (A)
       R.push(A), E = e;
     else
       break;
   }
   return R.length === 1 ? [R[0], E] : [{ type: "concatenation", items: R }, E];
-}, WR = (T, E) => {
+}, XR = (T, E) => {
   if (T[E] === "{")
-    return XR(T, E + 1);
-  if (T[E] === "[")
     return bR(T, E + 1);
+  if (T[E] === "[")
+    return yR(T, E + 1);
   {
     let R = "";
     for (; T[E] && /[A-Za-z0-9_ ]/.test(T[E]); )
       R += T[E], E++;
     return [R, E];
   }
-}, XR = (T, E) => {
+}, bR = (T, E) => {
   const [R, A] = jE(T, E, "}");
   return [{ type: "mandatory_block", items: R }, A];
-}, bR = (T, E) => {
+}, yR = (T, E) => {
   const [R, A] = jE(T, E, "]");
   return [{ type: "optional_block", items: R }, A];
-}, RE = (T) => {
+}, AE = (T) => {
   if (typeof T == "string")
     return [T];
   if (T.type === "concatenation")
-    return T.items.map(RE).reduce(yR, [""]);
+    return T.items.map(AE).reduce(KR, [""]);
   if (T.type === "mandatory_block")
-    return T.items.flatMap(RE);
+    return T.items.flatMap(AE);
   if (T.type === "optional_block")
-    return ["", ...T.items.flatMap(RE)];
+    return ["", ...T.items.flatMap(AE)];
   throw new Error(`Unknown node type: ${T}`);
-}, yR = (T, E) => {
+}, KR = (T, E) => {
   const R = [];
   for (const A of T)
     for (const e of E)
@@ -2353,19 +2439,19 @@ var D;
 (function(T) {
   T.QUOTED_IDENTIFIER = "QUOTED_IDENTIFIER", T.IDENTIFIER = "IDENTIFIER", T.STRING = "STRING", T.VARIABLE = "VARIABLE", T.RESERVED_DATA_TYPE = "RESERVED_DATA_TYPE", T.RESERVED_PARAMETERIZED_DATA_TYPE = "RESERVED_PARAMETERIZED_DATA_TYPE", T.RESERVED_KEYWORD = "RESERVED_KEYWORD", T.RESERVED_FUNCTION_NAME = "RESERVED_FUNCTION_NAME", T.RESERVED_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) => ({
+const jT = (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, w = {
+}), k = jT(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_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 = [
+}, kT = (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, $R = (T) => T === D.AND || T === D.OR || T === D.XOR, gR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -2909,7 +2995,7 @@ const qT = (T) => ({
   // pivot
   "PIVOT",
   "UNPIVOT"
-], gR = [
+], wR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/lexical#reserved_keywords
   "ALL",
   "AND",
@@ -3017,7 +3103,7 @@ const qT = (T) => ({
   "CASCADE",
   "RESTRICT",
   "DETERMINISTIC"
-], wR = [
+], JR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types
   "ARRAY",
   "BOOL",
@@ -3042,7 +3128,7 @@ const qT = (T) => ({
   "STRUCT",
   "TIME",
   "TIMEZONE"
-], JR = _(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), xR = _([
+], xR = _(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), vR = _([
   // Queries: https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax
   "WITH [RECURSIVE]",
   "FROM",
@@ -3161,15 +3247,15 @@ const qT = (T) => ({
   "ASSERT",
   // Other, https://cloud.google.com/bigquery/docs/reference/standard-sql/other-statements
   "EXPORT DATA"
-]), vR = _([
+]), QR = _([
   "UNION {ALL | DISTINCT}",
   "EXCEPT DISTINCT",
   "INTERSECT DISTINCT"
-]), QR = _([
+]), ZR = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), ZR = _([
+]), qR = _([
   // 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,18 +3266,18 @@ const qT = (T) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), qR = _([]), jR = {
+]), jR = _([]), kR = {
   name: "bigquery",
   tokenizerOptions: {
-    reservedSelect: JR,
-    reservedClauses: [...xR, ...GE, ...CT],
-    reservedSetOperations: vR,
-    reservedJoins: QR,
-    reservedKeywordPhrases: ZR,
-    reservedDataTypePhrases: qR,
-    reservedKeywords: gR,
-    reservedDataTypes: wR,
-    reservedFunctionNames: $R,
+    reservedSelect: xR,
+    reservedClauses: [...vR, ...GE, ...CT],
+    reservedSetOperations: QR,
+    reservedJoins: ZR,
+    reservedKeywordPhrases: qR,
+    reservedDataTypePhrases: jR,
+    reservedKeywords: wR,
+    reservedDataTypes: JR,
+    reservedFunctionNames: gR,
     extraParens: ["[]"],
     stringTypes: [
       // The triple-quoted strings are listed first, so they get matched first.
@@ -3209,27 +3295,27 @@ const qT = (T) => ({
     variableTypes: [{ regex: String.raw`@@\w+` }],
     lineCommentTypes: ["--", "#"],
     operators: ["&", "|", "^", "~", ">>", "<<", "||", "=>"],
-    postProcess: kR
+    postProcess: zR
   },
   formatOptions: {
     onelineClauses: [...CT, ...GE],
     tabularOnelineClauses: GE
   }
 };
-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));
+  return EA(TA(T));
 }
 function EA(T) {
+  let E = k;
+  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 TA(T) {
   var E;
   const R = [];
   for (let A = 0; A < T.length; A++) {
     const e = T[A];
     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);
+      const S = RA(T, A + 1), N = T.slice(A, S + 1);
       R.push({
         type: D.IDENTIFIER,
         raw: N.map(LT("raw")).join(""),
@@ -3242,7 +3328,7 @@ function EA(T) {
   return R;
 }
 const LT = (T) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[T] + " " : E[T];
-function TA(T, E) {
+function RA(T, E) {
   let R = 0;
   for (let A = E; A < T.length; A++) {
     const e = T[A];
@@ -3251,7 +3337,7 @@ function TA(T, E) {
   }
   return T.length - 1;
 }
-const RA = [
+const AA = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=bif-aggregate-functions
   "ARRAY_AGG",
   "AVG",
@@ -3571,7 +3657,7 @@ const RA = [
   "RATIO_TO_REPORT",
   // Type casting
   "CAST"
-], AA = [
+], eA = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=sql-reserved-schema-names-reserved-words
   "ACTIVATE",
   "ADD",
@@ -3972,7 +4058,7 @@ const RA = [
   "XMLNAMESPACES",
   "YEAR",
   "YEARS"
-], eA = [
+], SA = [
   // https://www.ibm.com/docs/en/db2-for-zos/12?topic=columns-data-types
   "ARRAY",
   "BIGINT",
@@ -4014,7 +4100,7 @@ const RA = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], SA = _(["SELECT [ALL | DISTINCT]"]), IA = _([
+], IA = _(["SELECT [ALL | DISTINCT]"]), OA = _([
   // queries
   "WITH",
   "FROM",
@@ -4248,27 +4334,27 @@ const RA = [
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}",
   "WHILE"
-]), OA = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), NA = _([
+]), NA = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), sA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), sA = _([
+]), tA = _([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), tA = _([]), CA = {
+]), CA = _([]), LA = {
   name: "db2",
   tokenizerOptions: {
-    reservedSelect: SA,
-    reservedClauses: [...IA, ..._T, ...lE],
-    reservedSetOperations: OA,
-    reservedJoins: NA,
-    reservedKeywordPhrases: sA,
-    reservedDataTypePhrases: tA,
-    reservedKeywords: AA,
-    reservedDataTypes: eA,
-    reservedFunctionNames: RA,
+    reservedSelect: IA,
+    reservedClauses: [...OA, ..._T, ...lE],
+    reservedSetOperations: NA,
+    reservedJoins: sA,
+    reservedKeywordPhrases: tA,
+    reservedDataTypePhrases: CA,
+    reservedKeywords: eA,
+    reservedDataTypes: SA,
+    reservedFunctionNames: AA,
     extraParens: ["[]"],
     stringTypes: [
       { quote: "''-qq", prefixes: ["G", "N", "U&"] },
@@ -4302,7 +4388,7 @@ const RA = [
     onelineClauses: [..._T, ...lE],
     tabularOnelineClauses: lE
   }
-}, LA = [
+}, _A = [
   // 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",
@@ -4636,7 +4722,7 @@ const RA = [
   "ROW_NUMBER",
   // Type casting
   "CAST"
-], _A = [
+], rA = [
   // 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.
@@ -5132,7 +5218,7 @@ const RA = [
   "YEARS",
   "YES",
   "ZONE"
-], rA = [
+], nA = [
   // https://www.ibm.com/docs/en/i/7.2?topic=iaodsd-odbc-data-types-how-they-correspond-db2-i-database-types
   "ARRAY",
   "BIGINT",
@@ -5168,7 +5254,7 @@ const RA = [
   "VARCHAR",
   "VARGRAPHIC",
   "XML"
-], nA = _(["SELECT [ALL | DISTINCT]"]), iA = _([
+], iA = _(["SELECT [ALL | DISTINCT]"]), DA = _([
   // queries
   "WITH [RECURSIVE]",
   "INTO",
@@ -5294,28 +5380,28 @@ const RA = [
   "TAG",
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}"
-]), DA = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), aA = _([
+]), aA = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), oA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "[LEFT | RIGHT] EXCEPTION JOIN",
   "{INNER | CROSS} JOIN"
-]), oA = _([
+]), PA = _([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), PA = _([]), MA = {
+]), MA = _([]), UA = {
   name: "db2i",
   tokenizerOptions: {
-    reservedSelect: nA,
-    reservedClauses: [...iA, ...rT, ...cE],
-    reservedSetOperations: DA,
-    reservedJoins: aA,
-    reservedKeywordPhrases: oA,
-    reservedDataTypePhrases: PA,
-    reservedKeywords: _A,
-    reservedDataTypes: rA,
-    reservedFunctionNames: LA,
+    reservedSelect: iA,
+    reservedClauses: [...DA, ...rT, ...cE],
+    reservedSetOperations: aA,
+    reservedJoins: oA,
+    reservedKeywordPhrases: PA,
+    reservedDataTypePhrases: MA,
+    reservedKeywords: rA,
+    reservedDataTypes: nA,
+    reservedFunctionNames: _A,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     stringTypes: [
@@ -5332,7 +5418,7 @@ const RA = [
     onelineClauses: [...rT, ...cE],
     tabularOnelineClauses: cE
   }
-}, UA = [
+}, GA = [
   // Functions from DuckDB (excluding those that start with an underscore):
   // SELECT DISTINCT upper(function_name) AS function_name
   // FROM duckdb_functions()
@@ -5995,7 +6081,7 @@ const RA = [
   // 'NULL', we really prefer treating it as keyword
   "RANK",
   "ROW_NUMBER"
-], GA = [
+], lA = [
   // Keywords from DuckDB:
   // SELECT upper(keyword_name)
   // FROM duckdb_keywords()
@@ -6077,7 +6163,7 @@ const RA = [
   "WHERE",
   "WINDOW",
   "WITH"
-], lA = [
+], cA = [
   // Types from DuckDB:
   // SELECT DISTINCT upper(type_name)
   // FROM duckdb_types()
@@ -6157,7 +6243,7 @@ const RA = [
   "UUID",
   "VARBINARY",
   "VARCHAR"
-], cA = _(["SELECT [ALL | DISTINCT]"]), uA = _([
+], uA = _(["SELECT [ALL | DISTINCT]"]), HA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -6261,11 +6347,11 @@ const RA = [
   "PREPARE",
   "EXECUTE",
   "DEALLOCATE [PREPARE]"
-]), HA = _([
+]), BA = _([
   "UNION [ALL | BY NAME]",
   "EXCEPT [ALL]",
   "INTERSECT [ALL]"
-]), BA = _([
+]), mA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -6274,23 +6360,23 @@ const RA = [
   "POSITIONAL JOIN",
   "ANTI JOIN",
   "SEMI JOIN"
-]), mA = _([
+]), FA = _([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "SIMILAR TO",
   "IS [NOT] DISTINCT FROM"
-]), FA = _(["TIMESTAMP WITH TIME ZONE"]), YA = {
+]), YA = _(["TIMESTAMP WITH TIME ZONE"]), pA = {
   name: "duckdb",
   tokenizerOptions: {
-    reservedSelect: cA,
-    reservedClauses: [...uA, ...nT, ...uE],
-    reservedSetOperations: HA,
-    reservedJoins: BA,
-    reservedKeywordPhrases: mA,
-    reservedDataTypePhrases: FA,
+    reservedSelect: uA,
+    reservedClauses: [...HA, ...nT, ...uE],
+    reservedSetOperations: BA,
+    reservedJoins: mA,
+    reservedKeywordPhrases: FA,
+    reservedDataTypePhrases: YA,
     supportsXor: !0,
-    reservedKeywords: GA,
-    reservedDataTypes: lA,
-    reservedFunctionNames: UA,
+    reservedKeywords: lA,
+    reservedDataTypes: cA,
+    reservedFunctionNames: GA,
     nestedBlockComments: !0,
     extraParens: ["[]", "{}"],
     underscoresInNumbers: !0,
@@ -6354,7 +6440,7 @@ const RA = [
     onelineClauses: [...nT, ...uE],
     tabularOnelineClauses: uE
   }
-}, pA = [
+}, dA = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+UDF
   // math
   "ABS",
@@ -6562,7 +6648,7 @@ const RA = [
   "CUME_DIST",
   "PERCENT_RANK",
   "NTILE"
-], dA = [
+], hA = [
   // 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",
@@ -6877,7 +6963,7 @@ const RA = [
   "JSONFILE",
   "INPUTFORMAT",
   "OUTPUTFORMAT"
-], hA = [
+], fA = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Types
   "ARRAY",
   "BIGINT",
@@ -6898,7 +6984,7 @@ const RA = [
   "STRUCT",
   "TIMESTAMP",
   "VARCHAR"
-], fA = _(["SELECT [ALL | DISTINCT]"]), VA = _([
+], VA = _(["SELECT [ALL | DISTINCT]"]), WA = _([
   // queries
   "WITH",
   "FROM",
@@ -6959,24 +7045,24 @@ const RA = [
   "STORED AS",
   "STORED BY",
   "ROW FORMAT"
-]), WA = _(["UNION [ALL | DISTINCT]"]), XA = _([
+]), XA = _(["UNION [ALL | DISTINCT]"]), bA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "LEFT SEMI JOIN"
-]), bA = _(["{ROWS | RANGE} BETWEEN"]), yA = _([]), KA = {
+]), yA = _(["{ROWS | RANGE} BETWEEN"]), KA = _([]), $A = {
   name: "hive",
   tokenizerOptions: {
-    reservedSelect: fA,
-    reservedClauses: [...VA, ...iT, ...HE],
-    reservedSetOperations: WA,
-    reservedJoins: XA,
-    reservedKeywordPhrases: bA,
-    reservedDataTypePhrases: yA,
-    reservedKeywords: dA,
-    reservedDataTypes: hA,
-    reservedFunctionNames: pA,
+    reservedSelect: VA,
+    reservedClauses: [...WA, ...iT, ...HE],
+    reservedSetOperations: XA,
+    reservedJoins: bA,
+    reservedKeywordPhrases: yA,
+    reservedDataTypePhrases: KA,
+    reservedKeywords: hA,
+    reservedDataTypes: fA,
+    reservedFunctionNames: dA,
     extraParens: ["[]"],
     stringTypes: ['""-bs', "''-bs"],
     identTypes: ["``"],
@@ -6990,14 +7076,14 @@ const RA = [
 };
 function CE(T) {
   return T.map((E, R) => {
-    const A = T[R + 1] || j;
+    const A = T[R + 1] || k;
     if (w.SET(E) && A.text === "(")
       return Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME });
-    const e = T[R - 1] || j;
+    const e = T[R - 1] || k;
     return w.VALUES(E) && e.text === "=" ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E;
   });
 }
-const $A = [
+const gA = [
   // https://mariadb.com/kb/en/reserved-words/
   "ACCESSIBLE",
   "ADD",
@@ -7214,7 +7300,7 @@ const $A = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], gA = [
+], wA = [
   // https://mariadb.com/kb/en/data-types/
   "BIGINT",
   "BINARY",
@@ -7265,7 +7351,7 @@ const $A = [
   "YEAR"
   // 'NUMBER', // ?? In oracle mode only
   // 'SET' // handled as special-case in postProcess
-], wA = [
+], JA = [
   // https://mariadb.com/kb/en/information-schema-sql_functions-table/
   "ADDDATE",
   "ADD_MONTHS",
@@ -7503,7 +7589,7 @@ const $A = [
   // CASE expression shorthands
   "COALESCE",
   "NULLIF"
-], JA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), xA = _([
+], xA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), vA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -7734,12 +7820,12 @@ const $A = [
   "XA RECOVER",
   "XA ROLLBACK",
   "XA START"
-]), vA = _([
+]), QA = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]",
   "MINUS [ALL | DISTINCT]"
-]), QA = _([
+]), ZA = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -7747,24 +7833,24 @@ const $A = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), ZA = _([
+]), qA = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), qA = _([]), jA = {
+]), jA = _([]), kA = {
   name: "mariadb",
   tokenizerOptions: {
-    reservedSelect: JA,
-    reservedClauses: [...xA, ...DT, ...BE],
-    reservedSetOperations: vA,
-    reservedJoins: QA,
-    reservedKeywordPhrases: ZA,
-    reservedDataTypePhrases: qA,
+    reservedSelect: xA,
+    reservedClauses: [...vA, ...DT, ...BE],
+    reservedSetOperations: QA,
+    reservedJoins: ZA,
+    reservedKeywordPhrases: qA,
+    reservedDataTypePhrases: jA,
     supportsXor: !0,
-    reservedKeywords: $A,
-    reservedDataTypes: gA,
-    reservedFunctionNames: wA,
+    reservedKeywords: gA,
+    reservedDataTypes: wA,
+    reservedFunctionNames: JA,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -7803,7 +7889,7 @@ const $A = [
     onelineClauses: [...DT, ...BE],
     tabularOnelineClauses: BE
   }
-}, kA = [
+}, zA = [
   // https://dev.mysql.com/doc/refman/8.0/en/keywords.html
   "ACCESSIBLE",
   "ADD",
@@ -8034,7 +8120,7 @@ const $A = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], zA = [
+], Ee = [
   // https://dev.mysql.com/doc/refman/8.0/en/data-types.html
   "BIGINT",
   "BINARY",
@@ -8086,7 +8172,7 @@ const $A = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], Ee = [
+], Te = [
   // https://dev.mysql.com/doc/refman/8.0/en/built-in-function-reference.html
   "ABS",
   "ACOS",
@@ -8509,7 +8595,7 @@ const $A = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], Te = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), Re = _([
+], Re = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), Ae = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8710,7 +8796,7 @@ const $A = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), Ae = _(["UNION [ALL | DISTINCT]"]), ee = _([
+]), ee = _(["UNION [ALL | DISTINCT]"]), Se = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8718,24 +8804,24 @@ const $A = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), Se = _([
+]), Ie = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), Ie = _([]), Oe = {
+]), Oe = _([]), Ne = {
   name: "mysql",
   tokenizerOptions: {
-    reservedSelect: Te,
-    reservedClauses: [...Re, ...aT, ...mE],
-    reservedSetOperations: Ae,
-    reservedJoins: ee,
-    reservedKeywordPhrases: Se,
-    reservedDataTypePhrases: Ie,
+    reservedSelect: Re,
+    reservedClauses: [...Ae, ...aT, ...mE],
+    reservedSetOperations: ee,
+    reservedJoins: Se,
+    reservedKeywordPhrases: Ie,
+    reservedDataTypePhrases: Oe,
     supportsXor: !0,
-    reservedKeywords: kA,
-    reservedDataTypes: zA,
-    reservedFunctionNames: Ee,
+    reservedKeywords: zA,
+    reservedDataTypes: Ee,
+    reservedFunctionNames: Te,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -8776,7 +8862,7 @@ const $A = [
     onelineClauses: [...aT, ...mE],
     tabularOnelineClauses: mE
   }
-}, Ne = [
+}, se = [
   // https://docs.pingcap.com/tidb/stable/keywords
   "ADD",
   "ALL",
@@ -8968,7 +9054,7 @@ const $A = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], se = [
+], te = [
   // https://docs.pingcap.com/tidb/stable/data-type-overview
   "BIGINT",
   "BINARY",
@@ -9015,7 +9101,7 @@ const $A = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], te = [
+], Ce = [
   // 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
@@ -9341,7 +9427,7 @@ const $A = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], Ce = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), Le = _([
+], Le = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), _e = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -9476,7 +9562,7 @@ const $A = [
   "UNLOCK TABLES",
   // https://docs.pingcap.com/tidb/stable/sql-statement-use
   "USE"
-]), _e = _(["UNION [ALL | DISTINCT]"]), re = _([
+]), re = _(["UNION [ALL | DISTINCT]"]), ne = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -9484,24 +9570,24 @@ const $A = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), ne = _([
+]), ie = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), ie = _([]), De = {
+]), De = _([]), ae = {
   name: "tidb",
   tokenizerOptions: {
-    reservedSelect: Ce,
-    reservedClauses: [...Le, ...oT, ...FE],
-    reservedSetOperations: _e,
-    reservedJoins: re,
-    reservedKeywordPhrases: ne,
-    reservedDataTypePhrases: ie,
+    reservedSelect: Le,
+    reservedClauses: [..._e, ...oT, ...FE],
+    reservedSetOperations: re,
+    reservedJoins: ne,
+    reservedKeywordPhrases: ie,
+    reservedDataTypePhrases: De,
     supportsXor: !0,
-    reservedKeywords: Ne,
-    reservedDataTypes: se,
-    reservedFunctionNames: te,
+    reservedKeywords: se,
+    reservedDataTypes: te,
+    reservedFunctionNames: Ce,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -9542,7 +9628,7 @@ const $A = [
     onelineClauses: [...oT, ...FE],
     tabularOnelineClauses: FE
   }
-}, ae = [
+}, oe = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/functions.html
   "ABORT",
   "ABS",
@@ -9772,7 +9858,7 @@ const $A = [
   // 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"
-], oe = [
+], Pe = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/reservedwords.html
   "ADVISE",
   "ALL",
@@ -9978,7 +10064,7 @@ const $A = [
   "WITHIN",
   "WORK",
   "XOR"
-], Pe = [
+], Me = [
   // N1QL does not support any way of declaring types for columns.
   // It does not support the CREATE TABLE statement nor the CAST() expression.
   //
@@ -9987,7 +10073,7 @@ const $A = [
   // which it actually doesn't use.
   //
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/datatypes.html
-], Me = _(["SELECT [ALL | DISTINCT]"]), Ue = _([
+], Ue = _(["SELECT [ALL | DISTINCT]"]), Ge = _([
   // queries
   "WITH",
   "FROM",
@@ -10054,19 +10140,19 @@ const $A = [
   "SET CURRENT SCHEMA",
   "SHOW",
   "USE [PRIMARY] KEYS"
-]), Ge = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), le = _(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), ce = _(["{ROWS | RANGE | GROUPS} BETWEEN"]), ue = _([]), He = {
+]), le = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), ce = _(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), ue = _(["{ROWS | RANGE | GROUPS} BETWEEN"]), He = _([]), Be = {
   name: "n1ql",
   tokenizerOptions: {
-    reservedSelect: Me,
-    reservedClauses: [...Ue, ...PT],
-    reservedSetOperations: Ge,
-    reservedJoins: le,
-    reservedKeywordPhrases: ce,
-    reservedDataTypePhrases: ue,
+    reservedSelect: Ue,
+    reservedClauses: [...Ge, ...PT],
+    reservedSetOperations: le,
+    reservedJoins: ce,
+    reservedKeywordPhrases: ue,
+    reservedDataTypePhrases: He,
     supportsXor: !0,
-    reservedKeywords: oe,
-    reservedDataTypes: Pe,
-    reservedFunctionNames: ae,
+    reservedKeywords: Pe,
+    reservedDataTypes: Me,
+    reservedFunctionNames: oe,
     // 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.
@@ -10080,7 +10166,7 @@ const $A = [
   formatOptions: {
     onelineClauses: PT
   }
-}, Be = [
+}, me = [
   // https://docs.oracle.com/cd/B19306_01/appdev.102/b14261/reservewords.htm
   // 'A',
   "ADD",
@@ -10385,7 +10471,7 @@ const $A = [
   "WRITE",
   "YEAR",
   "ZONE"
-], me = [
+], Fe = [
   // https://www.ibm.com/docs/en/db2/10.5?topic=plsql-data-types
   "ARRAY",
   "BFILE_BASE",
@@ -10423,7 +10509,7 @@ const $A = [
   "UROWID",
   "VARCHAR",
   "VARCHAR2"
-], Fe = [
+], Ye = [
   // https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions001.htm
   // numeric
   "ABS",
@@ -10688,7 +10774,7 @@ const $A = [
   "PRESENTNNV",
   "PRESENTV",
   "PREVIOUS"
-], Ye = _(["SELECT [ALL | DISTINCT | UNIQUE]"]), pe = _([
+], pe = _(["SELECT [ALL | DISTINCT | UNIQUE]"]), de = _([
   // queries
   "WITH",
   "FROM",
@@ -10742,7 +10828,7 @@ const $A = [
   "EXCEPTION",
   "LOOP",
   "START WITH"
-]), de = _(["UNION [ALL]", "MINUS", "INTERSECT"]), he = _([
+]), he = _(["UNION [ALL]", "MINUS", "INTERSECT"]), fe = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -10750,23 +10836,23 @@ const $A = [
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), fe = _([
+]), Ve = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "ON COMMIT",
   "{ROWS | RANGE} BETWEEN"
-]), Ve = _([]), We = {
+]), We = _([]), Xe = {
   name: "plsql",
   tokenizerOptions: {
-    reservedSelect: Ye,
-    reservedClauses: [...pe, ...MT, ...YE],
-    reservedSetOperations: de,
-    reservedJoins: he,
-    reservedKeywordPhrases: fe,
-    reservedDataTypePhrases: Ve,
+    reservedSelect: pe,
+    reservedClauses: [...de, ...MT, ...YE],
+    reservedSetOperations: he,
+    reservedJoins: fe,
+    reservedKeywordPhrases: Ve,
+    reservedDataTypePhrases: We,
     supportsXor: !0,
-    reservedKeywords: Be,
-    reservedDataTypes: me,
-    reservedFunctionNames: Fe,
+    reservedKeywords: me,
+    reservedDataTypes: Fe,
+    reservedFunctionNames: Ye,
     stringTypes: [
       { quote: "''-qq", prefixes: ["N"] },
       { quote: "q''", prefixes: ["N"] }
@@ -10791,7 +10877,7 @@ const $A = [
       "@",
       "||"
     ],
-    postProcess: Xe
+    postProcess: be
   },
   formatOptions: {
     alwaysDenseOperators: ["@"],
@@ -10799,11 +10885,11 @@ const $A = [
     tabularOnelineClauses: YE
   }
 };
-function Xe(T) {
-  let E = j;
-  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));
+function be(T) {
+  let E = k;
+  return T.map((R) => w.SET(R) && w.BY(E) ? Object.assign(Object.assign({}, R), { type: D.RESERVED_KEYWORD }) : (kT(R.type) && (E = R), R));
 }
-const be = [
+const ye = [
   // https://www.postgresql.org/docs/14/functions.html
   //
   // https://www.postgresql.org/docs/14/functions-math.html
@@ -11487,7 +11573,7 @@ const be = [
   "PG_MCV_LIST_ITEMS",
   // cast
   "CAST"
-], ye = [
+], Ke = [
   // https://www.postgresql.org/docs/14/sql-keywords-appendix.html
   "ALL",
   "ANALYSE",
@@ -11606,7 +11692,7 @@ const be = [
   "WITHOUT",
   "YEAR"
   // requires AS
-], Ke = [
+], $e = [
   // https://www.postgresql.org/docs/current/datatype.html
   "ARRAY",
   "BIGINT",
@@ -11640,7 +11726,7 @@ const be = [
   "VARCHAR",
   "XML",
   "ZONE"
-], $e = _(["SELECT [ALL | DISTINCT]"]), ge = _([
+], ge = _(["SELECT [ALL | DISTINCT]"]), we = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -11863,17 +11949,17 @@ const be = [
   "START TRANSACTION",
   "UNLISTEN",
   "VACUUM"
-]), we = _([
+]), Je = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), Je = _([
+]), xe = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), xe = _([
+]), ve = _([
   "PRIMARY KEY",
   "GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY",
   "ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]",
@@ -11884,21 +11970,21 @@ const be = [
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), ve = _([
+]), Qe = _([
   // https://www.postgresql.org/docs/current/datatype-datetime.html
   "[TIMESTAMP | TIME] {WITH | WITHOUT} TIME ZONE"
-]), Qe = {
+]), Ze = {
   name: "postgresql",
   tokenizerOptions: {
-    reservedSelect: $e,
-    reservedClauses: [...ge, ...UT, ...pE],
-    reservedSetOperations: we,
-    reservedJoins: Je,
-    reservedKeywordPhrases: xe,
-    reservedDataTypePhrases: ve,
-    reservedKeywords: ye,
-    reservedDataTypes: Ke,
-    reservedFunctionNames: be,
+    reservedSelect: ge,
+    reservedClauses: [...we, ...UT, ...pE],
+    reservedSetOperations: Je,
+    reservedJoins: xe,
+    reservedKeywordPhrases: ve,
+    reservedDataTypePhrases: Qe,
+    reservedKeywords: Ke,
+    reservedDataTypes: $e,
+    reservedFunctionNames: ye,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     underscoresInNumbers: !0,
@@ -12013,7 +12099,7 @@ const be = [
     onelineClauses: [...UT, ...pE],
     tabularOnelineClauses: pE
   }
-}, Ze = [
+}, qe = [
   // https://docs.aws.amazon.com/redshift/latest/dg/c_Aggregate_Functions.html
   "ANY_VALUE",
   "APPROXIMATE PERCENTILE_DISC",
@@ -12359,7 +12445,7 @@ const be = [
   "SLICE_NUM",
   "USER",
   "VERSION"
-], qe = [
+], je = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_pg_keywords.html
   "AES128",
   "AES256",
@@ -12548,7 +12634,7 @@ const be = [
    * SVL: https://docs.aws.amazon.com/redshift/latest/dg/svl_views.html
    * SVV: https://docs.aws.amazon.com/redshift/latest/dg/svv_views.html
    */
-], je = [
+], ke = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_Character_types.html#r_Character_types-text-and-bpchar-types
   "ARRAY",
   "BIGINT",
@@ -12569,7 +12655,7 @@ const be = [
   "TEXT",
   "VARBYTE",
   "VARCHAR"
-], ke = _(["SELECT [ALL | DISTINCT]"]), ze = _([
+], ze = _(["SELECT [ALL | DISTINCT]"]), ES = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -12680,13 +12766,13 @@ const be = [
   "START TRANSACTION",
   "UNLOAD",
   "VACUUM"
-]), ES = _(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), TS = _([
+]), TS = _(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), RS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), RS = _([
+]), AS = _([
   // 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
@@ -12694,18 +12780,18 @@ const be = [
   "HIVE METASTORE",
   // in window specifications
   "{ROWS | RANGE} BETWEEN"
-]), AS = _([]), eS = {
+]), eS = _([]), SS = {
   name: "redshift",
   tokenizerOptions: {
-    reservedSelect: ke,
-    reservedClauses: [...ze, ...GT, ...dE],
-    reservedSetOperations: ES,
-    reservedJoins: TS,
-    reservedKeywordPhrases: RS,
-    reservedDataTypePhrases: AS,
-    reservedKeywords: qe,
-    reservedDataTypes: je,
-    reservedFunctionNames: Ze,
+    reservedSelect: ze,
+    reservedClauses: [...ES, ...GT, ...dE],
+    reservedSetOperations: TS,
+    reservedJoins: RS,
+    reservedKeywordPhrases: AS,
+    reservedDataTypePhrases: eS,
+    reservedKeywords: je,
+    reservedDataTypes: ke,
+    reservedFunctionNames: qe,
     extraParens: ["[]"],
     stringTypes: ["''-qq"],
     identTypes: ['""-qq'],
@@ -12732,7 +12818,7 @@ const be = [
     onelineClauses: [...GT, ...dE],
     tabularOnelineClauses: dE
   }
-}, SS = [
+}, IS = [
   // https://deepkb.com/CO_000013/en/kb/IMPORT-fbfa59f0-2bf1-31fe-bb7b-0f9efe9932c6/spark-sql-keywords
   "ADD",
   "AFTER",
@@ -12999,7 +13085,7 @@ const be = [
   "UNSIGNED",
   "VARIABLES",
   "YEAR_MONTH"
-], IS = [
+], OS = [
   // https://spark.apache.org/docs/latest/sql-ref-datatypes.html
   "ARRAY",
   "BIGINT",
@@ -13029,7 +13115,7 @@ const be = [
   "TINYINT",
   "VARCHAR"
   // No varchar type in Spark, only STRING. Added for the sake of tests
-], OS = [
+], NS = [
   // http://spark.apache.org/docs/latest/sql-ref-functions.html
   //
   // http://spark.apache.org/docs/latest/sql-ref-functions-builtin.html#aggregate-functions
@@ -13350,7 +13436,7 @@ const be = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], NS = _(["SELECT [ALL | DISTINCT]"]), sS = _([
+], sS = _(["SELECT [ALL | DISTINCT]"]), tS = _([
   // queries
   "WITH",
   "FROM",
@@ -13431,11 +13517,11 @@ const be = [
   "SHOW TBLPROPERTIES",
   "SHOW VIEWS",
   "UNCACHE TABLE"
-]), tS = _([
+]), CS = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), CS = _([
+]), LS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -13444,24 +13530,24 @@ const be = [
   // non-standard-joins
   "[LEFT] {ANTI | SEMI} JOIN",
   "NATURAL [LEFT] {ANTI | SEMI} JOIN"
-]), LS = _([
+]), _S = _([
   "ON DELETE",
   "ON UPDATE",
   "CURRENT ROW",
   "{ROWS | RANGE} BETWEEN"
-]), _S = _([]), rS = {
+]), rS = _([]), nS = {
   name: "spark",
   tokenizerOptions: {
-    reservedSelect: NS,
-    reservedClauses: [...sS, ...lT, ...hE],
-    reservedSetOperations: tS,
-    reservedJoins: CS,
-    reservedKeywordPhrases: LS,
-    reservedDataTypePhrases: _S,
+    reservedSelect: sS,
+    reservedClauses: [...tS, ...lT, ...hE],
+    reservedSetOperations: CS,
+    reservedJoins: LS,
+    reservedKeywordPhrases: _S,
+    reservedDataTypePhrases: rS,
     supportsXor: !0,
-    reservedKeywords: SS,
-    reservedDataTypes: IS,
-    reservedFunctionNames: OS,
+    reservedKeywords: IS,
+    reservedDataTypes: OS,
+    reservedFunctionNames: NS,
     extraParens: ["[]"],
     stringTypes: [
       "''-bs",
@@ -13473,20 +13559,20 @@ const be = [
     identChars: { allowFirstCharNumber: !0 },
     variableTypes: [{ quote: "{}", prefixes: ["$"], requirePrefix: !0 }],
     operators: ["%", "~", "^", "|", "&", "<=>", "==", "!", "||", "->"],
-    postProcess: nS
+    postProcess: iS
   },
   formatOptions: {
     onelineClauses: [...lT, ...hE],
     tabularOnelineClauses: hE
   }
 };
-function nS(T) {
+function iS(T) {
   return T.map((E, R) => {
-    const A = T[R - 1] || j, e = T[R + 1] || j;
+    const A = T[R - 1] || k, e = T[R + 1] || k;
     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 iS = [
+const DS = [
   // https://www.sqlite.org/lang_corefunc.html
   "ABS",
   "CHANGES",
@@ -13610,7 +13696,7 @@ const iS = [
   "JSON_TREE",
   // cast
   "CAST"
-], DS = [
+], aS = [
   // 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.
@@ -13763,7 +13849,7 @@ const iS = [
   "WINDOW",
   "WITH",
   "WITHOUT"
-], aS = [
+], oS = [
   // 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.
@@ -13784,7 +13870,7 @@ const iS = [
   "TEXT",
   "VARCHAR",
   "VARYING CHARACTER"
-], oS = _(["SELECT [ALL | DISTINCT]"]), PS = _([
+], PS = _(["SELECT [ALL | DISTINCT]"]), MS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -13824,28 +13910,28 @@ const iS = [
   "RENAME TO",
   // - set schema
   "SET SCHEMA"
-]), MS = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), US = _([
+]), US = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), GS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), GS = _([
+]), lS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "DO UPDATE"
-]), lS = _([]), cS = {
+]), cS = _([]), uS = {
   name: "sqlite",
   tokenizerOptions: {
-    reservedSelect: oS,
-    reservedClauses: [...PS, ...cT, ...fE],
-    reservedSetOperations: MS,
-    reservedJoins: US,
-    reservedKeywordPhrases: GS,
-    reservedDataTypePhrases: lS,
-    reservedKeywords: DS,
-    reservedDataTypes: aS,
-    reservedFunctionNames: iS,
+    reservedSelect: PS,
+    reservedClauses: [...MS, ...cT, ...fE],
+    reservedSetOperations: US,
+    reservedJoins: GS,
+    reservedKeywordPhrases: lS,
+    reservedDataTypePhrases: cS,
+    reservedKeywords: aS,
+    reservedDataTypes: oS,
+    reservedFunctionNames: DS,
     stringTypes: [
       "''-qq",
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -13861,7 +13947,7 @@ const iS = [
     onelineClauses: [...cT, ...fE],
     tabularOnelineClauses: fE
   }
-}, uS = [
+}, HS = [
   // 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
@@ -13958,7 +14044,7 @@ const iS = [
   "ASIN",
   "ACOS",
   "ATAN"
-], HS = [
+], BS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#reserved-word
   "ALL",
   "ALLOCATE",
@@ -14156,7 +14242,7 @@ const iS = [
   "WITHIN",
   "WITHOUT",
   "YEAR"
-], BS = [
+], mS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_1_data_type
   "ARRAY",
   "BIGINT",
@@ -14196,7 +14282,7 @@ const iS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], mS = _(["SELECT [ALL | DISTINCT]"]), FS = _([
+], FS = _(["SELECT [ALL | DISTINCT]"]), YS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14240,31 +14326,31 @@ const iS = [
   "TRUNCATE TABLE",
   // other
   "SET SCHEMA"
-]), YS = _([
+]), pS = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), pS = _([
+]), dS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), dS = _([
+]), hS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), hS = _([]), fS = {
+]), fS = _([]), VS = {
   name: "sql",
   tokenizerOptions: {
-    reservedSelect: mS,
-    reservedClauses: [...FS, ...uT, ...VE],
-    reservedSetOperations: YS,
-    reservedJoins: pS,
-    reservedKeywordPhrases: dS,
-    reservedDataTypePhrases: hS,
-    reservedKeywords: HS,
-    reservedDataTypes: BS,
-    reservedFunctionNames: uS,
+    reservedSelect: FS,
+    reservedClauses: [...YS, ...uT, ...VE],
+    reservedSetOperations: pS,
+    reservedJoins: dS,
+    reservedKeywordPhrases: hS,
+    reservedDataTypePhrases: fS,
+    reservedKeywords: BS,
+    reservedDataTypes: mS,
+    reservedFunctionNames: HS,
     stringTypes: [
       { quote: "''-qq-bs", prefixes: ["N", "U&"] },
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -14277,7 +14363,7 @@ const iS = [
     onelineClauses: [...uT, ...VE],
     tabularOnelineClauses: VE
   }
-}, VS = [
+}, WS = [
   // 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
@@ -14711,7 +14797,7 @@ const iS = [
   "NEXT",
   "PERMUTE",
   "PREV"
-], WS = [
+], XS = [
   // https://github.com/trinodb/trino/blob/432d2897bdef99388c1a47188743a061c4ac1f34/core/trino-parser/src/main/antlr4/io/trino/sql/parser/SqlBase.g4#L858-L1128
   "ABSENT",
   "ADD",
@@ -14948,7 +15034,7 @@ const iS = [
   "WRAPPER",
   "WRITE",
   "ZONE"
-], XS = [
+], bS = [
   // 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",
@@ -14987,7 +15073,7 @@ const iS = [
   "CODEPOINTS",
   "FUNCTION",
   "JSONPATH"
-], bS = _(["SELECT [ALL | DISTINCT]"]), yS = _([
+], yS = _(["SELECT [ALL | DISTINCT]"]), KS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -15073,32 +15159,32 @@ const iS = [
   "SHOW ROLE GRANTS",
   "SHOW FUNCTIONS",
   "SHOW SESSION"
-]), KS = _([
+]), $S = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), $S = _([
+]), gS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), gS = _([
+]), wS = _([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), wS = _([]), JS = {
+]), JS = _([]), xS = {
   name: "trino",
   tokenizerOptions: {
-    reservedSelect: bS,
-    reservedClauses: [...yS, ...HT, ...WE],
-    reservedSetOperations: KS,
-    reservedJoins: $S,
-    reservedKeywordPhrases: gS,
-    reservedDataTypePhrases: wS,
-    reservedKeywords: WS,
-    reservedDataTypes: XS,
-    reservedFunctionNames: VS,
+    reservedSelect: yS,
+    reservedClauses: [...KS, ...HT, ...WE],
+    reservedSetOperations: $S,
+    reservedJoins: gS,
+    reservedKeywordPhrases: wS,
+    reservedDataTypePhrases: JS,
+    reservedKeywords: XS,
+    reservedDataTypes: bS,
+    reservedFunctionNames: WS,
     // Trino also supports {- ... -} parenthesis.
     // The formatting of these currently works out as a result of { and -
     // not getting a space added in-between.
@@ -15130,7 +15216,7 @@ const iS = [
     onelineClauses: [...HT, ...WE],
     tabularOnelineClauses: WE
   }
-}, xS = [
+}, vS = [
   // https://docs.microsoft.com/en-us/sql/t-sql/functions/functions?view=sql-server-ver15
   // aggregate
   "APPROX_COUNT_DISTINCT",
@@ -15435,7 +15521,7 @@ const iS = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], vS = [
+], QS = [
   // https://docs.microsoft.com/en-us/sql/t-sql/language-elements/reserved-keywords-transact-sql?view=sql-server-ver15
   // standard
   "ADD",
@@ -15616,7 +15702,7 @@ const iS = [
   "WRITETEXT",
   // https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql?view=sql-server-ver16#action
   "$ACTION"
-], QS = [
+], ZS = [
   // https://learn.microsoft.com/en-us/sql/t-sql/data-types/data-types-transact-sql?view=sql-server-ver15
   "BINARY",
   "BIT",
@@ -15643,7 +15729,7 @@ const iS = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], ZS = _(["SELECT [ALL | DISTINCT]"]), qS = _([
+], qS = _(["SELECT [ALL | DISTINCT]"]), jS = _([
   // queries
   "WITH",
   "INTO",
@@ -15848,27 +15934,27 @@ const iS = [
   "XACT_ABORT",
   "XML INDEX",
   "XML SCHEMA COLLECTION"
-]), jS = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), kS = _([
+]), kS = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), zS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), zS = _([
+]), EI = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), EI = _([]), TI = {
+]), TI = _([]), RI = {
   name: "transactsql",
   tokenizerOptions: {
-    reservedSelect: ZS,
-    reservedClauses: [...qS, ...BT, ...XE],
-    reservedSetOperations: jS,
-    reservedJoins: kS,
-    reservedKeywordPhrases: zS,
-    reservedDataTypePhrases: EI,
-    reservedKeywords: vS,
-    reservedDataTypes: QS,
-    reservedFunctionNames: xS,
+    reservedSelect: qS,
+    reservedClauses: [...jS, ...BT, ...XE],
+    reservedSetOperations: kS,
+    reservedJoins: zS,
+    reservedKeywordPhrases: EI,
+    reservedDataTypePhrases: TI,
+    reservedKeywords: QS,
+    reservedDataTypes: ZS,
+    reservedFunctionNames: vS,
     nestedBlockComments: !0,
     stringTypes: [{ quote: "''-qq", prefixes: ["N"] }, "{}"],
     identTypes: ['""-qq', "[]"],
@@ -15901,7 +15987,7 @@ const iS = [
     onelineClauses: [...BT, ...XE],
     tabularOnelineClauses: XE
   }
-}, RI = [
+}, AI = [
   // 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
@@ -16114,7 +16200,7 @@ const iS = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], AI = [
+], eI = [
   // https://docs.singlestore.com/cloud/reference/sql-reference/data-types/
   "BIGINT",
   "BINARY",
@@ -16163,7 +16249,7 @@ const iS = [
   "VARCHAR",
   "VARCHARACTER",
   "YEAR"
-], eI = [
+], SI = [
   // 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
@@ -16443,7 +16529,7 @@ const iS = [
   "WEEKDAY",
   "WEEKOFYEAR",
   "YEAR"
-], SI = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), II = _([
+], II = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), OI = _([
   // queries
   "WITH",
   "FROM",
@@ -16644,36 +16730,36 @@ const iS = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), OI = _([
+]), NI = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT",
   "INTERSECT",
   "MINUS"
-]), NI = _([
+]), sI = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), sI = _([
+]), tI = _([
   "ON DELETE",
   "ON UPDATE",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), tI = _([]), CI = {
+]), CI = _([]), LI = {
   name: "singlestoredb",
   tokenizerOptions: {
-    reservedSelect: SI,
-    reservedClauses: [...II, ...mT, ...bE],
-    reservedSetOperations: OI,
-    reservedJoins: NI,
-    reservedKeywordPhrases: sI,
-    reservedDataTypePhrases: tI,
-    reservedKeywords: RI,
-    reservedDataTypes: AI,
-    reservedFunctionNames: eI,
+    reservedSelect: II,
+    reservedClauses: [...OI, ...mT, ...bE],
+    reservedSetOperations: NI,
+    reservedJoins: sI,
+    reservedKeywordPhrases: tI,
+    reservedDataTypePhrases: CI,
+    reservedKeywords: AI,
+    reservedDataTypes: eI,
+    reservedFunctionNames: SI,
     // TODO: support _binary"some string" prefix
     stringTypes: [
       '""-qq-bs',
@@ -16713,7 +16799,7 @@ const iS = [
     onelineClauses: [...mT, ...bE],
     tabularOnelineClauses: bE
   }
-}, LI = [
+}, _I = [
   // https://docs.snowflake.com/en/sql-reference-functions.html
   //
   // https://docs.snowflake.com/en/sql-reference/functions-all.html
@@ -17321,7 +17407,7 @@ const iS = [
   "QUARTER",
   "ZEROIFNULL",
   "ZIPF"
-], _I = [
+], rI = [
   // 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)
@@ -17418,7 +17504,7 @@ const iS = [
   "WITH",
   // These are definitely keywords, but haven't found a definite list in the docs
   "COMMENT"
-], rI = [
+], nI = [
   "NUMBER",
   "DECIMAL",
   "NUMERIC",
@@ -17455,7 +17541,7 @@ const iS = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], nI = _(["SELECT [ALL | DISTINCT]"]), iI = _([
+], iI = _(["SELECT [ALL | DISTINCT]"]), DI = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -17727,25 +17813,25 @@ const iS = [
   "USE SCHEMA",
   "USE SECONDARY ROLES",
   "USE WAREHOUSE"
-]), DI = _(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), aI = _([
+]), aI = _(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), oI = _([
   "[INNER] JOIN",
   "[NATURAL] {LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{CROSS | NATURAL} JOIN"
-]), oI = _([
+]), PI = _([
   "{ROWS | RANGE} BETWEEN",
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]"
-]), PI = _([]), MI = {
+]), MI = _([]), UI = {
   name: "snowflake",
   tokenizerOptions: {
-    reservedSelect: nI,
-    reservedClauses: [...iI, ...FT, ...yE],
-    reservedSetOperations: DI,
-    reservedJoins: aI,
-    reservedKeywordPhrases: oI,
-    reservedDataTypePhrases: PI,
-    reservedKeywords: _I,
-    reservedDataTypes: rI,
-    reservedFunctionNames: LI,
+    reservedSelect: iI,
+    reservedClauses: [...DI, ...FT, ...yE],
+    reservedSetOperations: aI,
+    reservedJoins: oI,
+    reservedKeywordPhrases: PI,
+    reservedDataTypePhrases: MI,
+    reservedKeywords: rI,
+    reservedDataTypes: nI,
+    reservedFunctionNames: _I,
     stringTypes: ["$$", "''-qq-bs"],
     identTypes: ['""-qq'],
     variableTypes: [
@@ -17778,43 +17864,43 @@ const iS = [
     onelineClauses: [...FT, ...yE],
     tabularOnelineClauses: yE
   }
-}, UI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, GI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  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
+  bigquery: kR,
+  db2: LA,
+  db2i: UA,
+  duckdb: pA,
+  hive: $A,
+  mariadb: kA,
+  mysql: Ne,
+  n1ql: Be,
+  plsql: Xe,
+  postgresql: Ze,
+  redshift: SS,
+  singlestoredb: LI,
+  snowflake: UI,
+  spark: nS,
+  sql: VS,
+  sqlite: uS,
+  tidb: ae,
+  transactsql: RI,
+  trino: xS
+}, Symbol.toStringTag, { value: "Module" })), TE = (T) => T[T.length - 1], zT = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), eE = (T) => T.replace(/\s+/gu, " "), KE = (T) => /\n/.test(T), X = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), YT = /\s+/uy, J = (T) => new RegExp(`(?:${T})`, "uy"), lI = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), cI = (T) => T + "(?:-" + T + ")*", uI = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(lI).join("|")}${E ? "" : "|"})`, HI = (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 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 = {}) => {
+}, dT = (T) => J(`${zT(T).map(X).join("|")}`), BI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", y = (T, E = {}) => {
   if (T.length === 0)
     return /^\b$/u;
-  const R = HI(E), A = kT(T).map(X).join("|").replace(/ /gu, "\\s+");
+  const R = BI(E), A = zT(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 J(`(?:${R})(?:${E})`);
-}, BI = () => {
+}, mI = () => {
   const T = {
     "<": ">",
     "[": "]",
@@ -17846,16 +17932,16 @@ const iS = [
   // Hive and Spark variables: ${name}
   "{}": String.raw`(?:\{[^\}]*\})`,
   // Oracle q'' strings: q'<text>' q'|text|' ...
-  "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 } = {}) => {
+  "q''": mI()
+}, ER = (T) => typeof T == "string" ? hT[T] : "regex" in T ? T.regex : uI(T) + hT[T.quote], FI = (T) => J(T.map((E) => "regex" in E ? E.regex : ER(E)).join("|")), TR = (T) => T.map(ER).join("|"), fT = (T) => J(TR(T)), YI = (T = {}) => J(RR(T)), RR = ({ 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;
+  return R ? cI(r) : r;
 };
-function RR(T, E) {
+function AR(T, E) {
   const R = T.slice(0, E).split(/\n/);
   return { line: R.length, col: R[R.length - 1].length + 1 };
 }
-class YI {
+class pI {
   constructor(E, R) {
     this.rules = E, this.dialectName = R, this.input = "", this.index = 0;
   }
@@ -17881,7 +17967,7 @@ class YI {
     return R;
   }
   createParseError() {
-    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = RR(this.input, this.index);
+    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = AR(this.input, this.index);
     return new Error(`Parse error: Unexpected "${E}" at line ${R} column ${A}.
 ${this.dialectInfo()}`);
   }
@@ -17917,8 +18003,8 @@ If possible, please select a more specific dialect (like sqlite, postgresql, etc
     }
   }
 }
-const VT = /\/\*/uy, pI = /[\s\S]/uy, dI = /\*\//uy;
-class hI {
+const VT = /\/\*/uy, dI = /[\s\S]/uy, hI = /\*\//uy;
+class fI {
   constructor() {
     this.lastIndex = 0;
   }
@@ -17931,9 +18017,9 @@ class hI {
     for (; e > 0; )
       if (A = this.matchSection(VT, E))
         R += A, e++;
-      else if (A = this.matchSection(dI, E))
+      else if (A = this.matchSection(hI, E))
         R += A, e--;
-      else if (A = this.matchSection(pI, E))
+      else if (A = this.matchSection(dI, E))
         R += A;
       else
         return null;
@@ -17945,7 +18031,7 @@ class hI {
     return A && (this.lastIndex += A[0].length), A ? A[0] : null;
   }
 }
-class fI {
+class VI {
   constructor(E, R) {
     this.cfg = E, this.dialectName = R, this.rulesBeforeParams = this.buildRulesBeforeParams(E), this.rulesAfterParams = this.buildRulesAfterParams(E);
   }
@@ -17954,7 +18040,7 @@ class fI {
       ...this.rulesBeforeParams,
       ...this.buildParamRules(this.cfg, R),
       ...this.rulesAfterParams
-    ], e = new YI(A, this.dialectName).tokenize(E);
+    ], e = new pI(A, this.dialectName).tokenize(E);
     return this.cfg.postProcess ? this.cfg.postProcess(e) : e;
   }
   // These rules can be cached as they only depend on
@@ -17968,11 +18054,11 @@ class fI {
       },
       {
         type: D.BLOCK_COMMENT,
-        regex: E.nestedBlockComments ? new hI() : /(\/\*[^]*?\*\/)/uy
+        regex: E.nestedBlockComments ? new fI() : /(\/\*[^]*?\*\/)/uy
       },
       {
         type: D.LINE_COMMENT,
-        regex: uI((R = E.lineCommentTypes) !== null && R !== void 0 ? R : ["--"])
+        regex: HI((R = E.lineCommentTypes) !== null && R !== void 0 ? R : ["--"])
       },
       {
         type: D.QUOTED_IDENTIFIER,
@@ -17987,82 +18073,82 @@ class fI {
       {
         type: D.RESERVED_KEYWORD_PHRASE,
         regex: y((A = E.reservedKeywordPhrases) !== null && A !== void 0 ? A : [], E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_DATA_TYPE_PHRASE,
         regex: y((e = E.reservedDataTypePhrases) !== null && e !== void 0 ? e : [], E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.CASE,
         regex: /CASE\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.END,
         regex: /END\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.BETWEEN,
         regex: /BETWEEN\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.LIMIT,
         regex: E.reservedClauses.includes("LIMIT") ? /LIMIT\b/iuy : void 0,
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_CLAUSE,
         regex: y(E.reservedClauses, E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_SELECT,
         regex: y(E.reservedSelect, E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_SET_OPERATION,
         regex: y(E.reservedSetOperations, E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.WHEN,
         regex: /WHEN\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.ELSE,
         regex: /ELSE\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.THEN,
         regex: /THEN\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_JOIN,
         regex: y(E.reservedJoins, E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.AND,
         regex: /AND\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.OR,
         regex: /OR\b/iuy,
-        text: B
+        text: F
       },
       {
         type: D.XOR,
         regex: E.supportsXor ? /XOR\b/iuy : void 0,
-        text: B
+        text: F
       },
       ...E.operatorKeyword ? [
         {
@@ -18073,17 +18159,17 @@ class fI {
       {
         type: D.RESERVED_FUNCTION_NAME,
         regex: y(E.reservedFunctionNames, E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_DATA_TYPE,
         regex: y(E.reservedDataTypes, E.identChars),
-        text: B
+        text: F
       },
       {
         type: D.RESERVED_KEYWORD,
         regex: y(E.reservedKeywords, E.identChars),
-        text: B
+        text: F
       }
     ]);
   }
@@ -18094,12 +18180,12 @@ class fI {
     return this.validRules([
       {
         type: D.VARIABLE,
-        regex: E.variableTypes ? mI(E.variableTypes) : void 0
+        regex: E.variableTypes ? FI(E.variableTypes) : void 0
       },
       { type: D.STRING, regex: fT(E.stringTypes) },
       {
         type: D.IDENTIFIER,
-        regex: FI(E.identChars)
+        regex: YI(E.identChars)
       },
       { type: D.DELIMITER, regex: /[;]/uy },
       { type: D.COMMA, regex: /[,]/y },
@@ -18149,32 +18235,32 @@ class fI {
     return this.validRules([
       {
         type: D.NAMED_PARAMETER,
-        regex: $E(r.named, TR(E.paramChars || E.identChars)),
-        key: (I) => I.slice(1)
+        regex: $E(r.named, RR(E.paramChars || E.identChars)),
+        key: (O) => O.slice(1)
       },
       {
         type: D.QUOTED_PARAMETER,
-        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)
+        regex: $E(r.quoted, TR(E.identTypes)),
+        key: (O) => (({ tokenKey: I, quoteChar: s }) => I.replace(new RegExp(X("\\" + s), "gu"), s))({
+          tokenKey: O.slice(2, -1),
+          quoteChar: O.slice(-1)
         })
       },
       {
         type: D.NUMBERED_PARAMETER,
         regex: $E(r.numbered, "[0-9]+"),
-        key: (I) => I.slice(1)
+        key: (O) => O.slice(1)
       },
       {
         type: D.POSITIONAL_PARAMETER,
         regex: r.positional ? /[?]/y : void 0
       },
-      ...r.custom.map((I) => {
-        var O;
+      ...r.custom.map((O) => {
+        var I;
         return {
           type: D.CUSTOM_PARAMETER,
-          regex: J(I.regex),
-          key: (O = I.key) !== null && O !== void 0 ? O : ((s) => s)
+          regex: J(O.regex),
+          key: (I = O.key) !== null && I !== void 0 ? I : ((s) => s)
         };
       })
     ]);
@@ -18184,13 +18270,13 @@ class fI {
     return E.filter((R) => !!R.regex);
   }
 }
-const B = (T) => AE(T.toUpperCase()), WT = /* @__PURE__ */ new Map(), VI = (T) => {
+const F = (T) => eE(T.toUpperCase()), WT = /* @__PURE__ */ new Map(), WI = (T) => {
   let E = WT.get(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) => {
+  return E || (E = XI(T), WT.set(T, E)), E;
+}, XI = (T) => ({
+  tokenizer: new VI(T.tokenizerOptions, T.name),
+  formatOptions: bI(T.formatOptions)
+}), bI = (T) => {
   var E;
   return {
     alwaysDenseOperators: T.alwaysDenseOperators || [],
@@ -18198,13 +18284,13 @@ const B = (T) => AE(T.toUpperCase()), WT = /* @__PURE__ */ new Map(), VI = (T) =
     tabularOnelineClauses: Object.fromEntries(((E = T.tabularOnelineClauses) !== null && E !== void 0 ? E : T.onelineClauses).map((R) => [R, !0]))
   };
 };
-function bI(T) {
+function yI(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 yI {
+class KI {
   constructor(E) {
     this.params = E, this.index = 0;
   }
@@ -18227,45 +18313,45 @@ class yI {
     this.index = E;
   }
 }
-function KI(T) {
+function $I(T) {
   return T && T.__esModule && Object.prototype.hasOwnProperty.call(T, "default") ? T.default : T;
 }
-var eE = { exports: {} }, $I = eE.exports, XT;
-function gI() {
+var SE = { exports: {} }, gI = SE.exports, XT;
+function wI() {
   return XT || (XT = 1, (function(T) {
     (function(E, R) {
       T.exports ? T.exports = R() : E.nearley = R();
-    })($I, function() {
-      function E(I, O, s) {
-        return this.id = ++E.highestId, this.name = I, this.symbols = O, this.postprocess = s, this;
+    })(gI, function() {
+      function E(O, I, s) {
+        return this.id = ++E.highestId, this.name = O, this.symbols = I, this.postprocess = s, this;
       }
-      E.highestId = 0, E.prototype.toString = function(I) {
-        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;
+      E.highestId = 0, E.prototype.toString = function(O) {
+        var I = typeof O > "u" ? this.symbols.map(r).join(" ") : this.symbols.slice(0, O).map(r).join(" ") + " ● " + this.symbols.slice(O).map(r).join(" ");
+        return this.name + " → " + I;
       };
-      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;
+      function R(O, I, s, L) {
+        this.rule = O, this.dot = I, this.reference = s, this.data = [], this.wantedBy = L, this.isComplete = this.dot === O.symbols.length;
       }
       R.prototype.toString = function() {
         return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
-      }, R.prototype.nextState = function(I) {
-        var O = new R(this.rule, this.dot + 1, this.reference, this.wantedBy);
-        return O.left = this, O.right = I, O.isComplete && (O.data = O.build(), O.right = void 0), O;
+      }, R.prototype.nextState = function(O) {
+        var I = new R(this.rule, this.dot + 1, this.reference, this.wantedBy);
+        return I.left = this, I.right = O, I.isComplete && (I.data = I.build(), I.right = void 0), I;
       }, R.prototype.build = function() {
-        var I = [], O = this;
+        var O = [], I = this;
         do
-          I.push(O.right.data), O = O.left;
-        while (O.left);
-        return I.reverse(), I;
+          O.push(I.right.data), I = I.left;
+        while (I.left);
+        return O.reverse(), O;
       }, R.prototype.finish = function() {
         this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, N.fail));
       };
-      function A(I, O) {
-        this.grammar = I, this.index = O, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
+      function A(O, I) {
+        this.grammar = O, this.index = I, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
       }
-      A.prototype.process = function(I) {
-        for (var O = this.states, s = this.wants, L = this.completed, a = 0; a < O.length; a++) {
-          var o = O[a];
+      A.prototype.process = function(O) {
+        for (var I = this.states, s = this.wants, L = this.completed, a = 0; a < I.length; a++) {
+          var o = I[a];
           if (o.isComplete) {
             if (o.finish(), o.data !== N.fail) {
               for (var n = o.wantedBy, U = n.length; U--; ) {
@@ -18273,67 +18359,67 @@ function gI() {
                 this.complete(P, o);
               }
               if (o.reference === this.index) {
-                var l = o.rule.name;
-                (this.completed[l] = this.completed[l] || []).push(o);
+                var c = o.rule.name;
+                (this.completed[c] = this.completed[c] || []).push(o);
               }
             }
           } else {
-            var l = o.rule.symbols[o.dot];
-            if (typeof l != "string") {
+            var c = o.rule.symbols[o.dot];
+            if (typeof c != "string") {
               this.scannable.push(o);
               continue;
             }
-            if (s[l]) {
-              if (s[l].push(o), L.hasOwnProperty(l))
-                for (var c = L[l], U = 0; U < c.length; U++) {
-                  var m = c[U];
-                  this.complete(o, m);
+            if (s[c]) {
+              if (s[c].push(o), L.hasOwnProperty(c))
+                for (var l = L[c], U = 0; U < l.length; U++) {
+                  var H = l[U];
+                  this.complete(o, H);
                 }
             } else
-              s[l] = [o], this.predict(l);
+              s[c] = [o], this.predict(c);
           }
         }
-      }, A.prototype.predict = function(I) {
-        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);
+      }, A.prototype.predict = function(O) {
+        for (var I = this.grammar.byName[O] || [], s = 0; s < I.length; s++) {
+          var L = I[s], a = this.wants[O], o = new R(L, 0, this.index, a);
           this.states.push(o);
         }
-      }, A.prototype.complete = function(I, O) {
-        var s = I.nextState(O);
+      }, A.prototype.complete = function(O, I) {
+        var s = O.nextState(I);
         this.states.push(s);
       };
-      function e(I, O) {
-        this.rules = I, this.start = O || this.rules[0].name;
+      function e(O, I) {
+        this.rules = O, this.start = I || this.rules[0].name;
         var s = this.byName = {};
         this.rules.forEach(function(L) {
           s.hasOwnProperty(L.name) || (s[L.name] = []), s[L.name].push(L);
         });
       }
-      e.fromCompiled = function(L, O) {
+      e.fromCompiled = function(L, I) {
         var s = L.Lexer;
-        L.ParserStart && (O = L.ParserStart, L = L.ParserRules);
+        L.ParserStart && (I = 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);
+        }), a = new e(L, I);
         return a.lexer = s, a;
       };
       function S() {
         this.reset("");
       }
-      S.prototype.reset = function(I, O) {
-        this.buffer = I, this.index = 0, this.line = O ? O.line : 1, this.lastLineBreak = O ? -O.col : 0;
+      S.prototype.reset = function(O, I) {
+        this.buffer = O, this.index = 0, this.line = I ? I.line : 1, this.lastLineBreak = I ? -I.col : 0;
       }, S.prototype.next = function() {
         if (this.index < this.buffer.length) {
-          var I = this.buffer[this.index++];
-          return I === `
-` && (this.line += 1, this.lastLineBreak = this.index), { value: I };
+          var O = this.buffer[this.index++];
+          return O === `
+` && (this.line += 1, this.lastLineBreak = this.index), { value: O };
         }
       }, S.prototype.save = function() {
         return {
           line: this.line,
           col: this.index - this.lastLineBreak
         };
-      }, S.prototype.formatError = function(I, O) {
+      }, S.prototype.formatError = function(O, I) {
         var s = this.buffer;
         if (typeof s == "string") {
           var L = s.split(`
@@ -18344,26 +18430,26 @@ function gI() {
 `, this.index);
           a === -1 && (a = s.length);
           var o = this.index - this.lastLineBreak, n = String(this.line).length;
-          return O += " at line " + this.line + " col " + o + `:
+          return I += " at line " + this.line + " col " + o + `:
 
-`, O += L.map(function(P, l) {
-            return U(this.line - L.length + l + 1, n) + " " + P;
+`, I += L.map(function(P, c) {
+            return U(this.line - L.length + c + 1, n) + " " + P;
           }, this).join(`
-`), O += `
+`), I += `
 ` + U("", n + o) + `^
-`, O;
+`, I;
         } else
-          return O + " at index " + (this.index - 1);
-        function U(P, l) {
-          var c = String(P);
-          return Array(l - c.length + 1).join(" ") + c;
+          return I + " at index " + (this.index - 1);
+        function U(P, c) {
+          var l = String(P);
+          return Array(c - l.length + 1).join(" ") + l;
         }
       };
-      function N(I, O, s) {
-        if (I instanceof e)
-          var L = I, s = O;
+      function N(O, I, s) {
+        if (O instanceof e)
+          var L = O, s = I;
         else
-          var L = e.fromCompiled(I, O);
+          var L = e.fromCompiled(O, I);
         this.grammar = L, this.options = {
           keepHistory: !1,
           lexer: L.lexer || new S()
@@ -18374,12 +18460,12 @@ function gI() {
         var o = new A(L, 0);
         this.table = [o], o.wants[L.start] = [], o.predict(L.start), o.process(), this.current = 0;
       }
-      N.fail = {}, N.prototype.feed = function(I) {
-        var O = this.lexer;
-        O.reset(I, this.lexerState);
+      N.fail = {}, N.prototype.feed = function(O) {
+        var I = this.lexer;
+        I.reset(O, this.lexerState);
         for (var s; ; ) {
           try {
-            if (s = O.next(), !s)
+            if (s = I.next(), !s)
               break;
           } catch (x) {
             var n = new A(this.grammar, this.current + 1);
@@ -18391,10 +18477,10 @@ function gI() {
           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 = 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 });
+          for (var U = s.text !== void 0 ? s.text : s.value, P = I.constructor === S ? s.value : s, c = a.scannable, l = c.length; l--; ) {
+            var H = c[l], B = H.rule.symbols[H.dot];
+            if (B.test ? B.test(P) : B.type ? B.type === s.type : B.literal === U) {
+              var V = H.nextState({ data: P, token: s, isToken: !0, reference: o - 1 });
               n.states.push(V);
             }
           }
@@ -18402,100 +18488,100 @@ function gI() {
             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++;
+          this.options.keepHistory && (a.lexerState = I.save()), this.current++;
         }
-        return a && (this.lexerState = O.save()), this.results = this.finish(), this;
-      }, N.prototype.reportLexerError = function(I) {
-        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), s = this.lexer.formatError(I, "Syntax error");
-        return this.reportErrorCommon(s, O);
-      }, N.prototype.reportErrorCommon = function(I, O) {
+        return a && (this.lexerState = I.save()), this.results = this.finish(), this;
+      }, N.prototype.reportLexerError = function(O) {
+        var I, s, L = O.token;
+        return L ? (I = "input " + JSON.stringify(L.text[0]) + " (lexer error)", s = this.lexer.formatError(L, "Syntax error")) : (I = "input (lexer error)", s = O.message), this.reportErrorCommon(s, I);
+      }, N.prototype.reportError = function(O) {
+        var I = (O.type ? O.type + " token: " : "") + JSON.stringify(O.value !== void 0 ? O.value : O), s = this.lexer.formatError(O, "Syntax error");
+        return this.reportErrorCommon(s, I);
+      }, N.prototype.reportErrorCommon = function(O, I) {
         var s = [];
-        s.push(I);
+        s.push(O);
         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)
-          s.push("Unexpected " + O + `. I did not expect any more input. Here is the state of my parse table:
+          s.push("Unexpected " + I + `. I did not expect any more input. Here is the state of my parse table:
 `), this.displayStateStack(a.states, s);
         else {
-          s.push("Unexpected " + O + `. Instead, I was expecting to see one of the following:
+          s.push("Unexpected " + I + `. 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);
-            s.push("A " + c + " based on:"), this.displayStateStack(U, s);
+            var P = U[0], c = P.rule.symbols[P.dot], l = this.getSymbolDisplay(c);
+            s.push("A " + l + " based on:"), this.displayStateStack(U, s);
           }, this);
         }
         return s.push(""), s.join(`
 `);
-      }, N.prototype.displayStateStack = function(I, O) {
-        for (var s, L = 0, a = 0; a < I.length; a++) {
-          var o = I[a], n = o.rule.toString(o.dot);
-          n === s ? L++ : (L > 0 && O.push("    ^ " + L + " more lines identical to this"), L = 0, O.push("    " + n)), s = n;
+      }, N.prototype.displayStateStack = function(O, I) {
+        for (var s, L = 0, a = 0; a < O.length; a++) {
+          var o = O[a], n = o.rule.toString(o.dot);
+          n === s ? L++ : (L > 0 && I.push("    ^ " + L + " more lines identical to this"), L = 0, I.push("    " + n)), s = n;
         }
-      }, N.prototype.getSymbolDisplay = function(I) {
-        return t(I);
-      }, N.prototype.buildFirstStateStack = function(I, O) {
-        if (O.indexOf(I) !== -1)
+      }, N.prototype.getSymbolDisplay = function(O) {
+        return t(O);
+      }, N.prototype.buildFirstStateStack = function(O, I) {
+        if (I.indexOf(O) !== -1)
           return null;
-        if (I.wantedBy.length === 0)
-          return [I];
-        var s = I.wantedBy[0], L = [I].concat(O), a = this.buildFirstStateStack(s, L);
-        return a === null ? null : [I].concat(a);
+        if (O.wantedBy.length === 0)
+          return [O];
+        var s = O.wantedBy[0], L = [O].concat(I), a = this.buildFirstStateStack(s, L);
+        return a === null ? null : [O].concat(a);
       }, N.prototype.save = function() {
-        var I = this.table[this.current];
-        return I.lexerState = this.lexerState, I;
-      }, N.prototype.restore = function(I) {
-        var O = I.index;
-        this.current = O, this.table[O] = I, this.table.splice(O + 1), this.lexerState = I.lexerState, this.results = this.finish();
-      }, N.prototype.rewind = function(I) {
+        var O = this.table[this.current];
+        return O.lexerState = this.lexerState, O;
+      }, N.prototype.restore = function(O) {
+        var I = O.index;
+        this.current = I, this.table[I] = O, this.table.splice(I + 1), this.lexerState = O.lexerState, this.results = this.finish();
+      }, N.prototype.rewind = function(O) {
         if (!this.options.keepHistory)
           throw new Error("set option `keepHistory` to enable rewinding");
-        this.restore(this.table[I]);
+        this.restore(this.table[O]);
       }, N.prototype.finish = function() {
-        var I = [], O = this.grammar.start, s = this.table[this.table.length - 1];
+        var O = [], I = 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) {
+          L.rule.name === I && L.dot === L.rule.symbols.length && L.reference === 0 && L.data !== N.fail && O.push(L);
+        }), O.map(function(L) {
           return L.data;
         });
       };
-      function t(I) {
-        var O = typeof I;
-        if (O === "string")
-          return I;
-        if (O === "object") {
-          if (I.literal)
-            return JSON.stringify(I.literal);
-          if (I instanceof RegExp)
-            return "character matching " + I;
-          if (I.type)
-            return I.type + " token";
-          if (I.test)
-            return "token matching " + String(I.test);
-          throw new Error("Unknown symbol type: " + I);
+      function t(O) {
+        var I = typeof O;
+        if (I === "string")
+          return O;
+        if (I === "object") {
+          if (O.literal)
+            return JSON.stringify(O.literal);
+          if (O instanceof RegExp)
+            return "character matching " + O;
+          if (O.type)
+            return O.type + " token";
+          if (O.test)
+            return "token matching " + String(O.test);
+          throw new Error("Unknown symbol type: " + O);
         }
       }
-      function r(I) {
-        var O = typeof I;
-        if (O === "string")
-          return I;
-        if (O === "object") {
-          if (I.literal)
-            return JSON.stringify(I.literal);
-          if (I instanceof RegExp)
-            return I.toString();
-          if (I.type)
-            return "%" + I.type;
-          if (I.test)
-            return "<" + String(I.test) + ">";
-          throw new Error("Unknown symbol type: " + I);
+      function r(O) {
+        var I = typeof O;
+        if (I === "string")
+          return O;
+        if (I === "object") {
+          if (O.literal)
+            return JSON.stringify(O.literal);
+          if (O instanceof RegExp)
+            return O.toString();
+          if (O.type)
+            return "%" + O.type;
+          if (O.test)
+            return "<" + String(O.test) + ">";
+          throw new Error("Unknown symbol type: " + O);
         }
       }
       return {
@@ -18504,58 +18590,58 @@ function gI() {
         Rule: E
       };
     });
-  })(eE)), eE.exports;
+  })(SE)), SE.exports;
 }
-var wI = gI();
-const JI = /* @__PURE__ */ KI(wI);
-function xI(T) {
-  return T.map(vI).map(QI).map(ZI).map(qI).map(jI);
+var JI = wI();
+const xI = /* @__PURE__ */ $I(JI);
+function vI(T) {
+  return T.map(QI).map(ZI).map(qI).map(jI).map(kI);
 }
-const vI = (T, E, R) => {
-  if (jT(T.type)) {
-    const A = kI(R, E);
+const QI = (T, E, R) => {
+  if (kT(T.type)) {
+    const A = zI(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);
+    const e = z(R, E);
     if (e && e.type === D.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
-}, QI = (T, E, R) => {
+}, ZI = (T, E, R) => {
   if (T.type === D.RESERVED_FUNCTION_NAME) {
-    const A = k(R, E);
-    if (!A || !AR(A))
+    const A = z(R, E);
+    if (!A || !eR(A))
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
-}, ZI = (T, E, R) => {
+}, qI = (T, E, R) => {
   if (T.type === D.RESERVED_DATA_TYPE) {
-    const A = k(R, E);
-    if (A && AR(A))
+    const A = z(R, E);
+    if (A && eR(A))
       return Object.assign(Object.assign({}, T), { type: D.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return T;
-}, qI = (T, E, R) => {
+}, jI = (T, E, R) => {
   if (T.type === D.IDENTIFIER) {
-    const A = k(R, E);
-    if (A && eR(A))
+    const A = z(R, E);
+    if (A && SR(A))
       return Object.assign(Object.assign({}, T), { type: D.ARRAY_IDENTIFIER });
   }
   return T;
-}, jI = (T, E, R) => {
+}, kI = (T, E, R) => {
   if (T.type === D.RESERVED_DATA_TYPE) {
-    const A = k(R, E);
-    if (A && eR(A))
+    const A = z(R, E);
+    if (A && SR(A))
       return Object.assign(Object.assign({}, T), { type: D.ARRAY_KEYWORD });
   }
   return T;
-}, kI = (T, E) => k(T, E, -1), k = (T, E, R = 1) => {
+}, zI = (T, E) => z(T, E, -1), z = (T, E, R = 1) => {
   let A = 1;
-  for (; T[E + A * R] && zI(T[E + A * R]); )
+  for (; T[E + A * R] && EO(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 === "[", zI = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
-class SR {
+}, eR = (T) => T.type === D.OPEN_PAREN && T.text === "(", SR = (T) => T.type === D.OPEN_PAREN && T.text === "[", EO = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
+class IR {
   constructor(E) {
     this.tokenize = E, this.index = 0, this.tokens = [], this.input = "";
   }
@@ -18568,7 +18654,7 @@ class SR {
   save() {
   }
   formatError(E) {
-    const { line: R, col: A } = RR(this.input, E.start);
+    const { line: R, col: A } = AR(this.input, E.start);
     return `Parse error at token: ${E.text} at line ${R} column ${A}`;
   }
   has(E) {
@@ -18582,7 +18668,7 @@ var M;
 function gE(T) {
   return T[0];
 }
-const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
+const G = new IR((T) => []), K = ([[T]]) => T, Y = (T) => ({
   type: M.keyword,
   tokenType: T.type,
   text: T.text,
@@ -18591,17 +18677,17 @@ 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), EO = (T, { leading: E, trailing: R }) => {
+}), p = (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), TO = (T, { leading: E, trailing: R }) => {
   if (E?.length) {
     const [A, ...e] = T;
-    T = [Y(A, { leading: E }), ...e];
+    T = [p(A, { leading: E }), ...e];
   }
   if (R?.length) {
     const A = T.slice(0, -1), e = T[T.length - 1];
-    T = [...A, Y(e, { trailing: R })];
+    T = [...A, p(e, { trailing: R })];
   }
   return T;
-}, TO = {
+}, RO = {
   Lexer: G,
   ParserRules: [
     { name: "main$ebnf$1", symbols: [] },
@@ -18652,14 +18738,14 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
           const [e, S] = A;
           return {
             type: M.limit_clause,
-            limitKw: Y(F(T), { trailing: E }),
+            limitKw: p(Y(T), { trailing: E }),
             offset: R,
             count: S
           };
         } else
           return {
             type: M.limit_clause,
-            limitKw: Y(F(T), { trailing: E }),
+            limitKw: p(Y(T), { trailing: E }),
             count: R
           };
       }
@@ -18675,7 +18761,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT, "select_clause$subexpression$1"],
       postprocess: ([T, [E, R]]) => ({
         type: M.clause,
-        nameKw: F(T),
+        nameKw: Y(T),
         children: [E, ...R]
       })
     },
@@ -18684,7 +18770,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("RESERVED_SELECT") ? { type: "RESERVED_SELECT" } : RESERVED_SELECT],
       postprocess: ([T]) => ({
         type: M.clause,
-        nameKw: F(T),
+        nameKw: Y(T),
         children: []
       })
     },
@@ -18700,7 +18786,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("RESERVED_CLAUSE") ? { type: "RESERVED_CLAUSE" } : RESERVED_CLAUSE, "other_clause$ebnf$1"],
       postprocess: ([T, E]) => ({
         type: M.clause,
-        nameKw: F(T),
+        nameKw: Y(T),
         children: E
       })
     },
@@ -18711,7 +18797,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("RESERVED_SET_OPERATION") ? { type: "RESERVED_SET_OPERATION" } : RESERVED_SET_OPERATION, "set_operation$ebnf$1"],
       postprocess: ([T, E]) => ({
         type: M.set_operation,
-        nameKw: F(T),
+        nameKw: Y(T),
         children: E
       })
     },
@@ -18735,17 +18821,17 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
     {
       name: "expression_with_comments_",
       symbols: ["expression", "_"],
-      postprocess: ([T, E]) => Y(T, { trailing: E })
+      postprocess: ([T, E]) => p(T, { trailing: E })
     },
     {
       name: "_expression_with_comments",
       symbols: ["_", "expression"],
-      postprocess: ([T, E]) => Y(E, { leading: T })
+      postprocess: ([T, E]) => p(E, { leading: T })
     },
     {
       name: "_andless_expression_with_comments",
       symbols: ["_", "andless_expression"],
-      postprocess: ([T, E]) => Y(E, { leading: T })
+      postprocess: ([T, E]) => p(E, { leading: T })
     },
     { name: "free_form_sql$subexpression$1", symbols: ["asteriskless_free_form_sql"] },
     { name: "free_form_sql$subexpression$1", symbols: ["asterisk"] },
@@ -18784,7 +18870,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("ARRAY_IDENTIFIER") ? { type: "ARRAY_IDENTIFIER" } : ARRAY_IDENTIFIER, "_", "square_brackets"],
       postprocess: ([T, E, R]) => ({
         type: M.array_subscript,
-        array: Y({ type: M.identifier, quoted: !1, text: T.text }, { trailing: E }),
+        array: p({ type: M.identifier, quoted: !1, text: T.text }, { trailing: E }),
         parenthesis: R
       })
     },
@@ -18793,7 +18879,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("ARRAY_KEYWORD") ? { type: "ARRAY_KEYWORD" } : ARRAY_KEYWORD, "_", "square_brackets"],
       postprocess: ([T, E, R]) => ({
         type: M.array_subscript,
-        array: Y(F(T), { trailing: E }),
+        array: p(Y(T), { trailing: E }),
         parenthesis: R
       })
     },
@@ -18802,7 +18888,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("RESERVED_FUNCTION_NAME") ? { type: "RESERVED_FUNCTION_NAME" } : RESERVED_FUNCTION_NAME, "_", "parenthesis"],
       postprocess: ([T, E, R]) => ({
         type: M.function_call,
-        nameKw: Y(F(T), { trailing: E }),
+        nameKw: p(Y(T), { trailing: E }),
         parenthesis: R
       })
     },
@@ -18854,9 +18940,9 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
         // %ARRAY_IDENTIFIER on the left side of <array_subscript>.
         ([T, E, R, A, [e]]) => ({
           type: M.property_access,
-          object: Y(T, { trailing: E }),
+          object: p(T, { trailing: E }),
           operator: R.text,
-          property: Y(e, { leading: A })
+          property: p(e, { leading: A })
         })
       )
     },
@@ -18865,10 +18951,10 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("BETWEEN") ? { type: "BETWEEN" } : BETWEEN, "_", "andless_expression_chain", "_", G.has("AND") ? { type: "AND" } : AND, "_", "andless_expression"],
       postprocess: ([T, E, R, A, e, S, N]) => ({
         type: M.between_predicate,
-        betweenKw: F(T),
-        expr1: EO(R, { leading: E, trailing: A }),
-        andKw: F(e),
-        expr2: [Y(N, { leading: S })]
+        betweenKw: Y(T),
+        expr1: TO(R, { leading: E, trailing: A }),
+        andKw: Y(e),
+        expr2: [p(N, { leading: S })]
       })
     },
     { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: gE },
@@ -18880,8 +18966,8 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("CASE") ? { type: "CASE" } : CASE, "_", "case_expression$ebnf$1", "case_expression$ebnf$2", G.has("END") ? { type: "END" } : END],
       postprocess: ([T, E, R, A, e]) => ({
         type: M.case_expression,
-        caseKw: Y(F(T), { trailing: E }),
-        endKw: F(e),
+        caseKw: p(Y(T), { trailing: E }),
+        endKw: Y(e),
         expr: R || [],
         clauses: A
       })
@@ -18891,8 +18977,8 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("WHEN") ? { type: "WHEN" } : WHEN, "_", "expression_chain_", G.has("THEN") ? { type: "THEN" } : THEN, "_", "expression_chain_"],
       postprocess: ([T, E, R, A, e, S]) => ({
         type: M.case_when,
-        whenKw: Y(F(T), { trailing: E }),
-        thenKw: Y(F(A), { trailing: e }),
+        whenKw: p(Y(T), { trailing: E }),
+        thenKw: p(Y(A), { trailing: e }),
         condition: R,
         result: S
       })
@@ -18902,7 +18988,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("ELSE") ? { type: "ELSE" } : ELSE, "_", "expression_chain_"],
       postprocess: ([T, E, R]) => ({
         type: M.case_else,
-        elseKw: Y(F(T), { trailing: E }),
+        elseKw: p(Y(T), { trailing: E }),
         result: R
       })
     },
@@ -18931,7 +19017,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
     {
       name: "keyword",
       symbols: ["keyword$subexpression$1"],
-      postprocess: ([[T]]) => F(T)
+      postprocess: ([[T]]) => Y(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] },
@@ -18945,7 +19031,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
       symbols: [G.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
       postprocess: ([T, E, R]) => ({
         type: M.parameterized_data_type,
-        dataType: Y(bT(T), { trailing: E }),
+        dataType: p(bT(T), { trailing: E }),
         parenthesis: R
       })
     },
@@ -18955,7 +19041,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
     {
       name: "logic_operator",
       symbols: ["logic_operator$subexpression$1"],
-      postprocess: ([[T]]) => F(T)
+      postprocess: ([[T]]) => Y(T)
     },
     { name: "other_keyword$subexpression$1", symbols: [G.has("WHEN") ? { type: "WHEN" } : WHEN] },
     { name: "other_keyword$subexpression$1", symbols: [G.has("THEN") ? { type: "THEN" } : THEN] },
@@ -18964,7 +19050,7 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
     {
       name: "other_keyword",
       symbols: ["other_keyword$subexpression$1"],
-      postprocess: ([[T]]) => F(T)
+      postprocess: ([[T]]) => Y(T)
     },
     { name: "_$ebnf$1", symbols: [] },
     { name: "_$ebnf$1", symbols: ["_$ebnf$1", "comment"], postprocess: (T) => T[0].concat([T[1]]) },
@@ -18998,13 +19084,13 @@ const G = new SR((T) => []), K = ([[T]]) => T, F = (T) => ({
     }
   ],
   ParserStart: "main"
-}, { Parser: RO, Grammar: AO } = JI;
-function eO(T) {
+}, { Parser: AO, Grammar: eO } = xI;
+function SO(T) {
   let E = {};
-  const R = new SR((e) => [
-    ...xI(T.tokenize(e, E)),
-    qT(e.length)
-  ]), A = new RO(AO.fromCompiled(TO), { lexer: R });
+  const R = new IR((e) => [
+    ...vI(T.tokenize(e, E)),
+    jT(e.length)
+  ]), A = new AO(eO.fromCompiled(RO), { lexer: R });
   return {
     parse: (e, S) => {
       E = S;
@@ -19020,7 +19106,7 @@ var i;
 (function(T) {
   T[T.SPACE = 0] = "SPACE", T[T.NO_SPACE = 1] = "NO_SPACE", T[T.NO_NEWLINE = 2] = "NO_NEWLINE", T[T.NEWLINE = 3] = "NEWLINE", T[T.MANDATORY_NEWLINE = 4] = "MANDATORY_NEWLINE", T[T.INDENT = 5] = "INDENT", T[T.SINGLE_INDENT = 6] = "SINGLE_INDENT";
 })(i = i || (i = {}));
-class IR {
+class NR {
   constructor(E) {
     this.indentation = E, this.items = [];
   }
@@ -19056,16 +19142,16 @@ class IR {
       }
   }
   trimHorizontalWhitespace() {
-    for (; SO(EE(this.items)); )
+    for (; IO(TE(this.items)); )
       this.items.pop();
   }
   trimWhitespace() {
-    for (; IO(EE(this.items)); )
+    for (; OO(TE(this.items)); )
       this.items.pop();
   }
   addNewline(E) {
     if (this.items.length > 0)
-      switch (EE(this.items)) {
+      switch (TE(this.items)) {
         case i.NEWLINE:
           this.items.pop(), this.items.push(E);
           break;
@@ -19107,7 +19193,7 @@ class IR {
     }
   }
 }
-const SO = (T) => T === i.SPACE || T === i.SINGLE_INDENT, IO = (T) => T === i.SPACE || T === i.SINGLE_INDENT || T === i.NEWLINE;
+const IO = (T) => T === i.SPACE || T === i.SINGLE_INDENT, OO = (T) => T === i.SPACE || T === i.SINGLE_INDENT || T === i.NEWLINE;
 function yT(T, E) {
   if (E === "standard")
     return T;
@@ -19115,10 +19201,10 @@ function yT(T, E) {
   return T.length >= 10 && T.includes(" ") && ([T, ...R] = T.split(" ")), E === "tabularLeft" ? T = T.padEnd(9, " ") : T = T.padStart(9, " "), T + ["", ...R].join(" ");
 }
 function 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;
+  return $R(T) || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.LIMIT;
 }
-const wE = "top-level", OO = "block-level";
-class NR {
+const wE = "top-level", NO = "block-level";
+class sR {
   /**
    * @param {string} indent A string to indent with
    */
@@ -19147,14 +19233,14 @@ class NR {
    * Increases indentation by one block-level indent.
    */
   increaseBlockLevel() {
-    this.indentTypes.push(OO);
+    this.indentTypes.push(NO);
   }
   /**
    * 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) === wE && this.indentTypes.pop();
+    this.indentTypes.length > 0 && TE(this.indentTypes) === wE && this.indentTypes.pop();
   }
   /**
    * Decreases indentation by one block-level indent.
@@ -19166,9 +19252,9 @@ class NR {
       ;
   }
 }
-class NO extends IR {
+class sO extends NR {
   constructor(E) {
-    super(new NR("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
+    super(new sR("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
   }
   add(...E) {
     if (E.forEach((R) => this.addToLength(R)), this.length > this.expressionWidth)
@@ -19361,7 +19447,7 @@ class tE {
       // first line starts with /* or /**
       /^\/\*\*?$/.test(R[0]) && // intermediate lines start with *
       R.slice(1, R.length - 1).every((A) => /^\s*\*/.test(A)) && // last line ends with */
-      /^\s*\*\/$/.test(EE(R))
+      /^\s*\*\/$/.test(TE(R))
     );
   }
   // Breaks up block comment to multiple lines.
@@ -19410,7 +19496,7 @@ class tE {
         cfg: this.cfg,
         dialectCfg: this.dialectCfg,
         params: this.params,
-        layout: new NO(this.cfg.expressionWidth),
+        layout: new sO(this.cfg.expressionWidth),
         inline: !0
       }).format(E);
     } catch (A) {
@@ -19452,7 +19538,7 @@ class tE {
   showNonTabularKw(E) {
     switch (this.cfg.keywordCase) {
       case "preserve":
-        return AE(E.raw);
+        return eE(E.raw);
       case "upper":
         return E.text;
       case "lower":
@@ -19466,7 +19552,7 @@ class tE {
   showNonTabularFunctionKw(E) {
     switch (this.cfg.functionCase) {
       case "preserve":
-        return AE(E.raw);
+        return eE(E.raw);
       case "upper":
         return E.text;
       case "lower":
@@ -19488,7 +19574,7 @@ class tE {
   showDataType(E) {
     switch (this.cfg.dataTypeCase) {
       case "preserve":
-        return AE(E.raw);
+        return eE(E.raw);
       case "upper":
         return E.text;
       case "lower":
@@ -19496,9 +19582,9 @@ class tE {
     }
   }
 }
-class sO {
+class tO {
   constructor(E, R) {
-    this.dialect = E, this.cfg = R, this.params = new yI(this.cfg.params);
+    this.dialect = E, this.cfg = R, this.params = new KI(this.cfg.params);
   }
   /**
    * Formats an SQL query.
@@ -19510,7 +19596,7 @@ class sO {
     return this.formatAst(R).trimEnd();
   }
   parse(E) {
-    return eO(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
+    return SO(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
   }
   formatAst(E) {
     return E.map((R) => this.formatStatement(R)).join(`
@@ -19521,14 +19607,14 @@ class sO {
       cfg: this.cfg,
       dialectCfg: this.dialect.formatOptions,
       params: this.params,
-      layout: new IR(new NR(bI(this.cfg)))
+      layout: new NR(new sR(yI(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 {
+class IE extends Error {
 }
-function tO(T) {
+function CO(T) {
   const E = [
     "multilineLists",
     "newlineBeforeOpenParen",
@@ -19539,20 +19625,20 @@ function tO(T) {
   ];
   for (const R of E)
     if (R in T)
-      throw new SE(`${R} config is no more supported.`);
+      throw new IE(`${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 && !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.");
+    throw new IE(`expressionWidth config must be positive number. Received ${T.expressionWidth} instead.`);
+  if (T.params && !LO(T.params) && console.warn('WARNING: All "params" option values should be strings.'), T.paramTypes && !_O(T.paramTypes))
+    throw new IE("Empty regex given in custom paramTypes. That would result in matching infinite amount of parameters.");
   return T;
 }
-function CO(T) {
+function LO(T) {
   return (T instanceof Array ? T : Object.values(T)).every((R) => typeof R == "string");
 }
-function LO(T) {
+function _O(T) {
   return T.custom && Array.isArray(T.custom) ? T.custom.every((E) => E.regex !== "") : !0;
 }
-var _O = function(T, E) {
+var rO = 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")
@@ -19560,7 +19646,7 @@ var _O = function(T, E) {
       E.indexOf(A[e]) < 0 && Object.prototype.propertyIsEnumerable.call(T, A[e]) && (R[A[e]] = T[A[e]]);
   return R;
 };
-const sR = {
+const tR = {
   bigquery: "bigquery",
   db2: "db2",
   db2i: "db2i",
@@ -19581,7 +19667,7 @@ const sR = {
   tsql: "transactsql",
   singlestoredb: "singlestoredb",
   snowflake: "snowflake"
-}, rO = Object.keys(sR), nO = {
+}, nO = Object.keys(tR), iO = {
   tabWidth: 2,
   useTabs: !1,
   keywordCase: "preserve",
@@ -19594,27 +19680,27 @@ const sR = {
   linesBetweenQueries: 1,
   denseOperators: !1,
   newlineBeforeSemicolon: !1
-}, iO = (T, E = {}) => {
-  if (typeof E.language == "string" && !rO.includes(E.language))
-    throw new SE(`Unsupported SQL dialect: ${E.language}`);
-  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"]);
+}, DO = (T, E = {}) => {
+  if (typeof E.language == "string" && !nO.includes(E.language))
+    throw new IE(`Unsupported SQL dialect: ${E.language}`);
+  const R = tR[E.language || "sql"];
+  return aO(T, Object.assign(Object.assign({}, E), { dialect: GI[R] }));
+}, aO = (T, E) => {
+  var { dialect: R } = E, A = rO(E, ["dialect"]);
   if (typeof T != "string")
     throw new Error("Invalid query argument. Expected string, instead got " + typeof T);
-  const e = tO(Object.assign(Object.assign({}, nO), A));
-  return new sO(VI(R), e).format(T);
+  const e = CO(Object.assign(Object.assign({}, iO), A));
+  return new tO(WI(R), e).format(T);
 };
-function aO(T) {
+function oO(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 oO() {
+function PO() {
   const T = Date.now(), E = Math.random().toString(36).substring(2, 9);
   return `${T}-${E}`;
 }
-function PO(T) {
+function MO(T) {
   const E = T.dimensions || [], R = T.timeDimensions || [], A = T.measures || [];
   return {
     sortedDimensions: E,
@@ -19639,7 +19725,7 @@ function PO(T) {
     hasMultiStage: !1
   };
 }
-function MO(T) {
+function UO(T) {
   if (T.hasExecutor()) {
     const E = T.databaseExecutor;
     if (E?.engineType)
@@ -19647,24 +19733,24 @@ function MO(T) {
   }
   return "postgres";
 }
-async function GO(T, E, R) {
+async function lO(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((r) => {
-    const I = r.split(".")[0];
-    e.add(I);
+    const O = r.split(".")[0];
+    e.add(O);
   }), T.dimensions?.forEach((r) => {
-    const I = r.split(".")[0];
-    e.add(I);
+    const O = r.split(".")[0];
+    e.add(O);
   }), T.timeDimensions?.forEach((r) => {
-    const I = r.dimension.split(".")[0];
-    e.add(I);
+    const O = r.dimension.split(".")[0];
+    e.add(O);
   }), T.filters?.forEach((r) => {
     if ("member" in r) {
-      const I = r.member.split(".")[0];
-      e.add(I);
+      const O = r.member.split(".")[0];
+      e.add(O);
     }
   });
   const S = e.size > 1;
@@ -19678,8 +19764,8 @@ async function GO(T, E, R) {
   const t = Array.from(e).map((r) => ({
     cube: r,
     query: {
-      measures: T.measures?.filter((I) => I.startsWith(r + ".")) || [],
-      dimensions: T.dimensions?.filter((I) => I.startsWith(r + ".")) || [],
+      measures: T.measures?.filter((O) => O.startsWith(r + ".")) || [],
+      dimensions: T.dimensions?.filter((O) => O.startsWith(r + ".")) || [],
       filters: T.filters || [],
       timeDimensions: T.timeDimensions || [],
       order: T.order || {},
@@ -19700,15 +19786,15 @@ async function GO(T, E, R) {
       sql: [N.sql],
       params: N.params || []
     },
-    complexity: aO(T),
+    complexity: oO(T),
     valid: !0,
     cubesUsed: Array.from(e),
     joinType: S ? "multi_cube_join" : "single_cube",
     query: T
   };
 }
-function lO(T, E, R) {
-  const A = MO(R), e = oO(), S = (/* @__PURE__ */ new Date()).toISOString(), N = PO(T);
+function cO(T, E, R) {
+  const A = UO(R), e = PO(), S = (/* @__PURE__ */ new Date()).toISOString(), N = MO(T);
   return {
     queryType: "regularQuery",
     results: [{
@@ -19734,7 +19820,7 @@ function lO(T, E, R) {
 }
 function $T(T, E) {
   try {
-    return iO(T, {
+    return DO(T, {
       language: {
         postgres: "postgresql",
         mysql: "mysql",
@@ -19750,25 +19836,25 @@ function $T(T, E) {
     return console.warn("SQL formatting failed:", R), T;
   }
 }
-function cO(T, E) {
+function uO(T, E) {
   return {
     sql: E.sql,
     params: E.params || [],
     query: T
   };
 }
-function uO(T) {
+function HO(T) {
   return {
     cubes: T
   };
 }
-function HO(T, E = 500) {
+function BO(T, E = 500) {
   return {
     error: T instanceof Error ? T.message : T,
     status: E
   };
 }
-class UO {
+class GO {
   cubes = /* @__PURE__ */ new Map();
   dbExecutor;
   metadataCache;
@@ -19886,27 +19972,27 @@ class UO {
   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 t = 0; t < R.length; t++) {
-      const r = R[t], I = E.measures[r];
+      const r = R[t], O = E.measures[r];
       e[t] = {
         name: `${E.name}.${r}`,
-        title: I.title || r,
-        shortTitle: I.title || r,
-        type: I.type,
+        title: O.title || r,
+        shortTitle: O.title || r,
+        type: O.type,
         format: void 0,
         // Measure doesn't have format field
-        description: I.description
+        description: O.description
       };
     }
     for (let t = 0; t < A.length; t++) {
-      const r = A[t], I = E.dimensions[r];
+      const r = A[t], O = E.dimensions[r];
       S[t] = {
         name: `${E.name}.${r}`,
-        title: I.title || r,
-        shortTitle: I.title || r,
-        type: I.type,
+        title: O.title || r,
+        shortTitle: O.title || r,
+        type: O.type,
         format: void 0,
         // Dimension doesn't have format field
-        description: I.description
+        description: O.description
       };
     }
     const N = [];
@@ -19916,9 +20002,9 @@ class UO {
         N.push({
           targetCube: r.name,
           relationship: t.relationship,
-          joinFields: t.on.map((I) => ({
-            sourceField: this.getColumnName(I.source),
-            targetField: this.getColumnName(I.target)
+          joinFields: t.on.map((O) => ({
+            sourceField: this.getColumnName(O.source),
+            targetField: this.getColumnName(O.target)
           }))
         });
       }
@@ -19997,10 +20083,10 @@ class UO {
    * Ensures all referenced cubes and fields exist
    */
   validateQuery(E) {
-    return tR(this.cubes, E);
+    return CR(this.cubes, E);
   }
 }
-function tR(T, E) {
+function CR(T, E) {
   const R = [], A = /* @__PURE__ */ new Set();
   if (E.measures)
     for (const e of E.measures) {
@@ -20049,17 +20135,17 @@ function tR(T, E) {
     }
   if (E.filters)
     for (const e of E.filters)
-      CR(e, T, R, A);
+      LR(e, T, R, A);
   return A.size === 0 && R.push("Query must reference at least one cube through measures, dimensions, or filters"), {
     isValid: R.length === 0,
     errors: R
   };
 }
-function CR(T, E, R, A) {
+function LR(T, E, R, A) {
   if ("and" in T || "or" in T) {
     const t = T.and || T.or || [];
     for (const r of t)
-      CR(r, E, R, A);
+      LR(r, E, R, A);
     return;
   }
   if (!("member" in T)) {
@@ -20079,12 +20165,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 UO();
+new GO();
 export {
-  UO as S,
-  uO as a,
-  cO as b,
-  HO as c,
-  lO as f,
-  GO as h
+  GO as S,
+  HO as a,
+  uO as b,
+  BO as c,
+  cO as f,
+  lO as h
 };