@malloydata/malloy 0.0.38-dev230605182241 → 0.0.38-dev230606235314

package/dist/lang/ast/expressions/pick-when.js

@@ -29,6 +29,9 @@ const fragtype_utils_1 = require("../fragtype-utils");
 const expression_def_1 = require("../types/expression-def");
 const malloy_element_1 = require("../types/malloy-element");
 const utils_1 = require("./utils");
+function typeCoalesce(ev1, ev2) {
+    return ev1 === undefined || ev1.dataType === 'null' ? ev2 : ev1;
+}
 class Pick extends expression_def_1.ExpressionDef {
     constructor(choices, elsePick) {
         super({ choices });
@@ -65,21 +68,17 @@ class Pick extends expression_def_1.ExpressionDef {
                 ? choice.pick.getExpression(fs)
                 : expr.getExpression(fs);
             anyExpressionType = (0, malloy_types_1.maxExpressionType)(anyExpressionType, (0, malloy_types_1.maxExpressionType)(whenExpr.expressionType, thenExpr.expressionType));
-            if (returnType) {
-                if (!fragtype_utils_1.FT.typeEq(returnType, thenExpr, true)) {
-                    const whenType = fragtype_utils_1.FT.inspect(thenExpr);
-                    this.log(`pick type '${whenType}', expected '${returnType.dataType}'`);
-                    return (0, ast_utils_1.errorFor)('pick when type');
-                }
-            }
-            else {
-                returnType = thenExpr;
+            if (returnType && !fragtype_utils_1.FT.typeEq(returnType, thenExpr, true)) {
+                const whenType = fragtype_utils_1.FT.inspect(thenExpr);
+                this.log(`pick type '${whenType}', expected '${returnType.dataType}'`);
+                return (0, ast_utils_1.errorFor)('pick when type');
             }
+            returnType = typeCoalesce(returnType, thenExpr);
             caseValue.push(' WHEN ', ...whenExpr.value, ' THEN ', ...thenExpr.value);
         }
         const elsePart = this.elsePick || expr;
         const elseVal = elsePart.getExpression(fs);
-        returnType || (returnType = elseVal);
+        returnType = typeCoalesce(returnType, elseVal);
         if (!fragtype_utils_1.FT.typeEq(returnType, elseVal, true)) {
             const errSrc = this.elsePick ? 'else' : 'pick default';
             this.log(`${errSrc} type '${fragtype_utils_1.FT.inspect(elseVal)}', expected '${returnType.dataType}'`);
@@ -112,24 +111,26 @@ class Pick extends expression_def_1.ExpressionDef {
                 when: c.when.getExpression(fs),
             });
         }
-        const returnType = choiceValues[0].pick;
+        let returnType;
         const caseValue = ['CASE'];
-        let anyExpressionType = returnType.expressionType;
+        let anyExpressionType = 'scalar';
         for (const aChoice of choiceValues) {
             if (!fragtype_utils_1.FT.typeEq(aChoice.when, fragtype_utils_1.FT.boolT)) {
                 this.log(`when expression must be boolean, not '${fragtype_utils_1.FT.inspect(aChoice.when)}`);
                 return (0, ast_utils_1.errorFor)('pick when type');
             }
-            if (!fragtype_utils_1.FT.typeEq(returnType, aChoice.pick, true)) {
+            if (returnType && !fragtype_utils_1.FT.typeEq(returnType, aChoice.pick, true)) {
                 const whenType = fragtype_utils_1.FT.inspect(aChoice.pick);
                 this.log(`pick type '${whenType}', expected '${returnType.dataType}'`);
                 return (0, ast_utils_1.errorFor)('pick value type');
             }
+            returnType = typeCoalesce(returnType, aChoice.pick);
             anyExpressionType = (0, malloy_types_1.maxExpressionType)(anyExpressionType, (0, malloy_types_1.maxExpressionType)(aChoice.pick.expressionType, aChoice.when.expressionType));
             caseValue.push(' WHEN ', ...aChoice.when.value, ' THEN ', ...aChoice.pick.value);
         }
         const defVal = this.elsePick.getExpression(fs);
         anyExpressionType = (0, malloy_types_1.maxExpressionType)(anyExpressionType, defVal.expressionType);
+        returnType = typeCoalesce(returnType, defVal);
         if (!fragtype_utils_1.FT.typeEq(returnType, defVal, true)) {
             this.elsePick.log(`else type '${fragtype_utils_1.FT.inspect(defVal)}', expected '${returnType.dataType}'`);
             return (0, ast_utils_1.errorFor)('pick value type mismatch');

package/dist/lang/test/parse.spec.js

@@ -37,6 +37,14 @@ function exprOK(s) {
         return undefined;
     };
 }
+function exprType(s, t) {
+    return () => {
+        const expr = new test_translator_1.BetaExpression(s);
+        expect(expr).modelParsed();
+        expect(expr.generated().dataType).toBe(t);
+        return undefined;
+    };
+}
 function modelOK(s) {
     return () => {
         const m = new test_translator_1.TestTranslator(s);
@@ -720,6 +728,9 @@ describe('expressions', () => {
         test('filtering', exprOK(`
         astr ? pick 'missing value' when NULL
     `));
+        test('null branch with else', exprType("astr ? pick null when = '42' else 3", 'number'));
+        test('null branch no else', exprType("astr ? pick null when = '42'", 'string'));
+        test('null branch no apply', exprType('pick null when 1 = 1 else 3', 'number'));
         test('tiering', exprOK(`
       ai ?
         pick 1 when < 10

package/dist/malloy.d.ts

@@ -397,6 +397,10 @@ export declare class PreparedResult {
      */
     get resultExplore(): Explore;
     get sourceExplore(): Explore;
+    /**
+     * @return The query timezone.
+     */
+    get queryTimezone(): string | undefined;
     get _sourceExploreName(): string;
     get _sourceFilters(): FilterExpression[];
 }

package/dist/malloy.js

@@ -224,6 +224,7 @@ class Malloy {
                 // TODO feature-sql-block There is no source explore...
                 sourceExplore: '',
                 sourceFilters: [],
+                queryTimezone: sqlStruct.queryTimezone,
             }, {
                 name: 'empty_model',
                 exports: [],
@@ -725,6 +726,12 @@ class PreparedResult {
         }
         throw new Error(`'${name} is not an explore`);
     }
+    /**
+     * @return The query timezone.
+     */
+    get queryTimezone() {
+        return this.inner.queryTimezone;
+    }
     get _sourceExploreName() {
         return this.inner.sourceExplore;
     }

package/dist/model/malloy_types.d.ts

@@ -519,6 +519,7 @@ export interface CompiledQuery extends DrillSource {
     malloy: string;
     queryName?: string | undefined;
     connectionName: string;
+    queryTimezone?: string;
 }
 /** Result type for running a Malloy query. */
 export interface QueryResult extends CompiledQuery {

package/package.json

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