@malloydata/malloy 0.0.32-dev230428002803 → 0.0.32-dev230505153727

package/dist/dialect/dialect.d.ts

@@ -59,7 +59,7 @@ export declare abstract class Dialect {
     abstract sqlRegexpMatch(expr: Expr, regex: string): Expr;
     getFunctionInfo(functionName: string): FunctionInfo | undefined;
     dialectExpr(df: DialectFragment): Expr;
-    sqlSumDistinct(_key: string, _value: string): string;
+    sqlSumDistinct(_key: string, _value: string, _funcName: string): string;
     sqlSampleTable(tableSQL: string, sample: Sampling | undefined): string;
     sqlOrderBy(orderTerms: string[]): string;
 }

package/dist/dialect/dialect.js

@@ -68,7 +68,7 @@ class Dialect {
                 return [this.sqlLiteralString(df.literal)];
         }
     }
-    sqlSumDistinct(_key, _value) {
+    sqlSumDistinct(_key, _value, _funcName) {
         return 'sqlSumDistinct called bu not implemented';
     }
     sqlSampleTable(tableSQL, sample) {

package/dist/dialect/duckdb.d.ts

@@ -45,7 +45,7 @@ export declare class DuckDBDialect extends Dialect {
     sqlCast(cast: TypecastFragment): Expr;
     sqlRegexpMatch(expr: Expr, regexp: string): Expr;
     sqlLiteralTime(timeString: string, type: TimeFieldType, _timezone: string): string;
-    sqlSumDistinct(key: string, value: string): string;
+    sqlSumDistinct(key: string, value: string, funcName: string): string;
     sqlSampleTable(tableSQL: string, sample: Sampling | undefined): string;
     sqlOrderBy(orderTerms: string[]): string;
     sqlLiteralString(literal: string): string;

package/dist/dialect/duckdb.js

@@ -321,10 +321,10 @@ class DuckDBDialect extends dialect_1.Dialect {
             throw new Error(`Unknown Literal time format ${type}`);
         }
     }
-    sqlSumDistinct(key, value) {
+    sqlSumDistinct(key, value, funcName) {
         // return `sum_distinct(list({key:${key}, val: ${value}}))`;
         return `(
-      SELECT sum(a.val) as value
+      SELECT ${funcName}(a.val) as value
       FROM (
         SELECT UNNEST(list(distinct {key:${key}, val: ${value}})) a
       )

package/dist/dialect/postgres.d.ts

@@ -45,7 +45,7 @@ export declare class PostgresDialect extends Dialect {
     sqlLiteralTime(timeString: string, type: TimeFieldType, _timezone: string): string;
     getFunctionInfo(functionName: string): FunctionInfo | undefined;
     sqlMeasureTime(from: TimeValue, to: TimeValue, units: string): Expr;
-    sqlSumDistinct(key: string, value: string): string;
+    sqlSumDistinct(key: string, value: string, funcName: string): string;
     sqlSampleTable(tableSQL: string, sample: Sampling | undefined): string;
     sqlOrderBy(orderTerms: string[]): string;
     sqlLiteralString(literal: string): string;

package/dist/dialect/postgres.js

@@ -296,10 +296,10 @@ class PostgresDialect extends dialect_1.Dialect {
         }
         throw new Error(`Unknown or unhandled postgres time unit: ${units}`);
     }
-    sqlSumDistinct(key, value) {
+    sqlSumDistinct(key, value, funcName) {
         // return `sum_distinct(list({key:${key}, val: ${value}}))`;
         return `(
-      SELECT sum((a::json->>'f2')::DOUBLE PRECISION) as value
+      SELECT ${funcName}((a::json->>'f2')::DOUBLE PRECISION) as value
       FROM (
         SELECT UNNEST(array_agg(distinct row_to_json(row(${key},${value}))::text)) a
       ) a

package/dist/model/malloy_query.js

@@ -290,7 +290,7 @@ class QueryField extends QueryNode {
         let ret;
         if (distinctKeySQL) {
             if (this.parent.dialect.supportsSumDistinctFunction) {
-                ret = this.parent.dialect.sqlSumDistinct(distinctKeySQL, dimSQL);
+                ret = this.parent.dialect.sqlSumDistinct(distinctKeySQL, dimSQL, 'SUM');
             }
             else {
                 ret = sqlSumDistinct(this.parent.dialect, dimSQL, distinctKeySQL);
@@ -318,13 +318,15 @@ class QueryField extends QueryNode {
                 countDistinctKeySQL = `CASE WHEN ${state.whereSQL} THEN ${distinctKeySQL} END`;
             }
             let sumDistinctSQL;
+            let avgDistinctSQL;
             if (this.parent.dialect.supportsSumDistinctFunction) {
-                sumDistinctSQL = this.parent.dialect.sqlSumDistinct(distinctKeySQL, dimSQL);
+                avgDistinctSQL = this.parent.dialect.sqlSumDistinct(distinctKeySQL, dimSQL, 'AVG');
             }
             else {
                 sumDistinctSQL = sqlSumDistinct(this.parent.dialect, dimSQL, distinctKeySQL);
+                avgDistinctSQL = `(${sumDistinctSQL})/NULLIF(COUNT(DISTINCT CASE WHEN ${dimSQL} IS NOT NULL THEN ${countDistinctKeySQL} END),0)`;
             }
-            return `(${sumDistinctSQL})/NULLIF(COUNT(DISTINCT ${countDistinctKeySQL}),0)`;
+            return avgDistinctSQL;
         }
         else {
             return `AVG(${dimSQL})`;
@@ -1667,7 +1669,7 @@ class QueryQuery extends QueryField {
         let structSQL = qs.structSourceSQL(stageWriter);
         if ((0, malloy_types_1.isJoinOn)(structRelationship)) {
             if (ji.makeUniqueKey) {
-                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as __distinct_key, * FROM ${structSQL})`;
+                structSQL = `(SELECT ${qs.dialect.sqlGenerateUUID()} as __distinct_key, * FROM ${structSQL} as x)`;
             }
             let onCondition = '';
             if (qs.parent === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.32-dev230428002803",
+  "version": "0.0.32-dev230505153727",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",