@malloydata/malloy 0.0.34-dev230523182411 → 0.0.34

package/dist/lang/lib/Malloy/MalloyParserListener.d.ts

@@ -63,6 +63,7 @@ import { DefExplorePrimaryKeyContext } from "./MalloyParser";
 import { DefExploreRenameContext } from "./MalloyParser";
 import { DefExploreEditFieldContext } from "./MalloyParser";
 import { DefExploreQueryContext } from "./MalloyParser";
+import { DefExploreTimezoneContext } from "./MalloyParser";
 import { FilterByShortcutContext } from "./MalloyParser";
 import { FilterByWhereContext } from "./MalloyParser";
 import { JoinWithContext } from "./MalloyParser";
@@ -141,6 +142,7 @@ import { IndexElementContext } from "./MalloyParser";
 import { IndexFieldsContext } from "./MalloyParser";
 import { IndexStatementContext } from "./MalloyParser";
 import { SampleStatementContext } from "./MalloyParser";
+import { TimezoneStatementContext } from "./MalloyParser";
 import { SampleSpecContext } from "./MalloyParser";
 import { AggregateContext } from "./MalloyParser";
 import { MalloyTypeContext } from "./MalloyParser";
@@ -944,6 +946,18 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitDefExploreQuery?: (ctx: DefExploreQueryContext) => void;
+    /**
+     * Enter a parse tree produced by the `defExploreTimezone`
+     * labeled alternative in `MalloyParser.exploreStatement`.
+     * @param ctx the parse tree
+     */
+    enterDefExploreTimezone?: (ctx: DefExploreTimezoneContext) => void;
+    /**
+     * Exit a parse tree produced by the `defExploreTimezone`
+     * labeled alternative in `MalloyParser.exploreStatement`.
+     * @param ctx the parse tree
+     */
+    exitDefExploreTimezone?: (ctx: DefExploreTimezoneContext) => void;
     /**
      * Enter a parse tree produced by the `filterByShortcut`
      * labeled alternative in `MalloyParser.filteredBy`.
@@ -1732,6 +1746,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitSampleStatement?: (ctx: SampleStatementContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.timezoneStatement`.
+     * @param ctx the parse tree
+     */
+    enterTimezoneStatement?: (ctx: TimezoneStatementContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.timezoneStatement`.
+     * @param ctx the parse tree
+     */
+    exitTimezoneStatement?: (ctx: TimezoneStatementContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.sampleSpec`.
      * @param ctx the parse tree

package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts

@@ -63,6 +63,7 @@ import { DefExplorePrimaryKeyContext } from "./MalloyParser";
 import { DefExploreRenameContext } from "./MalloyParser";
 import { DefExploreEditFieldContext } from "./MalloyParser";
 import { DefExploreQueryContext } from "./MalloyParser";
+import { DefExploreTimezoneContext } from "./MalloyParser";
 import { FilterByShortcutContext } from "./MalloyParser";
 import { FilterByWhereContext } from "./MalloyParser";
 import { JoinWithContext } from "./MalloyParser";
@@ -141,6 +142,7 @@ import { IndexElementContext } from "./MalloyParser";
 import { IndexFieldsContext } from "./MalloyParser";
 import { IndexStatementContext } from "./MalloyParser";
 import { SampleStatementContext } from "./MalloyParser";
+import { TimezoneStatementContext } from "./MalloyParser";
 import { SampleSpecContext } from "./MalloyParser";
 import { AggregateContext } from "./MalloyParser";
 import { MalloyTypeContext } from "./MalloyParser";
@@ -627,6 +629,13 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitDefExploreQuery?: (ctx: DefExploreQueryContext) => Result;
+    /**
+     * Visit a parse tree produced by the `defExploreTimezone`
+     * labeled alternative in `MalloyParser.exploreStatement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitDefExploreTimezone?: (ctx: DefExploreTimezoneContext) => Result;
     /**
      * Visit a parse tree produced by the `filterByShortcut`
      * labeled alternative in `MalloyParser.filteredBy`.
@@ -1099,6 +1108,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitSampleStatement?: (ctx: SampleStatementContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.timezoneStatement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitTimezoneStatement?: (ctx: TimezoneStatementContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.sampleSpec`.
      * @param ctx the parse tree

package/dist/lang/malloy-to-ast.d.ts

@@ -88,6 +88,8 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitDefExplorePrimaryKey(pcx: parse.DefExplorePrimaryKeyContext): ast.PrimaryKey;
     visitFieldNameList(pcx: parse.FieldNameListContext): ast.FieldReferences;
     visitDefExploreEditField(pcx: parse.DefExploreEditFieldContext): ast.FieldListEdit;
+    visitDefExploreTimezone(cx: parse.DefExploreTimezoneContext): ast.TimezoneStatement;
+    visitTimezoneStatement(cx: parse.TimezoneStatementContext): ast.TimezoneStatement;
     visitQueryProperties(pcx: parse.QueryPropertiesContext): ast.QOPDesc;
     visitFieldPath(pcx: parse.FieldPathContext): ast.FieldReference;
     visitQueryFieldDef(pcx: parse.QueryFieldDefContext): ast.QueryItem;

package/dist/lang/malloy-to-ast.js

@@ -468,6 +468,12 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const action = pcx.ACCEPT() ? 'accept' : 'except';
         return new ast.FieldListEdit(action, this.visitFieldNameList(pcx.fieldNameList()));
     }
+    visitDefExploreTimezone(cx) {
+        return this.visitTimezoneStatement(cx.timezoneStatement());
+    }
+    visitTimezoneStatement(cx) {
+        return this.astAt(new ast.TimezoneStatement(this.stripQuotes(cx.STRING_LITERAL().text)), cx);
+    }
     visitQueryProperties(pcx) {
         const qProps = pcx
             .queryStatement()

package/dist/lang/test/parse-expects.d.ts

@@ -6,6 +6,7 @@ declare global {
             toBeErrorless(): R;
             toCompile(): R;
             modelCompiled(): R;
+            expressionCompiled(): R;
             toReturnType(tp: string): R;
             compileToFailWith(...expectedErrors: string[]): R;
             isLocationIn(at: DocumentLocation, txt: string): R;

package/dist/lang/test/parse-expects.js

@@ -116,6 +116,15 @@ expect.extend({
         x.translate();
         return checkForNeededs(x);
     },
+    expressionCompiled: function (src) {
+        const x = new test_translator_1.BetaExpression(src);
+        x.compile();
+        const errorCheck = checkForErrors(x);
+        if (!errorCheck.pass) {
+            return errorCheck;
+        }
+        return checkForNeededs(x);
+    },
     toBeErrorless: function (trans) {
         return checkForErrors(trans);
     },
@@ -135,7 +144,7 @@ expect.extend({
     },
     compileToFailWith: function (s, ...msgs) {
         var _a;
-        let emsg = 'Compile Error expectation not met\nExpected error';
+        let emsg = 'Compile Error expectation not met\nExpected message';
         let mSrc;
         const qmsgs = msgs.map(s => `error '${s}'`);
         if (msgs.length === 1) {
@@ -161,6 +170,7 @@ expect.extend({
             m = new test_translator_1.TestTranslator(src);
         }
         emsg += `\nSource:\n${src}`;
+        m.compile();
         const t = m.translate();
         if (t.translated) {
             return { pass: false, message: () => emsg };

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

@@ -533,7 +533,6 @@ describe('literals', () => {
         ['@1960-Q2', 'date', 'quarter', { literal: '1960-04-01' }],
         ['@1960-06', 'date', 'month', { literal: '1960-06-01' }],
         ['@1960-06-26-WK', 'date', 'week', { literal: '1960-06-26' }],
-        ['@1960-06-30-WK', 'date', 'week', { literal: '1960-06-26' }],
         ['@1960-06-30', 'date', 'day', { literal: '1960-06-30' }],
         ['@1960-06-30 10', 'timestamp', 'hour', { literal: '1960-06-30 10:00:00' }],
         [
@@ -560,24 +559,6 @@ describe('literals', () => {
             undefined,
             { literal: '1960-06-30 10:30:00' },
         ],
-        [
-            '@1960-06-30 10:30:00+0',
-            'timestamp',
-            undefined,
-            { literal: '1960-06-30 10:30:00', timezone: '+0' },
-        ],
-        [
-            '@1960-06-30 10:30:00-7',
-            'timestamp',
-            undefined,
-            { literal: '1960-06-30 10:30:00', timezone: '-7' },
-        ],
-        [
-            '@1960-06-30 10:30:00-00:15',
-            'timestamp',
-            undefined,
-            { literal: '1960-06-30 10:30:00', timezone: '-00:15' },
-        ],
         [
             '@1960-06-30 10:30:00[America/Los_Angeles]',
             'timestamp',
@@ -585,7 +566,6 @@ describe('literals', () => {
             {
                 literal: '1960-06-30 10:30:00',
                 timezone: 'America/Los_Angeles',
-                tzIsLocale: true,
             },
         ],
     ];
@@ -609,7 +589,7 @@ describe('literals', () => {
         ['@1960', '1960-01-01 00:00:00'],
         ['@1960-Q2', '1960-04-01 00:00:00'],
         ['@1960-06', '1960-06-01 00:00:00'],
-        ['@1960-06-30-Wk', '1960-06-26 00:00:00'],
+        ['@1960-06-26-Wk', '1960-06-26 00:00:00'],
         ['@1960-06-30', '1960-06-30 00:00:00'],
         ['@1960-06-30 00:00', undefined],
     ];
@@ -648,16 +628,16 @@ describe('expressions', () => {
             'quarter',
             'year',
         ];
-        describe('timestamp truncation', () => {
-            for (const unit of timeframes) {
-                test(`timestamp truncate ${unit}`, exprOK(`ats.${unit}`));
-            }
+        test.each(timeframes.map(x => [x]))('truncate %s', unit => {
+            expect(new test_translator_1.BetaExpression(`ats.${unit}`)).modelParsed();
         });
-        describe('timestamp difference', () => {
-            for (const unit of timeframes) {
-                // TODO expect these to error ...
-                test(`timestamp extract ${unit}`, exprOK(`${unit}(@2021 to ats)`));
-            }
+        // mtoy todo units missing: implement, or document
+        const diffable = ['second', 'minute', 'hour', 'day'];
+        test.each(diffable.map(x => [x]))('timestamp difference - %s', unit => {
+            expect(new test_translator_1.BetaExpression(`${unit}(@2021 to ats)`)).modelParsed();
+        });
+        test.each(diffable.map(x => [x]))('timestamp difference - %s', unit => {
+            expect(new test_translator_1.BetaExpression(`${unit}(ats to @2030)`)).modelParsed();
         });
     });
     test('field name', exprOK('astr'));
@@ -681,6 +661,25 @@ describe('expressions', () => {
         test('not', exprOK('not true'));
         test('and', exprOK('true and false'));
         test('or', exprOK('true or false'));
+        test('disallow date OP number', () => {
+            expect(new test_translator_1.BetaExpression('@2001 = 7')).compileToFailWith('Cannot compare a date to a number');
+        });
+        test('disallow date OP timestamp', () => {
+            expect(new test_translator_1.BetaExpression('ad = ats')).compileToFailWith('Cannot compare a date to a timestamp');
+        });
+        test('disallow interval from date to timestamp', () => {
+            expect(new test_translator_1.BetaExpression('days(ad to ats)')).compileToFailWith('Cannot measure from date to timestamp');
+        });
+        test('comparison promotes date literal to timestamp', () => {
+            expect('@2001 = ats').expressionCompiled();
+        });
+        test('can apply range to date', () => {
+            expect('ad ? @2001 for 1 day').expressionCompiled();
+        });
+        const noOffset = ['second', 'minute', 'hour'];
+        test.each(noOffset.map(x => [x]))('disallow date delta %s', unit => {
+            expect(new test_translator_1.BetaExpression(`ad + 10 ${unit}s`)).compileToFailWith(`Cannot offset date by ${unit}`);
+        });
     });
     test('filtered measure', exprOK("acount {? astr = 'why?' }"));
     describe('aggregate forms', () => {
@@ -877,13 +876,6 @@ describe('error handling', () => {
     test('query without fields', badModel('query: a -> { top: 5 }', "Can't determine query type (group_by/aggregate/nest,project,index)"));
     test("refine can't change query type", badModel('query: ab -> aturtle { project: astr }', 'project: not legal in grouping query'));
     test('undefined field ref in query', badModel('query: ab -> { aggregate: xyzzy }', "'xyzzy' is not defined"));
-    // test("queries with anonymous expressions", () => {
-    //   const m = new TestTranslator("query: a->{\n group_by: a+1\n}");
-    //   expect(m).not.modelParsed();
-    //   const errList = m.errors().errors;
-    //   const firstError = errList[0];
-    //   expect(firstError.message).toBe("Expressions in queries must have names");
-    // });
     test('query on source with errors', () => {
         expect((0, test_translator_1.markSource) `
         explore: na is a { join_one: ${'n'} on astr }

package/dist/malloy.js

@@ -25,6 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CSVWriter = exports.JSONWriter = exports.DataWriter = exports.DataRecord = exports.DataArray = exports.Result = exports.ExploreMaterializer = exports.SQLBlockMaterializer = exports.PreparedResultMaterializer = exports.QueryMaterializer = exports.ModelMaterializer = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.Runtime = exports.ExploreField = exports.JoinRelationship = exports.QueryField = exports.Query = exports.StringField = exports.UnsupportedField = exports.JSONField = exports.BooleanField = exports.NumberField = exports.TimestampField = exports.DateField = exports.TimestampTimeframe = exports.DateTimeframe = exports.AtomicField = exports.AtomicFieldType = exports.Explore = exports.SourceRelationship = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.PreparedResult = exports.DocumentCompletion = exports.DocumentSymbol = exports.DocumentPosition = exports.DocumentRange = exports.DocumentHighlight = exports.Parse = exports.parseTableURI = exports.PreparedQuery = exports.Model = exports.MalloyError = exports.Malloy = void 0;
 const lang_1 = require("./lang");
 const model_1 = require("./model");
+const luxon_1 = require("luxon");
 class Malloy {
     // TODO load from file built during release
     static get version() {
@@ -2194,25 +2195,41 @@ class DataNumber extends ScalarData {
         return this._field;
     }
 }
+function valueToDate(value) {
+    // TODO properly map the data from BQ/Postgres types
+    if (value instanceof Date) {
+        return value;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const valAsAny = value;
+    if (valAsAny.constructor.name === 'Date') {
+        // For some reason duckdb TSTZ values come back as objects which do not
+        // pass "instance of" but do seem date like.
+        return new Date(value);
+    }
+    else if (typeof value === 'number') {
+        return new Date(value);
+    }
+    else if (typeof value !== 'string') {
+        return new Date(value.value);
+    }
+    else {
+        // Postgres timestamps end up here, and ideally we would know the system
+        // timezone of the postgres instance to correctly create a Date() object
+        // which represents the same instant in time, but we don't have the data
+        // flow to implement that. This may be a problem at some future day,
+        // so here is a comment, for that day.
+        const parsed = luxon_1.DateTime.fromISO(value, { zone: 'UTC' });
+        return parsed.toJSDate();
+    }
+}
 class DataTimestamp extends ScalarData {
     constructor(value, field) {
         super(value, field);
         this._field = field;
     }
     get value() {
-        // TODO properly map the data from BQ/Postgres types
-        if (this._value instanceof Date) {
-            return this._value;
-        }
-        else if (typeof this._value === 'number') {
-            return new Date(this._value);
-        }
-        else if (typeof this._value !== 'string') {
-            return new Date(this._value.value);
-        }
-        else {
-            return new Date(this._value);
-        }
+        return valueToDate(this._value);
     }
     get field() {
         return this._field;
@@ -2224,16 +2241,7 @@ class DataDate extends ScalarData {
         this._field = field;
     }
     get value() {
-        // TODO properly map the data from BQ/Postgres types
-        if (this._value instanceof Date) {
-            return this._value;
-        }
-        else if (typeof this._value !== 'string') {
-            return new Date(this._value.value);
-        }
-        else {
-            return new Date(this._value);
-        }
+        return valueToDate(this._value);
     }
     get field() {
         return this._field;

package/dist/model/malloy_query.d.ts

@@ -2,6 +2,7 @@ import { Dialect, DialectFieldList } from '../dialect';
 import { AggregateFragment, AnalyticFragment, CompiledQuery, DialectFragment, Expr, FieldDef, FieldFragment, FieldRef, Filtered, FilterExpression, FilterFragment, JoinRelationship, ModelDef, NamedQuery, OrderBy, Parameter, ParameterFragment, PipeSegment, Query, QueryFieldDef, QuerySegment, ResultMetadataDef, ResultStructMetadataDef, SearchIndexResult, StructDef, StructRef, TurtleDef, UngroupFragment } from './malloy_types';
 import { Connection } from '../runtime_types';
 import { AndChain } from './utils';
+import { QueryInfo } from '../dialect/dialect';
 interface TurtleDefPlus extends TurtleDef, Filtered {
 }
 /** Parent from QueryStruct. */
@@ -134,6 +135,7 @@ declare class FieldInstanceResult implements FieldInstance {
     ungroupedSets: Map<string, UngroupSet>;
     resultUsesUngrouped: boolean;
     constructor(turtleDef: TurtleDef, parent: FieldInstanceResult | undefined);
+    getQueryInfo(): QueryInfo;
     addField(as: string, field: QueryField, usage: FieldUsage): void;
     parentGroupSet(): number;
     add(name: string, f: FieldInstance): void;

package/dist/model/malloy_query.js

@@ -349,7 +349,7 @@ class QueryField extends QueryNode {
         }
     }
     generateDialect(resultSet, context, expr, state) {
-        return this.generateExpressionFromExpr(resultSet, context, context.dialect.dialectExpr(expr), state);
+        return this.generateExpressionFromExpr(resultSet, context, context.dialect.dialectExpr(resultSet.getQueryInfo(), expr), state);
     }
     generateAnalyticFragment(resultStruct, context, expr, state) {
         const fields = resultStruct.getUngroupPartitions(undefined);
@@ -559,7 +559,7 @@ class QueryFieldDate extends QueryAtomicField {
             return super.generateExpression(resultSet);
         }
         else {
-            const truncated = this.parent.dialect.sqlTrunc({ value: this.getExpr(), valueType: 'date' }, fd.timeframe);
+            const truncated = this.parent.dialect.sqlTrunc(resultSet.getQueryInfo(), { value: this.getExpr(), valueType: 'date' }, fd.timeframe);
             return this.generateExpressionFromExpr(resultSet, this.parent, truncated);
         }
     }
@@ -666,9 +666,18 @@ class FieldInstanceResult {
         this.turtleDef = turtleDef;
         this.firstSegment = turtleDef.pipeline[0];
     }
+    getQueryInfo() {
+        if (!(0, malloy_types_1.isIndexSegment)(this.firstSegment)) {
+            const { queryTimezone } = this.firstSegment;
+            if (queryTimezone) {
+                return { queryTimezone };
+            }
+        }
+        return {};
+    }
     addField(as, field, usage) {
-        let fi;
-        if ((fi = this.allFields.get(as))) {
+        const fi = this.allFields.get(as);
+        if (fi) {
             if (fi.type === 'query') {
                 throw new Error(`Redefinition of field ${field.fieldDef.name} as struct`);
             }
@@ -1085,7 +1094,6 @@ class QueryTurtle extends QueryField {
  * half translated to the new world of types ..
  */
 class Segment {
-    // static nextStructDef(s: StructDef, q: AnonymousQueryDef): StructDef
     static nextStructDef(structDef, segment) {
         const qs = new QueryStruct(structDef, {
             model: new QueryModel(undefined),
@@ -1118,6 +1126,7 @@ class QueryQuery extends QueryField {
         let flatTurtleDef = parentStruct.flattenTurtleDef(fieldDef);
         let parent = parentStruct;
         const firstStage = flatTurtleDef.pipeline[0];
+        const sourceDef = parentStruct.fieldDef;
         // if we are generating code
         //  and have extended declaration, we need to make a new QueryStruct
         //  copy the definitions into a new structdef
@@ -1126,8 +1135,8 @@ class QueryQuery extends QueryField {
             (0, malloy_types_1.isQuerySegment)(firstStage) &&
             firstStage.extendSource !== undefined) {
             parent = new QueryStruct({
-                ...parentStruct.fieldDef,
-                fields: [...parentStruct.fieldDef.fields, ...firstStage.extendSource],
+                ...sourceDef,
+                fields: [...sourceDef.fields, ...firstStage.extendSource],
             }, parent.parent ? { struct: parent } : { model: parent.model });
             flatTurtleDef = {
                 ...flatTurtleDef,
@@ -1140,6 +1149,11 @@ class QueryQuery extends QueryField {
                 ],
             };
         }
+        if (sourceDef.queryTimezone &&
+            (0, malloy_types_1.isQuerySegment)(firstStage) &&
+            firstStage.queryTimezone === undefined) {
+            firstStage.queryTimezone = sourceDef.queryTimezone;
+        }
         switch (firstStage.type) {
             case 'reduce':
                 return new QueryQueryReduce(flatTurtleDef, parent, stageWriter);
@@ -1585,39 +1599,22 @@ class QueryQuery extends QueryField {
                             break;
                         case 'timestamp': {
                             const timeframe = fi.f.fieldDef.timeframe;
-                            switch (timeframe) {
-                                case 'year':
-                                case 'month':
-                                case 'week':
-                                case 'quarter':
-                                case 'day':
-                                    fields.push({
-                                        name,
-                                        type: 'date',
-                                        timeframe,
-                                        resultMetadata,
-                                        location,
-                                    });
-                                    break;
-                                case 'second':
-                                case 'minute':
-                                case 'hour':
-                                    fields.push({
-                                        name,
-                                        type: 'timestamp',
-                                        timeframe,
-                                        resultMetadata,
-                                        location,
-                                    });
-                                    break;
-                                default:
-                                    fields.push({
-                                        name,
-                                        type: 'timestamp',
-                                        resultMetadata,
-                                        location,
-                                    });
-                                    break;
+                            if (timeframe) {
+                                fields.push({
+                                    name,
+                                    type: 'timestamp',
+                                    timeframe,
+                                    resultMetadata,
+                                    location,
+                                });
+                            }
+                            else {
+                                fields.push({
+                                    name,
+                                    type: 'timestamp',
+                                    resultMetadata,
+                                    location,
+                                });
                             }
                             break;
                         }
@@ -1649,7 +1646,7 @@ class QueryQuery extends QueryField {
                 }
             }
         }
-        return {
+        const outputStruct = {
             fields,
             name: this.resultStage || 'result',
             dialect: this.parent.dialect.name,
@@ -1662,6 +1659,10 @@ class QueryQuery extends QueryField {
             resultMetadata: this.getResultMetadata(this.rootResult),
             type: 'struct',
         };
+        if ((0, malloy_types_1.isQuerySegment)(this.firstSegment) && this.firstSegment.queryTimezone) {
+            outputStruct.queryTimezone = this.firstSegment.queryTimezone;
+        }
+        return outputStruct;
     }
     generateSQLJoinBlock(stageWriter, ji) {
         let s = '';

package/dist/model/malloy_types.d.ts

@@ -196,8 +196,7 @@ export interface TimeLiteralFragment extends DialectFragmentBase {
     function: 'timeLiteral';
     literal: string;
     literalType: TimeFieldType;
-    timezone: string;
-    tzIsLocale?: boolean;
+    timezone?: string;
 }
 export interface StringLiteralFragment extends DialectFragmentBase {
     function: 'stringLiteral';
@@ -378,6 +377,7 @@ export interface QuerySegment extends Filtered {
     limit?: number;
     by?: By;
     orderBy?: OrderBy[];
+    queryTimezone?: string;
 }
 export interface TurtleDef extends NamedObject, Pipeline {
     type: 'turtle';
@@ -449,6 +449,7 @@ export interface StructDef extends NamedObject, ResultStructMetadata, Filtered {
     fields: FieldDef[];
     primaryKey?: PrimaryKeyRef;
     parameters?: Record<string, Parameter>;
+    queryTimezone?: string;
     dialect: string;
 }
 export interface SQLBlockStructDef extends StructDef {

package/package.json

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