@malloydata/malloy 0.0.313 → 0.0.315

package/dist/dialect/mysql/mysql.js

@@ -291,25 +291,33 @@ class MySQLDialect extends dialect_1.Dialect {
     sqlNowExpr() {
         return 'LOCALTIMESTAMP';
     }
-    // truncToUnit(sql, unit: string): string {
-    //   return `EXTRACT(${unit} FROM ${sql})`;
-    // }
     sqlTruncExpr(qi, trunc) {
-        // LTNOTE: how come this can be undefined?
-        let truncThis = trunc.e.sql || 'why could this be undefined';
-        if (trunc.units === 'week') {
-            truncThis = `DATE_SUB(${truncThis}, INTERVAL DAYOFWEEK(${truncThis}) - 1 DAY)`;
-        }
+        const truncThis = trunc.e.sql || 'internal-error-in-sql-generation';
+        const week = trunc.units === 'week';
+        // Only do timezone conversion for timestamps, not dates
         if (malloy_types_1.TD.isTimestamp(trunc.e.typeDef)) {
             const tz = (0, dialect_1.qtz)(qi);
             if (tz) {
+                // Convert timestamp to the query timezone (civil time)
                 const civilSource = `(CONVERT_TZ(${truncThis}, 'UTC','${tz}'))`;
-                const civilTrunc = `${this.truncToUnit(civilSource, trunc.units)}`;
+                // For week truncation, we need to adjust to Sunday in the civil timezone
+                // DAYOFWEEK returns 1=Sunday, 2=Monday, etc., so subtract (DAYOFWEEK-1) days
+                const adjustedSource = week
+                    ? `DATE_SUB(${civilSource}, INTERVAL DAYOFWEEK(${civilSource}) - 1 DAY)`
+                    : civilSource;
+                // Truncate to the appropriate unit in civil time
+                const civilTrunc = `${this.truncToUnit(adjustedSource, trunc.units)}`;
+                // Convert the truncated civil time back to UTC
                 const truncTsTz = `CONVERT_TZ(${civilTrunc}, '${tz}', 'UTC')`;
                 return `(${truncTsTz})`; // TODO: should it cast?
             }
         }
-        const result = `${this.truncToUnit(truncThis, trunc.units)}`;
+        // For dates (civil time) or timestamps without query timezone
+        // do the week adjustment before truncating
+        const adjustedThis = week
+            ? `DATE_SUB(${truncThis}, INTERVAL DAYOFWEEK(${truncThis}) - 1 DAY)`
+            : truncThis;
+        const result = `${this.truncToUnit(adjustedThis, trunc.units)}`;
         return result;
     }
     truncToUnit(expr, units) {

package/dist/dialect/pg_impl.js

@@ -27,7 +27,7 @@ class PostgresBase extends dialect_1.Dialect {
             const tz = (0, dialect_1.qtz)(qi);
             if (tz) {
                 // get a civil version of the time in the query time zone
-                const civilSource = `(${truncThis}::TIMESTAMPTZ AT TIME ZONE '${tz}')`;
+                const civilSource = `((${truncThis})::TIMESTAMPTZ AT TIME ZONE '${tz}')`;
                 // do truncation in that time space
                 let civilTrunc = `DATE_TRUNC('${df.units}', ${civilSource})`;
                 if (week) {

package/dist/lang/malloy-to-stable-query.js

@@ -160,7 +160,9 @@ class MalloyToQuery extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor
     visitRunStatement(pcx) {
         const defCx = pcx.topLevelAnonQueryDef();
         const definition = this.getQueryDefinition(defCx.sqExpr());
-        const annotations = this.getAnnotations(pcx.topLevelAnonQueryDef().tags());
+        const runAnnotations = this.getAnnotations(pcx.tags());
+        const defAnnotations = this.getAnnotations(pcx.topLevelAnonQueryDef().tags());
+        const annotations = this.combineAnnotations(runAnnotations, defAnnotations);
         if (definition !== null) {
             return {
                 annotations,

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.313";
+export declare const MALLOY_VERSION = "0.0.315";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.313';
+exports.MALLOY_VERSION = '0.0.315';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.313",
+  "version": "0.0.315",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.313",
-    "@malloydata/malloy-interfaces": "0.0.313",
-    "@malloydata/malloy-tag": "0.0.313",
+    "@malloydata/malloy-filter": "0.0.315",
+    "@malloydata/malloy-interfaces": "0.0.315",
+    "@malloydata/malloy-tag": "0.0.315",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",