@malloydata/malloy 0.0.32-dev230427172247 → 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/dialect/standardsql.js

@@ -27,7 +27,7 @@ const utils_1 = require("../model/utils");
 const malloy_types_1 = require("../model/malloy_types");
 const dialect_1 = require("./dialect");
 const castMap = {
-    number: 'float64',
+    'number': 'float64',
 };
 // These are the units that "TIMESTAMP_ADD" accepts
 const timestampAddUnits = [
@@ -39,8 +39,8 @@ const timestampAddUnits = [
     'day',
 ];
 const extractMap = {
-    day_of_week: 'dayofweek',
-    day_of_year: 'dayofyear',
+    'day_of_week': 'dayofweek',
+    'day_of_year': 'dayofyear',
 };
 class StandardSQLDialect extends dialect_1.Dialect {
     constructor() {
@@ -60,10 +60,10 @@ class StandardSQLDialect extends dialect_1.Dialect {
         this.supportsQualify = true;
         // I think we want an optional list of parameters types that we force a cast to.
         this.functionInfo = {
-            timestamp_seconds: {
+            'timestamp_seconds': {
                 returnType: 'timestamp',
             },
-            concat: { returnType: 'string' },
+            'concat': { returnType: 'string' },
         };
         this.keywords = `
   ALL

package/dist/lang/ast/expressions/expr-time-extract.js

@@ -105,13 +105,13 @@ class ExprTimeExtract extends expression_def_1.ExpressionDef {
 }
 exports.ExprTimeExtract = ExprTimeExtract;
 ExprTimeExtract.pluralMap = {
-    years: 'year',
-    quarters: 'quarter',
-    months: 'month',
-    weeks: 'week',
-    days: 'day',
-    hours: 'hour',
-    minutes: 'minute',
-    seconds: 'second',
+    'years': 'year',
+    'quarters': 'quarter',
+    'months': 'month',
+    'weeks': 'week',
+    'days': 'day',
+    'hours': 'hour',
+    'minutes': 'minute',
+    'seconds': 'second',
 };
 //# sourceMappingURL=expr-time-extract.js.map

package/dist/lang/test/test-translator.js

@@ -35,7 +35,7 @@ function pretty(thing) {
 }
 exports.pretty = pretty;
 const mockSchema = {
-    aTable: {
+    'aTable': {
         type: 'struct',
         name: 'aTable',
         dialect: 'standardsql',

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/dist/model/malloy_types.js

@@ -67,51 +67,51 @@ function isUngroupFragment(f) {
 }
 exports.isUngroupFragment = isUngroupFragment;
 exports.malloyFunctions = {
-    row_number: {
+    'row_number': {
         returnType: 'number',
         parameters: 'none',
         expressionType: 'analytic',
     },
-    rank: {
+    'rank': {
         returnType: 'number',
         parameters: 'none',
         expressionType: 'analytic',
     },
-    dense_rank: {
+    'dense_rank': {
         returnType: 'number',
         parameters: 'none',
         expressionType: 'analytic',
     },
-    first_value_in_column: {
+    'first_value_in_column': {
         returnType: 'number',
         parameters: 'any',
         expressionType: 'analytic',
         sqlName: 'first_value',
     },
-    last_value_in_column: {
+    'last_value_in_column': {
         returnType: 'number',
         parameters: 'any',
         expressionType: 'analytic',
         sqlName: 'last_value',
     },
-    min_in_column: {
+    'min_in_column': {
         returnType: 'number',
         parameters: 'any',
         expressionType: 'analytic',
         sqlName: 'min',
     },
-    max_in_column: {
+    'max_in_column': {
         returnType: 'number',
         parameters: 'any',
         expressionType: 'analytic',
         sqlName: 'max',
     },
-    ntile: {
+    'ntile': {
         returnType: 'number',
         parameters: ['nconst'],
         expressionType: 'analytic',
     },
-    lag: {
+    'lag': {
         returnType: 'number',
         parameters: ['number', 'nconst'],
         expressionType: 'analytic',

package/package.json

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