@malloydata/malloy 0.0.138-dev240405133532 → 0.0.138-dev240408220220

package/dist/dialect/dialect.d.ts

@@ -51,6 +51,7 @@ export declare abstract class Dialect {
     supportsArraysInData: boolean;
     readsNestedData: boolean;
     orderByClause: OrderByClauseType;
+    nullMatchesFunctionSignature: boolean;
     abstract getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
     abstract quoteTablePath(tablePath: string): string;
     abstract sqlGroupSetTable(groupSetCount: number): string;

package/dist/dialect/dialect.js

@@ -70,6 +70,8 @@ class Dialect {
         this.readsNestedData = true;
         // ORDER BY 1 DESC
         this.orderByClause = 'ordinal';
+        // null will match in a function signature
+        this.nullMatchesFunctionSignature = true;
     }
     sqlFinalStage(_lastStageName, _fields) {
         throw new Error('Dialect has no final Stage but called Anyway');

package/dist/dialect/functions/util.d.ts

@@ -15,6 +15,7 @@ export interface DialectFunctionOverloadDef {
 }
 export declare function arg(name: string): Fragment;
 export declare function spread(f: Fragment): Fragment;
+export declare function spreadCast(f: Fragment, _destType: string): Fragment;
 /**
  * Prefer `sql` when possible.
  */

package/dist/dialect/functions/util.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.overload = exports.minAnalytic = exports.minAggregate = exports.minScalar = exports.maxAnalytic = exports.maxUngroupedAggregate = exports.anyExprType = exports.maxAggregate = exports.maxScalar = exports.makeParam = exports.param = exports.params = exports.literal = exports.output = exports.constant = exports.sql = exports.sqlFragment = exports.spread = exports.arg = void 0;
+exports.overload = exports.minAnalytic = exports.minAggregate = exports.minScalar = exports.maxAnalytic = exports.maxUngroupedAggregate = exports.anyExprType = exports.maxAggregate = exports.maxScalar = exports.makeParam = exports.param = exports.params = exports.literal = exports.output = exports.constant = exports.sql = exports.sqlFragment = exports.spreadCast = exports.spread = exports.arg = void 0;
 function arg(name) {
     return {
         type: 'function_parameter',
@@ -37,6 +37,15 @@ function spread(f) {
     };
 }
 exports.spread = spread;
+// LTABB: this doesn't work, needs to be rewriten in terms of function parameters.
+function spreadCast(f, _destType) {
+    return {
+        type: 'spread',
+        e: [f],
+        // e: ['CAST(', f, `AS ${destType})`],
+    };
+}
+exports.spreadCast = spreadCast;
 /**
  * Prefer `sql` when possible.
  */

package/dist/dialect/trino/functions/byte_length.d.ts

@@ -0,0 +1,2 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare function fnByteLength(): DialectFunctionOverloadDef[];

package/dist/dialect/trino/functions/byte_length.js

@@ -0,0 +1,33 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fnByteLength = void 0;
+const util_1 = require("../../functions/util");
+function fnByteLength() {
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('number'), [(0, util_1.param)('value', (0, util_1.anyExprType)('string'))], (0, util_1.sql) `(LENGTH(CAST(${(0, util_1.arg)('value')} AS VARBINARY)))`),
+    ];
+}
+exports.fnByteLength = fnByteLength;
+//# sourceMappingURL=byte_length.js.map

package/dist/dialect/trino/functions/concat.d.ts

@@ -0,0 +1,2 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare function fnConcat(): DialectFunctionOverloadDef[];

package/dist/dialect/trino/functions/concat.js

@@ -0,0 +1,38 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fnConcat = void 0;
+const util_1 = require("../../functions/util");
+function fnConcat() {
+    return [
+        // TODO: in DuckDB and Postgres, nulls are treated like "",
+        // but in BigQuery and Snowflake, nulls propagate and the result becomes null
+        (0, util_1.overload)((0, util_1.minScalar)('string'), [], [{ type: 'dialect', function: 'stringLiteral', literal: '' }]),
+        (0, util_1.overload)((0, util_1.minScalar)('string'), [
+            (0, util_1.params)('values', (0, util_1.anyExprType)('string'), (0, util_1.anyExprType)('number'), (0, util_1.anyExprType)('date'), (0, util_1.anyExprType)('timestamp'), (0, util_1.anyExprType)('boolean')),
+        ], (0, util_1.sql) `CONCAT(${(0, util_1.spreadCast)((0, util_1.arg)('values'), 'VARCHAR')})`),
+    ];
+}
+exports.fnConcat = fnConcat;
+//# sourceMappingURL=concat.js.map

package/dist/dialect/trino/functions/ifnull.d.ts

@@ -0,0 +1,2 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare function fnIfnull(): DialectFunctionOverloadDef[];

package/dist/dialect/trino/functions/ifnull.js

@@ -0,0 +1,40 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fnIfnull = void 0;
+const util_1 = require("../../functions/util");
+const types = [
+    'string',
+    'number',
+    'timestamp',
+    'date',
+    'json',
+];
+function fnIfnull() {
+    return types.map(type => (0, util_1.overload)((0, util_1.minScalar)(type), [(0, util_1.param)('value', (0, util_1.anyExprType)(type)), (0, util_1.param)('default', (0, util_1.anyExprType)(type))], 
+    // Postgres doesn't have an IFNULL function, so we use COALESCE, which is equivalent.
+    (0, util_1.sql) `COALESCE(${(0, util_1.arg)('value')}, ${(0, util_1.arg)('default')})`));
+}
+exports.fnIfnull = fnIfnull;
+//# sourceMappingURL=ifnull.js.map

package/dist/dialect/trino/functions/log.d.ts

@@ -0,0 +1,2 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare function fnLog(): DialectFunctionOverloadDef[];

package/dist/dialect/trino/functions/log.js

@@ -0,0 +1,37 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fnLog = void 0;
+const util_1 = require("../../functions/util");
+function fnLog() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.anyExprType)('number'));
+    const base = (0, util_1.makeParam)('base', (0, util_1.anyExprType)('number'));
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('number'), [value.param, base.param], 
+        // Snowflake take base first, then value
+        (0, util_1.sql) `LOG(${base.arg},${value.arg})`),
+    ];
+}
+exports.fnLog = fnLog;
+//# sourceMappingURL=log.js.map

package/dist/dialect/trino/functions/trino_functions.js

@@ -24,6 +24,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TRINO_FUNCTIONS = void 0;
 const functions_1 = require("../../functions");
+const trunc_1 = require("./trunc");
+const log_1 = require("./log");
+const ifnull_1 = require("./ifnull");
+const concat_1 = require("./concat");
+const byte_length_1 = require("./byte_length");
 exports.TRINO_FUNCTIONS = functions_1.FUNCTIONS.clone();
+exports.TRINO_FUNCTIONS.add('trunc', trunc_1.fnTrunc);
+exports.TRINO_FUNCTIONS.add('log', log_1.fnLog);
+exports.TRINO_FUNCTIONS.add('ifnull', ifnull_1.fnIfnull);
+exports.TRINO_FUNCTIONS.add('byte_length', byte_length_1.fnByteLength);
+exports.TRINO_FUNCTIONS.add('concat', concat_1.fnConcat);
 exports.TRINO_FUNCTIONS.seal();
 //# sourceMappingURL=trino_functions.js.map

package/dist/dialect/trino/functions/trunc.d.ts

@@ -0,0 +1,2 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare function fnTrunc(): DialectFunctionOverloadDef[];

package/dist/dialect/trino/functions/trunc.js

@@ -0,0 +1,39 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fnTrunc = void 0;
+const util_1 = require("../../functions/util");
+function fnTrunc() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.anyExprType)('number'));
+    const precision = (0, util_1.makeParam)('precision', (0, util_1.anyExprType)('number'));
+    // Trunc function doesn't exist in DuckDB, so we emulate it.
+    // For both overloads, we switch between CEIL and FLOOR based on the sign of the arugment
+    // For the overload with precision, we multiply by a power of 10 before rounding, then divide.
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('number'), [value.param], (0, util_1.sql) `CASE WHEN ${value.arg} < 0 THEN CEIL(${value.arg}) ELSE FLOOR(${value.arg}) END`),
+        (0, util_1.overload)((0, util_1.minScalar)('number'), [value.param, precision.param], (0, util_1.sql) `CASE WHEN ${value.arg} < 0 THEN CEIL(${value.arg} * POW(10, ${precision.arg})) / POW(10, ${precision.arg}) ELSE FLOOR(${value.arg} * POW(10, ${precision.arg})) / POW(10, ${precision.arg}) END`),
+    ];
+}
+exports.fnTrunc = fnTrunc;
+//# sourceMappingURL=trunc.js.map

package/dist/dialect/trino/trino.d.ts

@@ -1,4 +1,4 @@
-import { Expr, ExtractUnit, Sampling, TimeValue, TimestampUnit, TypecastFragment, FieldAtomicTypeDef, DialectFragment } from '../../model/malloy_types';
+import { Expr, ExtractUnit, Sampling, TimeValue, TimestampUnit, TypecastFragment, FieldAtomicTypeDef, DialectFragment, DateUnit, TimeFieldType } from '../../model/malloy_types';
 import { DialectFunctionOverloadDef } from '../functions';
 import { Dialect, DialectFieldList, OrderByClauseType, QueryInfo } from '../dialect';
 export declare class TrinoDialect extends Dialect {
@@ -22,6 +22,7 @@ export declare class TrinoDialect extends Dialect {
     supportsNesting: boolean;
     cantPartitionWindowFunctionsOnExpressions: boolean;
     orderByClause: OrderByClauseType;
+    nullMatchesFunctionSignature: boolean;
     quoteTablePath(tablePath: string): string;
     sqlGroupSetTable(groupSetCount: number): string;
     dialectExpr(qi: QueryInfo, df: DialectFragment): Expr;
@@ -44,12 +45,11 @@ export declare class TrinoDialect extends Dialect {
     sqlMaybeQuoteIdentifier(identifier: string): string;
     sqlNow(): Expr;
     sqlTrunc(qi: QueryInfo, sqlTime: TimeValue, units: TimestampUnit): Expr;
-    sqlExtract(qi: QueryInfo, expr: TimeValue, units: ExtractUnit): Expr;
-    sqlAlterTime(op: '+' | '-', expr: TimeValue, n: Expr, timeframe: TimestampUnit): Expr;
-    ignoreInProject(fieldName: string): boolean;
+    sqlExtract(qi: QueryInfo, from: TimeValue, units: ExtractUnit): Expr;
+    sqlAlterTime(op: '+' | '-', expr: TimeValue, n: Expr, timeframe: DateUnit): Expr;
     sqlCast(qi: QueryInfo, cast: TypecastFragment): Expr;
     sqlRegexpMatch(expr: Expr, regexp: Expr): Expr;
-    sqlLiteralTime(qi: QueryInfo, timeString: string, type: 'date' | 'timestamp', timezone: string | undefined): string;
+    sqlLiteralTime(qi: QueryInfo, timeString: string, type: TimeFieldType, timezone: string | undefined): string;
     sqlMeasureTime(from: TimeValue, to: TimeValue, units: string): Expr;
     sqlSampleTable(tableSQL: string, sample: Sampling | undefined): string;
     sqlLiteralString(literal: string): string;

package/dist/dialect/trino/trino.js

@@ -38,12 +38,9 @@ function timestampMeasureable(units) {
         'day',
     ].includes(units);
 }
-function dateMeasureable(units) {
-    return ['day', 'week', 'month', 'quarter', 'year'].includes(units);
-}
-const extractMap = {
-    'day_of_week': 'dayofweek',
-    'day_of_year': 'dayofyear',
+const pgExtractionMap = {
+    'day_of_week': 'dow',
+    'day_of_year': 'doy',
 };
 /**
  * Return a non UTC timezone, if one was specificed.
@@ -79,6 +76,7 @@ class TrinoDialect extends dialect_1.Dialect {
         this.supportsNesting = true;
         this.cantPartitionWindowFunctionsOnExpressions = false;
         this.orderByClause = 'output_name';
+        this.nullMatchesFunctionSignature = false;
         // TODO(figutierrez): update.
         this.keywords = `
   ALL
@@ -309,57 +307,66 @@ ${(0, utils_1.indent)(sql)}
         return '"' + identifier + '"';
     }
     sqlNow() {
-        return (0, malloy_types_1.mkExpr) `CURRENT_TIMESTAMP()`;
+        return (0, malloy_types_1.mkExpr) `LOCALTIMESTAMP`;
     }
     sqlTrunc(qi, sqlTime, units) {
-        const tz = qtz(qi);
-        const tzAdd = tz ? `, "${tz}"` : '';
-        if (sqlTime.valueType === 'date') {
-            if (dateMeasureable(units)) {
-                return (0, malloy_types_1.mkExpr) `DATE_TRUNC(${sqlTime.value},${units})`;
+        // adjusting for monday/sunday weeks
+        const week = units === 'week';
+        const truncThis = week
+            ? (0, malloy_types_1.mkExpr) `DATE_ADD('day', 1, ${sqlTime.value})`
+            : sqlTime.value;
+        if (sqlTime.valueType === 'timestamp') {
+            const tz = qtz(qi);
+            if (tz) {
+                const civilSource = (0, malloy_types_1.mkExpr) `CAST(${truncThis} AS TIMESTAMPTZ AT TIME ZONE '${tz}')`;
+                let civilTrunc = (0, malloy_types_1.mkExpr) `DATE_TRUNC('${units}', ${civilSource})`;
+                // MTOY todo ... only need to do this if this is a date ...
+                civilTrunc = (0, malloy_types_1.mkExpr) `CAST(${civilTrunc}, TIMESTAMP)`;
+                const truncTsTz = (0, malloy_types_1.mkExpr) `${civilTrunc} AT TIME ZONE '${tz}'`;
+                return (0, malloy_types_1.mkExpr) `CAST((${truncTsTz}),TIMESTAMP)`;
             }
-            return (0, malloy_types_1.mkExpr) `TIMESTAMP(${sqlTime.value}${tzAdd})`;
         }
-        return (0, malloy_types_1.mkExpr) `TIMESTAMP_TRUNC(${sqlTime.value},${units}${tzAdd})`;
-    }
-    sqlExtract(qi, expr, units) {
-        const extractTo = extractMap[units] || units;
-        const tz = expr.valueType === 'timestamp' && qtz(qi);
-        const tzAdd = tz ? ` AT TIME ZONE '${tz}'` : '';
-        return (0, malloy_types_1.mkExpr) `EXTRACT(${extractTo} FROM ${expr.value}${tzAdd})`;
+        let result = (0, malloy_types_1.mkExpr) `DATE_TRUNC('${units}', ${truncThis})`;
+        if (week) {
+            result = (0, malloy_types_1.mkExpr) `DATE_ADD('day',-1, ${result})`;
+        }
+        return result;
+    }
+    sqlExtract(qi, from, units) {
+        const pgUnits = pgExtractionMap[units] || units;
+        let extractFrom = from.value;
+        if (from.valueType === 'timestamp') {
+            const tz = qtz(qi);
+            if (tz) {
+                extractFrom = (0, malloy_types_1.mkExpr) `CAST(${extractFrom}, TIMESTAMPTZ AT TIME ZONE '${tz}')`;
+            }
+        }
+        const extracted = (0, malloy_types_1.mkExpr) `EXTRACT(${pgUnits} FROM ${extractFrom})`;
+        return units === 'day_of_week' ? (0, malloy_types_1.mkExpr) `(${extracted}+1)` : extracted;
     }
     sqlAlterTime(op, expr, n, timeframe) {
-        let theTime = expr.value;
-        let computeType = expr.valueType;
-        if (timeframe !== 'day' && timestampMeasureable(timeframe)) {
-            // The units must be done in timestamp, no matter the input type
-            computeType = 'timestamp';
-            if (expr.valueType !== 'timestamp') {
-                theTime = (0, malloy_types_1.mkExpr) `TIMESTAMP(${theTime})`;
-            }
+        if (timeframe === 'quarter') {
+            timeframe = 'month';
+            n = (0, malloy_types_1.mkExpr) `${n}*3`;
         }
-        else if (expr.valueType === 'timestamp') {
-            theTime = (0, malloy_types_1.mkExpr) `DATETIME(${theTime})`;
-            computeType = 'datetime';
+        if (timeframe === 'week') {
+            timeframe = 'day';
+            n = (0, malloy_types_1.mkExpr) `${n}*7`;
         }
-        const funcName = computeType.toUpperCase() + (op === '+' ? '_ADD' : '_SUB');
-        const newTime = (0, malloy_types_1.mkExpr) `${funcName}(${theTime}, INTERVAL ${n} ${timeframe})`;
-        if (computeType === expr.valueType) {
-            return newTime;
+        if (op === '-') {
+            n = (0, malloy_types_1.mkExpr) `(${n})*-1`;
         }
-        return (0, malloy_types_1.mkExpr) `${expr.valueType.toUpperCase()}(${newTime})`;
-    }
-    ignoreInProject(fieldName) {
-        return fieldName === '_PARTITIONTIME';
+        return (0, malloy_types_1.mkExpr) `DATE_ADD('${timeframe}', ${n}, ${expr.value})`;
     }
     sqlCast(qi, cast) {
         const op = `${cast.srcType}::${cast.dstType}`;
         const tz = qtz(qi);
         if (op === 'timestamp::date' && tz) {
-            return (0, malloy_types_1.mkExpr) `DATE(${cast.expr},'${tz}')`;
+            const tstz = (0, malloy_types_1.mkExpr) `CAST(${cast.expr} as TIMESTAMPTZ)`;
+            return (0, malloy_types_1.mkExpr) `CAST((${tstz}) AT TIME ZONE '${tz}' AS DATE)`;
         }
-        if (op === 'date::timestamp' && tz) {
-            return (0, malloy_types_1.mkExpr) `TIMESTAMP(${cast.expr}, '${tz}')`;
+        else if (op === 'date::timestamp' && tz) {
+            return (0, malloy_types_1.mkExpr) `CAST(CAST(${cast.expr}), TIMESTAMP AT TIME ZONE '${tz}') AS TIMESTAMP)`;
         }
         if (cast.srcType !== cast.dstType) {
             const dstType = typeof cast.dstType === 'string'
@@ -375,19 +382,13 @@ ${(0, utils_1.indent)(sql)}
     }
     sqlLiteralTime(qi, timeString, type, timezone) {
         if (type === 'date') {
-            return `DATE('${timeString}')`;
+            return `DATE '${timeString}'`;
         }
-        else if (type === 'timestamp') {
-            let timestampArgs = `'${timeString}'`;
-            const tz = timezone || qtz(qi);
-            if (tz && tz !== 'UTC') {
-                timestampArgs += `,'${tz}'`;
-            }
-            return `TIMESTAMP(${timestampArgs})`;
-        }
-        else {
-            throw new Error(`Unsupported Literal time format ${type}`);
+        const tz = timezone || qtz(qi);
+        if (tz) {
+            return `TIMESTAMPTZ '${timeString} ${tz}'::TIMESTAMP`;
         }
+        return `TIMESTAMP '${timeString}'`;
     }
     sqlMeasureTime(from, to, units) {
         const measureMap = {
@@ -410,12 +411,12 @@ ${(0, utils_1.indent)(sql)}
                 throw new Error("Can't measure difference between different types");
             }
             if (from.valueType === 'date') {
-                lVal = (0, malloy_types_1.mkExpr) `TIMESTAMP(${lVal})`;
-                rVal = (0, malloy_types_1.mkExpr) `TIMESTAMP(${rVal})`;
+                lVal = (0, malloy_types_1.mkExpr) `CAST(${lVal} AS TIMESTAMP)`;
+                rVal = (0, malloy_types_1.mkExpr) `CAST(${rVal} AS TIMESTAMP)`;
             }
-            let measured = (0, malloy_types_1.mkExpr) `TIMESTAMP_DIFF(${rVal},${lVal},${measureIn})`;
+            let measured = (0, malloy_types_1.mkExpr) `DATE_DIFF('${measureIn}',${lVal},${rVal})`;
             if (ratio !== 1) {
-                measured = (0, malloy_types_1.mkExpr) `FLOOR(${measured}/${ratio.toString()}.0)`;
+                measured = (0, malloy_types_1.mkExpr) `FLOOR(CAST(${measured} AS DOUBLE)/${ratio.toString()}.0)`;
             }
             return measured;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.138-dev240405133532",
+  "version": "0.0.138-dev240408220220",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",