@malloydata/render 0.0.248-dev250325232143 → 0.0.248-dev250325235002

package/dist/module/index.mjs

@@ -116767,7 +116767,12 @@ var qc = {};
         throw new Error(`Sampling is not supported on dialect ${this.name}.`);
       return l;
     }
-    sqlOrderBy(l) {
+    /**
+     * MySQL is NULLs first, all other dialects have a way to make NULLs last.
+     * isBaseOrdering is a hack to allow the MySQL dialect to partially implement
+     * NULLs last, but should go away once MySQL fully implements NULLs last.
+     */
+    sqlOrderBy(l, c) {
       return `ORDER BY ${l.join(",")}`;
     }
     sqlTzStr(l) {
@@ -117820,6 +117825,9 @@ class eJe extends VKe.Dialect {
   sqlAnyValue(e, r) {
     return `ANY_VALUE(CASE WHEN group_set=${e} THEN ${r} END)`;
   }
+  sqlOrderBy(e, r) {
+    return r === "analytical" || r === "turtle" ? `ORDER BY ${e.join(",")}` : `ORDER BY ${e.map((i) => `${i} NULLS LAST`).join(",")}`;
+  }
   // can array agg or any_value a struct...
   sqlAggregateTurtle(e, r, i, s) {
     let o = "";
@@ -120330,7 +120338,7 @@ const u0 = Xe, PJe = It, sm = qc, DW = Qc, UJe = lT, jJe = cT, qJe = {
 };
 class HJe extends sm.Dialect {
   constructor() {
-    super(...arguments), this.name = "mysql", this.defaultNumberType = "DOUBLE PRECISION", this.defaultDecimalType = "DECIMAL", this.udfPrefix = "ms_temp.__udf", this.hasFinalStage = !1, this.stringTypeName = "VARCHAR(255)", this.divisionIsInteger = !0, this.supportsSumDistinctFunction = !0, this.unnestWithNumbers = !1, this.defaultSampling = { rows: 5e4 }, this.supportUnnestArrayAgg = !0, this.supportsAggDistinct = !0, this.supportsCTEinCoorelatedSubQueries = !0, this.supportsSafeCast = !1, this.dontUnionIndex = !1, this.supportsQualify = !1, this.supportsNesting = !0, this.experimental = !1, this.supportsFullJoin = !1, this.supportsPipelinesInViews = !1, this.readsNestedData = !1, this.supportsComplexFilteredSources = !1, this.supportsArraysInData = !1, this.compoundObjectInSchema = !1, this.booleanAsNumbers = !0;
+    super(...arguments), this.name = "mysql", this.defaultNumberType = "DOUBLE PRECISION", this.defaultDecimalType = "DECIMAL", this.udfPrefix = "ms_temp.__udf", this.hasFinalStage = !1, this.stringTypeName = "VARCHAR(255)", this.divisionIsInteger = !0, this.supportsSumDistinctFunction = !0, this.unnestWithNumbers = !1, this.defaultSampling = { rows: 5e4 }, this.supportUnnestArrayAgg = !0, this.supportsAggDistinct = !0, this.supportsCTEinCoorelatedSubQueries = !0, this.supportsSafeCast = !1, this.dontUnionIndex = !1, this.supportsQualify = !1, this.supportsNesting = !0, this.experimental = !1, this.supportsFullJoin = !1, this.supportsPipelinesInViews = !1, this.readsNestedData = !1, this.supportsComplexFilteredSources = !1, this.supportsArraysInData = !1, this.compoundObjectInSchema = !1, this.booleanAsNumbers = !0, this.orderByClause = "ordinal";
   }
   malloyTypeToSQLType(e) {
     switch (e.type) {
@@ -120563,9 +120571,6 @@ $$ LANGUAGE SQL;
     }
     return e;
   }
-  sqlOrderBy(e) {
-    return `ORDER BY ${e.map((r) => `${r.trim().slice(0, r.trim().lastIndexOf(" "))} IS NULL DESC, ${r}`).join(",")}`;
-  }
   sqlLiteralString(e) {
     return "'" + e.replace(/\\/g, "\\\\").replace(/'/g, "\\'") + "'";
   }
@@ -122979,7 +122984,7 @@ let lk = class extends VXe {
             _.push(` ${R} ${b.dir || "ASC"}`);
           } else r.firstSegment.type === "project" && _.push(` ${v.fif.f.generateExpression(r)} ${b.dir || "ASC"}`);
       }
-      _.length > 0 && (m = " " + this.parent.dialect.sqlOrderBy(_));
+      _.length > 0 && (m = " " + this.parent.dialect.sqlOrderBy(_, "analytical"));
     }
     let g = "";
     if (y.between) {
@@ -123943,17 +123948,27 @@ ${(0, Sn.indent)(p)}) AS ${r.alias}
     for (const u of s)
       if (typeof u.field == "string") {
         const a = r.getField(u.field);
-        if (a && a.fieldUsage.type === "result")
-          this.parent.dialect.orderByClause === "ordinal" ? o.push(`${a.fieldUsage.resultIndex} ${u.dir || "ASC"}`) : this.parent.dialect.orderByClause === "output_name" && o.push(`${this.parent.dialect.sqlMaybeQuoteIdentifier(u.field)} ${u.dir || "ASC"}`);
-        else
+        if (a && a.fieldUsage.type === "result") {
+          if (this.parent.dialect.orderByClause === "ordinal")
+            o.push(`${a.fieldUsage.resultIndex} ${u.dir || "ASC"}`);
+          else if (this.parent.dialect.orderByClause === "output_name")
+            o.push(`${this.parent.dialect.sqlMaybeQuoteIdentifier(u.field)} ${u.dir || "ASC"}`);
+          else if (this.parent.dialect.orderByClause === "expression") {
+            const l = a.getSQL();
+            o.push(`${l} ${u.dir || "ASC"}`);
+          }
+        } else
           throw new Error(`Unknown field in ORDER BY ${u.field}`);
       } else if (this.parent.dialect.orderByClause === "ordinal")
         o.push(`${u.field} ${u.dir || "ASC"}`);
       else if (this.parent.dialect.orderByClause === "output_name") {
         const a = r.getFieldByNumber(u.field);
         o.push(`${this.parent.dialect.sqlMaybeQuoteIdentifier(a.name)} ${u.dir || "ASC"}`);
+      } else if (this.parent.dialect.orderByClause === "expression") {
+        const l = r.getFieldByNumber(u.field).fif.getSQL();
+        o.push(`${l} ${u.dir || "ASC"}`);
       }
-    return o.length > 0 && (i = this.parent.dialect.sqlOrderBy(o) + `
+    return o.length > 0 && (i = this.parent.dialect.sqlOrderBy(o, "query") + `
 `), i;
   }
   generateSimpleSQL(e) {
@@ -124212,7 +124227,7 @@ FROM ${r}
         name: g.field,
         fif: e.getField(g.field)
       } : l = e.getFieldByNumber(g.field), e.firstSegment.type === "reduce" ? a.push(" " + this.parent.dialect.sqlMaybeQuoteIdentifier(`${l.name}__${e.groupSet}`) + ` ${g.dir || "ASC"}`) : e.firstSegment.type === "project" && a.push(` ${l.fif.f.generateExpression(e)} ${g.dir || "ASC"}`);
-    a.length > 0 && (o = " " + this.parent.dialect.sqlOrderBy(a));
+    a.length > 0 && (o = " " + this.parent.dialect.sqlOrderBy(a, "turtle"));
     const f = this.buildDialectFieldList(e);
     let x, h;
     (x = e.getRepeatedResultType()) !== "nested" ? x === "inline_all_numbers" ? h = this.parent.dialect.sqlCoaleseMeasuresInline(e.groupSet, f) : h = this.parent.dialect.sqlAnyValueTurtle(e.groupSet, f) : h = this.parent.dialect.sqlAggregateTurtle(e.groupSet, f, o, u);