@malloydata/malloy 0.0.144 → 0.0.145

package/dist/dialect/trino/trino.js

@@ -325,12 +325,11 @@ ${(0, utils_1.indent)(sql)}
         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})`;
+                const civilSource = (0, malloy_types_1.mkExpr) `AT_TIMEZONE(${truncThis},'${tz}')`;
+                const 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) `AT_TIMEZONE(${civilTrunc},'${tz}')`;
+                // return mkExpr`CAST((${truncTsTz}),TIMESTAMP)`;
             }
         }
         let result = (0, malloy_types_1.mkExpr) `DATE_TRUNC('${units}', ${truncThis})`;
@@ -345,7 +344,7 @@ ${(0, utils_1.indent)(sql)}
         if (from.valueType === 'timestamp') {
             const tz = qtz(qi);
             if (tz) {
-                extractFrom = (0, malloy_types_1.mkExpr) `CAST(${extractFrom}, TIMESTAMPTZ AT TIME ZONE '${tz}')`;
+                extractFrom = (0, malloy_types_1.mkExpr) `at_timezone(${extractFrom},'${tz}')`;
             }
         }
         const extracted = (0, malloy_types_1.mkExpr) `EXTRACT(${pgUnits} FROM ${extractFrom})`;
@@ -366,14 +365,14 @@ ${(0, utils_1.indent)(sql)}
         return (0, malloy_types_1.mkExpr) `DATE_ADD('${timeframe}', ${n}, ${expr.value})`;
     }
     sqlCast(qi, cast) {
-        const op = `${cast.srcType}::${cast.dstType}`;
+        const op = `${cast.srcType}=>${cast.dstType}`;
         const tz = qtz(qi);
-        if (op === 'timestamp::date' && tz) {
-            const tstz = (0, malloy_types_1.mkExpr) `CAST(${cast.expr} as TIMESTAMPTZ)`;
+        if (op === 'timestamp=>date' && tz) {
+            const tstz = (0, malloy_types_1.mkExpr) `CAST(${cast.expr} as TIMESTAMP)`;
             return (0, malloy_types_1.mkExpr) `CAST((${tstz}) AT TIME ZONE '${tz}' AS DATE)`;
         }
-        else if (op === 'date::timestamp' && tz) {
-            return (0, malloy_types_1.mkExpr) `CAST(CAST(${cast.expr}), TIMESTAMP AT TIME ZONE '${tz}') AS TIMESTAMP)`;
+        else if (op === 'date=>timestamp' && tz) {
+            return (0, malloy_types_1.mkExpr) `CAST(CONCAT(CAST(CAST(${cast.expr} AS TIMESTAMP) AS VARCHAR), ' ${tz}') AS TIMESTAMP WITH TIME ZONE)`;
         }
         if (cast.srcType !== cast.dstType) {
             const dstType = typeof cast.dstType === 'string'
@@ -393,7 +392,7 @@ ${(0, utils_1.indent)(sql)}
         }
         const tz = timezone || qtz(qi);
         if (tz) {
-            return `TIMESTAMPTZ '${timeString} ${tz}'::TIMESTAMP`;
+            return `TIMESTAMP '${timeString} ${tz}'`;
         }
         return `TIMESTAMP '${timeString}'`;
     }

package/dist/model/malloy_query.js

@@ -696,7 +696,11 @@ class QueryField extends QueryNode {
             between = `ROWS BETWEEN ${preceding} PRECEDING AND ${following} FOLLOWING`;
         }
         const funcSQL = this.generateExpressionFromExpr(resultStruct, context, expr, state);
-        return `${funcSQL} OVER(${partitionBy} ${orderBy} ${between})`;
+        let retExpr = `${funcSQL} OVER(${partitionBy} ${orderBy} ${between})`;
+        if (isComplex) {
+            retExpr = `CASE WHEN group_set=${resultStruct.groupSet} THEN ${retExpr} END`;
+        }
+        return retExpr;
     }
     generateExpressionFromExpr(resultSet, context, e, state = new GenerateState()) {
         let s = '';

package/dist/test/index.d.ts

@@ -12,3 +12,4 @@ export declare function databasesFromEnvironmentOr(defaultDatabases: string[]):
  * return a tuple if jest.describe.skip and the dialects to be tested
  */
 export declare function describeIfDatabaseAvailable(acceptableDatabases: string[]): [jest.Describe, string[]];
+export declare function brokenIn(dialectName: string, connectionName: string): boolean;

package/dist/test/index.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describeIfDatabaseAvailable = exports.databasesFromEnvironmentOr = void 0;
+exports.brokenIn = exports.describeIfDatabaseAvailable = exports.databasesFromEnvironmentOr = void 0;
 /**
  * Accepts databases in env, either via comma-separated dialect list
  * (MALLOY_DATABASES=) or a single database (MALLOY_DATABASE=). returns either
@@ -57,4 +57,8 @@ function describeIfDatabaseAvailable(acceptableDatabases) {
     return overlap.length > 0 ? [describe, overlap] : [describeSkip, overlap];
 }
 exports.describeIfDatabaseAvailable = describeIfDatabaseAvailable;
+function brokenIn(dialectName, connectionName) {
+    return dialectName === connectionName;
+}
+exports.brokenIn = brokenIn;
 //# sourceMappingURL=index.js.map

package/package.json

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