@malloydata/malloy 0.0.130-dev240311192728 → 0.0.130-dev240311202005

package/dist/dialect/snowflake/functions/string_agg.js

@@ -27,20 +27,28 @@ const util_1 = require("../../functions/util");
 function fnStringAgg() {
     const value = (0, util_1.makeParam)('value', (0, util_1.maxScalar)('string'));
     const separator = (0, util_1.makeParam)('separator', (0, util_1.literal)((0, util_1.maxScalar)('string')));
-    const orderBy = { type: 'aggregate_order_by' };
+    const orderBy = {
+        type: 'aggregate_order_by',
+        prefix: ' WITHIN GROUP(',
+        suffix: ')',
+    };
     return [
-        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param], (0, util_1.sql) `LISTAGG(${value.arg}, ',') WITHIN GROUP(${orderBy})`, { supportsOrderBy: true, supportsLimit: false }),
-        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param, separator.param], (0, util_1.sql) `LISTAGG(${value.arg}, ${separator.arg}) WITHIN GROUP(${orderBy})`, { supportsOrderBy: true, supportsLimit: false }),
+        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param], (0, util_1.sql) `LISTAGG(${value.arg}, ',')${orderBy}`, { supportsOrderBy: true, supportsLimit: false }),
+        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param, separator.param], (0, util_1.sql) `LISTAGG(${value.arg}, ${separator.arg})${orderBy}`, { supportsOrderBy: true, supportsLimit: false }),
     ];
 }
 exports.fnStringAgg = fnStringAgg;
 function fnStringAggDistinct() {
     const value = (0, util_1.makeParam)('value', (0, util_1.maxScalar)('string'));
     const separator = (0, util_1.makeParam)('separator', (0, util_1.literal)((0, util_1.maxScalar)('string')));
-    const orderBy = { type: 'aggregate_order_by' };
+    const orderBy = {
+        type: 'aggregate_order_by',
+        prefix: ' WITHIN GROUP(',
+        suffix: ')',
+    };
     return [
-        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param], (0, util_1.sql) `LISTAGG(DISTINCT ${value.arg}, ',') WITHIN GROUP(${orderBy})`, { supportsOrderBy: true, supportsLimit: false }),
-        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param, separator.param], (0, util_1.sql) `LISTAGG(DISTINCT ${value.arg}, ${separator.arg}) WITHIN GROUP(${orderBy})`, { supportsOrderBy: true, supportsLimit: false }),
+        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param], (0, util_1.sql) `LISTAGG(DISTINCT ${value.arg}, ',')${orderBy}`, { supportsOrderBy: true, supportsLimit: false }),
+        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param, separator.param], (0, util_1.sql) `LISTAGG(DISTINCT ${value.arg}, ${separator.arg})${orderBy}`, { supportsOrderBy: true, supportsLimit: false }),
     ];
 }
 exports.fnStringAggDistinct = fnStringAggDistinct;

package/dist/model/malloy_query.js

@@ -258,6 +258,7 @@ class QueryField extends QueryNode {
             throw new Error(`Function is not defined for dialect ${dialect}`);
         }
         return (0, utils_1.exprMap)(overload.dialect[dialect].e, fragment => {
+            var _a, _b;
             if (typeof fragment === 'string') {
                 return [fragment];
             }
@@ -290,7 +291,9 @@ class QueryField extends QueryNode {
                 }
             }
             else if (fragment.type === 'aggregate_order_by') {
-                return orderBy ? [` ${orderBy}`] : [];
+                return orderBy
+                    ? [` ${(_a = fragment.prefix) !== null && _a !== void 0 ? _a : ''}${orderBy}${(_b = fragment.suffix) !== null && _b !== void 0 ? _b : ''}`]
+                    : [];
             }
             else if (fragment.type === 'aggregate_limit') {
                 return limit ? [` ${limit}`] : [];
@@ -345,7 +348,8 @@ class QueryField extends QueryNode {
         const aggregateLimit = frag.limit ? `LIMIT ${frag.limit}` : undefined;
         if (frag.name === 'string_agg' &&
             distinctKey &&
-            !context.dialect.supportsAggDistinct) {
+            !context.dialect.supportsAggDistinct &&
+            context.dialect.name !== 'snowflake') {
             return this.generateAsymmetricStringAggExpression(resultSet, context, args[0], args[1], distinctKey, frag.orderBy, context.dialect.name, state);
         }
         if (distinctKey) {
@@ -650,6 +654,7 @@ class QueryField extends QueryNode {
                 }
                 if (resultStruct.firstSegment.type === 'reduce') {
                     const orderSQL = orderingField.fif.getAnalyticalSQL(false);
+                    // const orderSQL = this.generateDimFragment(resultSet, context, arg, state)
                     obSQL.push(` ${orderSQL} ${ordering.dir || 'ASC'}`);
                 }
                 else if (resultStruct.firstSegment.type === 'project') {
@@ -1143,6 +1148,11 @@ class FieldInstanceResult {
         for (const [_name, fi] of this.allFields) {
             if (fi instanceof FieldInstanceField) {
                 if (fi.fieldUsage.type === 'result') {
+                    if (fi.f.fieldDef.type === 'turtle' ||
+                        fi.f.fieldDef.type === 'struct' ||
+                        (0, malloy_types_1.expressionIsAnalytic)(fi.f.fieldDef.expressionType)) {
+                        continue;
+                    }
                     firstField || (firstField = fi.fieldUsage.resultIndex);
                     if (['date', 'timestamp'].indexOf(fi.f.fieldDef.type) > -1) {
                         return [{ dir: 'desc', field: fi.fieldUsage.resultIndex }];
@@ -2157,7 +2167,18 @@ class QueryQuery extends QueryField {
       `);
     }
     generateStage0Fields(resultSet, output, stageWriter) {
+        const scalarFields = [];
+        const otherFields = [];
         for (const [name, fi] of resultSet.allFields) {
+            if (fi instanceof FieldInstanceField && isScalarField(fi.f)) {
+                scalarFields.push([name, fi]);
+            }
+            else {
+                otherFields.push([name, fi]);
+            }
+        }
+        const orderedFields = [...scalarFields, ...otherFields];
+        for (const [name, fi] of orderedFields) {
             const outputName = this.parent.dialect.sqlMaybeQuoteIdentifier(`${name}__${resultSet.groupSet}`);
             if (fi instanceof FieldInstanceField) {
                 if (fi.fieldUsage.type === 'result') {

package/dist/model/malloy_types.d.ts

@@ -126,6 +126,8 @@ export interface FunctionParameterFragment {
 export declare function isFunctionParameterFragment(f: Fragment): f is FunctionParameterFragment;
 export interface AggregateOrderByFragment {
     type: 'aggregate_order_by';
+    prefix?: string;
+    suffix?: string;
 }
 export interface AggregateLimitFragment {
     type: 'aggregate_limit';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.130-dev240311192728",
+  "version": "0.0.130-dev240311202005",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",