@malloydata/malloy 0.0.312 → 0.0.313

package/dist/dialect/mysql/mysql.js

@@ -231,10 +231,10 @@ class MySQLDialect extends dialect_1.Dialect {
     }
     sqlSumDistinct(key, value, funcName) {
         const sqlDistinctKey = `CONCAT(${key}, '')`;
-        const upperPart = `CAST(CONV(SUBSTRING(MD5(${sqlDistinctKey}), 1, 16), 16, 10) AS DECIMAL(65, 0)) * 4294967296`;
-        const lowerPart = `CAST(CONV(SUBSTRING(MD5(${sqlDistinctKey}), 16, 8), 16, 10) AS DECIMAL(65, 0))`;
+        const upperPart = `CAST(CONV(SUBSTRING(MD5(${sqlDistinctKey}), 1, 16), 16, 10) AS DECIMAL(55, 10)) * 4294967296`;
+        const lowerPart = `CAST(CONV(SUBSTRING(MD5(${sqlDistinctKey}), 16, 8), 16, 10) AS DECIMAL(55, 10))`;
         const hashkey = `(${upperPart} + ${lowerPart})`;
-        const v = `COALESCE(${value},0)`;
+        const v = `CAST(COALESCE(${value},0) as DECIMAL(55, 10))`;
         const sqlSum = `(SUM(DISTINCT ${hashkey} + ${v}) - SUM(DISTINCT ${hashkey}))`;
         if (funcName === 'SUM') {
             return sqlSum;

package/dist/model/expression_compiler.js

@@ -212,14 +212,14 @@ function exprToSQL(resultSet, context, exprToTranslate, state = new utils_1.Gene
         case 'compositeField':
             return '{COMPOSITE_FIELD}';
         case 'filterMatch':
-            return generateAppliedFilter(context, expr);
+            return generateAppliedFilter(context, expr, qi);
         case 'filterLiteral':
             return 'INTERNAL ERROR FILTER EXPRESSION VALUE SHOULD NOT BE USED';
         default:
             throw new Error(`Internal Error: Unknown expression node '${expr.node}' ${JSON.stringify(expr, undefined, 2)}`);
     }
 }
-function generateAppliedFilter(context, filterMatchExpr) {
+function generateAppliedFilter(context, filterMatchExpr, qi) {
     var _a;
     let filterExpr = filterMatchExpr.kids.filterExpr;
     while (filterExpr.node === '()') {
@@ -261,7 +261,7 @@ function generateAppliedFilter(context, filterMatchExpr) {
     if (fParse.log.length > 0) {
         throw new Error(`Filter expression parse error: ${fParse.log[0]}`);
     }
-    return filter_compilers_1.FilterCompilers.compile(filterMatchExpr.dataType, fParse.parsed, filterMatchExpr.kids.expr.sql || '', context.dialect);
+    return filter_compilers_1.FilterCompilers.compile(filterMatchExpr.dataType, fParse.parsed, filterMatchExpr.kids.expr.sql || '', context.dialect, qi);
 }
 // Helper functions for generateFunctionCallExpression
 function getParameterMap(overload, numArgs) {

package/dist/model/filter_compilers.d.ts

@@ -1,11 +1,11 @@
 import type { BooleanFilter, FilterExpression, NumberFilter, StringFilter, TemporalFilter } from '@malloydata/malloy-filter';
-import type { Dialect } from '../dialect';
+import type { Dialect, QueryInfo } from '../dialect';
 export declare const FilterCompilers: {
-    compile(t: string, c: FilterExpression | null, x: string, d: Dialect): string;
+    compile(t: string, c: FilterExpression | null, x: string, d: Dialect, qi?: QueryInfo): string;
     numberCompile(nc: NumberFilter, x: string, d: Dialect): string;
     booleanCompile(bc: BooleanFilter, x: string, _d: Dialect): string;
     stringCompile(sc: StringFilter, x: string, d: Dialect): string;
-    temporalCompile(tc: TemporalFilter, x: string, d: Dialect, t: "date" | "timestamp"): string;
+    temporalCompile(tc: TemporalFilter, x: string, d: Dialect, t: "date" | "timestamp", qi?: QueryInfo): string;
 };
 /**
  * I felt like there was enough "helpful functions needed to make everything
@@ -17,7 +17,8 @@ export declare class TemporalFilterCompiler {
     readonly expr: string;
     readonly timetype: 'timestamp' | 'date';
     readonly d: Dialect;
-    constructor(expr: string, dialect: Dialect, timetype?: 'timestamp' | 'date');
+    readonly qi: QueryInfo;
+    constructor(expr: string, dialect: Dialect, timetype?: 'timestamp' | 'date', queryInfo?: QueryInfo);
     time(timeSQL: string): string;
     compile(tc: TemporalFilter): string;
     private expandLiteral;

package/dist/model/filter_compilers.js

@@ -37,7 +37,7 @@ function unlike(disLiked, x) {
  * XXXXFilterCompiler.compile() will move to XXXFilterExpression.compile()
  */
 exports.FilterCompilers = {
-    compile(t, c, x, d) {
+    compile(t, c, x, d, qi = {}) {
         if (c === null) {
             return 'true';
         }
@@ -51,7 +51,7 @@ exports.FilterCompilers = {
             return exports.FilterCompilers.booleanCompile(c, x, d);
         }
         else if ((t === 'date' || t === 'timestamp') && (0, malloy_filter_1.isTemporalFilter)(c)) {
-            return exports.FilterCompilers.temporalCompile(c, x, d, t);
+            return exports.FilterCompilers.temporalCompile(c, x, d, t, qi);
         }
         throw new Error('INTERNAL ERROR: No filter compiler for ' + t);
     },
@@ -251,8 +251,8 @@ exports.FilterCompilers = {
         }
     },
     // mtoy todo figure out what to do about dates
-    temporalCompile(tc, x, d, t) {
-        const c = new TemporalFilterCompiler(x, d, t);
+    temporalCompile(tc, x, d, t, qi = {}) {
+        const c = new TemporalFilterCompiler(x, d, t, qi);
         return c.compile(tc);
     },
 };
@@ -269,10 +269,11 @@ const fTimestamp = `${fMinute}:ss`;
  * a dialect as an argument?
  */
 class TemporalFilterCompiler {
-    constructor(expr, dialect, timetype = 'timestamp') {
+    constructor(expr, dialect, timetype = 'timestamp', queryInfo = {}) {
         this.expr = expr;
         this.timetype = timetype;
         this.d = dialect;
+        this.qi = queryInfo;
     }
     time(timeSQL) {
         if (this.timetype === 'timestamp') {
@@ -430,7 +431,10 @@ class TemporalFilterCompiler {
             typeDef: { type: 'timestamp' },
             literal,
         };
-        return { ...literalNode, sql: this.d.sqlLiteralTime({}, literalNode) };
+        if (this.qi.queryTimezone) {
+            literalNode.timezone = this.qi.queryTimezone;
+        }
+        return { ...literalNode, sql: this.d.sqlLiteralTime(this.qi, literalNode) };
     }
     nowExpr() {
         return {
@@ -460,7 +464,7 @@ class TemporalFilterCompiler {
             e: (0, malloy_types_1.mkTemporal)(e, 'timestamp'),
             units: 'day_of_week',
         };
-        return { ...t, sql: this.d.sqlTimeExtractExpr({}, t) };
+        return { ...t, sql: this.d.sqlTimeExtractExpr(this.qi, t) };
     }
     nowDot(units) {
         const nowTruncExpr = {
@@ -468,7 +472,7 @@ class TemporalFilterCompiler {
             e: this.nowExpr(),
             units,
         };
-        return { ...nowTruncExpr, sql: this.d.sqlTruncExpr({}, nowTruncExpr) };
+        return { ...nowTruncExpr, sql: this.d.sqlTruncExpr(this.qi, nowTruncExpr) };
     }
     thisUnit(units) {
         const thisUnit = this.nowDot(units);
@@ -562,17 +566,24 @@ class TemporalFilterCompiler {
         const destDayZeroBased = destDay - 1;
         // dow is 1-7, convert to 0-6 for the arithmetic
         const dowZeroBased = `(${dow.sql}-1)`;
-        let daysOffset;
+        let beginOffset;
+        let endOffset;
+        // "dayname" and "last dayname" both refer to the most recent,
+        // already complete day of that name. So if today is Sunday,
+        // "next sunday" is "today", and "last sunday" is 7 days ago.
         if (direction === 'next') {
-            // Days forward: ((destDay - dow + 6) % 7) + 1
-            daysOffset = `${this.mod7(`${destDayZeroBased}-${dowZeroBased}+6`)}+1`;
+            // Days forward: ((destDay - currentDay + 6) % 7) + 1
+            beginOffset = `${this.mod7(`${destDayZeroBased}-${dowZeroBased}+6`)}+1`;
+            endOffset = `${this.mod7(`${destDayZeroBased}-${dowZeroBased}+6`)}+2`;
         }
         else {
-            // Days back: ((dow - destDay + 6) % 7) + 1
-            daysOffset = `${this.mod7(`${dowZeroBased}-${destDayZeroBased}+6`)}+1`;
+            // Days back: ((currentDay - destDay + 6) % 7) + 1
+            beginOffset = `${this.mod7(`${dowZeroBased}-${destDayZeroBased}+6`)}+1`;
+            // End offset is one day less (closer to today)
+            endOffset = `${this.mod7(`${dowZeroBased}-${destDayZeroBased}+6`)}`;
         }
-        const begin = this.delta(todayBegin, direction === 'next' ? '+' : '-', daysOffset, 'day');
-        const end = this.delta(begin, '+', '1', 'day');
+        const begin = this.delta(todayBegin, direction === 'next' ? '+' : '-', beginOffset, 'day');
+        const end = this.delta(todayBegin, direction === 'next' ? '+' : '-', endOffset, 'day');
         return { begin, end: end.sql };
     }
 }

package/dist/version.d.ts

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

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.312';
+exports.MALLOY_VERSION = '0.0.313';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.312",
+  "version": "0.0.313",
   "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.312",
-    "@malloydata/malloy-interfaces": "0.0.312",
-    "@malloydata/malloy-tag": "0.0.312",
+    "@malloydata/malloy-filter": "0.0.313",
+    "@malloydata/malloy-interfaces": "0.0.313",
+    "@malloydata/malloy-tag": "0.0.313",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",