@malloydata/malloy 0.0.332 → 0.0.334

package/dist/lang/ast/source-elements/refined-source.js

@@ -138,7 +138,8 @@ class RefinedSource extends source_1.Source {
         fs.addAccessModifiers(thisIncludeState.modifiers);
         fs.addNotes(thisIncludeState.notes);
         const retStruct = fs.structDef();
-        const filterList = retStruct.filterList || [];
+        // Clone the filterList to avoid mutating the original source's filters
+        const filterList = retStruct.filterList ? [...retStruct.filterList] : [];
         let moreFilters = false;
         for (const filter of filters) {
             for (const el of filter.list) {

package/dist/malloy.d.ts

@@ -484,6 +484,11 @@ export declare class PreparedResult implements Taggable {
     get _sourceExploreName(): string;
     get _sourceArguments(): Record<string, Argument> | undefined;
     get _sourceFilters(): FilterCondition[];
+    /**
+     * @return Whether this result has a schema. DDL statements (INSTALL, LOAD,
+     * CREATE SECRET, etc.) do not return a schema.
+     */
+    get hasSchema(): boolean;
 }
 /**
  * A URL reader which always throws an error when a URL's contents is requested.

package/dist/malloy.js

@@ -889,6 +889,13 @@ class PreparedResult {
     get _sourceFilters() {
         return this.inner.sourceFilters || [];
     }
+    /**
+     * @return Whether this result has a schema. DDL statements (INSTALL, LOAD,
+     * CREATE SECRET, etc.) do not return a schema.
+     */
+    get hasSchema() {
+        return this.inner.structs.length > 0;
+    }
 }
 exports.PreparedResult = PreparedResult;
 /**
@@ -2432,6 +2439,14 @@ class Result extends PreparedResult {
         return this.inner.profilingUrl;
     }
     toJSON() {
+        // DDL statements (INSTALL, LOAD, CREATE SECRET, etc.) don't have a schema,
+        // so we can't call this.data.toJSON() which requires resultExplore.
+        if (!this.hasSchema) {
+            return {
+                queryResult: this.inner,
+                modelDef: this._modelDef,
+            };
+        }
         // The result rows are converted to JSON separately because they
         // may contain un-serializable data types.
         return {

package/dist/model/expression_compiler.js

@@ -280,6 +280,7 @@ function generateAppliedFilter(context, filterMatchExpr, qi) {
             break;
         case 'date':
         case 'timestamp':
+        case 'timestamptz':
             fParse = malloy_filter_1.TemporalFilterExpression.parse(filterSrc);
             break;
         default:

package/dist/model/filter_compilers.d.ts

@@ -6,7 +6,7 @@ export declare const FilterCompilers: {
     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", qi?: QueryInfo): string;
+    temporalCompile(tc: TemporalFilter, x: string, d: Dialect, t: "date" | "timestamp" | "timestamptz", qi?: QueryInfo): string;
 };
 /**
  * I felt like there was enough "helpful functions needed to make everything
@@ -16,10 +16,10 @@ export declare const FilterCompilers: {
  */
 export declare class TemporalFilterCompiler {
     readonly expr: string;
-    readonly timetype: 'timestamp' | 'date';
+    readonly timetype: 'timestamp' | 'timestamptz' | 'date';
     readonly d: Dialect;
     readonly qi: QueryInfo;
-    constructor(expr: string, dialect: Dialect, timetype?: 'timestamp' | 'date', queryInfo?: QueryInfo);
+    constructor(expr: string, dialect: Dialect, timetype?: 'timestamp' | 'timestamptz' | 'date', queryInfo?: QueryInfo);
     time(timeSQL: string): string;
     compile(tc: TemporalFilter): string;
     private expandLiteral;

package/dist/model/filter_compilers.js

@@ -47,7 +47,7 @@ exports.FilterCompilers = {
         else if (t === 'boolean' && (0, malloy_filter_1.isBooleanFilter)(c)) {
             return exports.FilterCompilers.booleanCompile(c, x, d);
         }
-        else if ((t === 'date' || t === 'timestamp') && (0, malloy_filter_1.isTemporalFilter)(c)) {
+        else if ((0, malloy_types_1.isTemporalType)(t) && (0, malloy_filter_1.isTemporalFilter)(c)) {
             return exports.FilterCompilers.temporalCompile(c, x, d, t, qi);
         }
         throw new Error('INTERNAL ERROR: No filter compiler for ' + t);

package/dist/model/query_query.js

@@ -1052,6 +1052,7 @@ class QueryQuery extends query_node_1.QueryField {
                     let orderingField;
                     const orderByDef = result.firstSegment.orderBy ||
                         result.calculateDefaultOrderBy();
+                    // Build up the ORDER BY clause from all ordering fields
                     for (const ordering of orderByDef) {
                         if (typeof ordering.field === 'string') {
                             orderingField = {
@@ -1065,31 +1066,32 @@ class QueryQuery extends query_node_1.QueryField {
                         obSQL.push(' ' +
                             this.parent.dialect.sqlMaybeQuoteIdentifier(`${orderingField.name}__${result.groupSet}`) +
                             ` ${ordering.dir || 'ASC'}`);
-                        // partition for a row number is the parent if it exists.
-                        let p = '';
-                        if (result.parent && partitionSQL[result.parent.groupSet]) {
-                            p = partitionSQL[result.parent.groupSet] + ', group_set';
-                        }
-                        else {
-                            p = 'PARTITION BY group_set';
-                        }
-                        // if this has nested data and a having, we want to partion by the 'having' so we don't count
-                        // deleted rows.
-                        if (result.hasHaving) {
-                            p = p + `, __delete__${result.groupSet}`;
-                        }
-                        limitExpressions.push(`CASE WHEN GROUP_SET=${result.groupSet} THEN
-                 ROW_NUMBER() OVER (${p} ORDER BY ${obSQL.join(',')}) END  as __row_number__${result.groupSet}`);
-                        // if the group set is a leaf, we can write a simple where clause.
-                        const filterClause = `(GROUP_SET = ${result.groupSet} AND __row_number__${result.groupSet} > ${limitValues[result.groupSet]})`;
-                        if (result.childGroups.length === 1) {
-                            limitSimpleFilters.push(filterClause);
-                        }
-                        else {
-                            // its a complex
-                            limitComplexClauses[result.groupSet] =
-                                `CASE WHEN ${filterClause} THEN 1 ELSE 0 END`;
-                        }
+                    }
+                    // partition for a row number is the parent if it exists.
+                    let p = '';
+                    if (result.parent && partitionSQL[result.parent.groupSet]) {
+                        p = partitionSQL[result.parent.groupSet] + ', group_set';
+                    }
+                    else {
+                        p = 'PARTITION BY group_set';
+                    }
+                    // if this has nested data and a having, we want to partition by the 'having' so we don't count
+                    // deleted rows.
+                    if (result.hasHaving) {
+                        p = p + `, __delete__${result.groupSet}`;
+                    }
+                    // Generate a single ROW_NUMBER() with all ORDER BY fields
+                    limitExpressions.push(`CASE WHEN GROUP_SET=${result.groupSet} THEN
+               ROW_NUMBER() OVER (${p} ORDER BY ${obSQL.join(',')}) END  as __row_number__${result.groupSet}`);
+                    // if the group set is a leaf, we can write a simple where clause.
+                    const filterClause = `(GROUP_SET = ${result.groupSet} AND __row_number__${result.groupSet} > ${limitValues[result.groupSet]})`;
+                    if (result.childGroups.length === 1) {
+                        limitSimpleFilters.push(filterClause);
+                    }
+                    else {
+                        // its a complex
+                        limitComplexClauses[result.groupSet] =
+                            `CASE WHEN ${filterClause} THEN 1 ELSE 0 END`;
                     }
                 }
             }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.332";
+export declare const MALLOY_VERSION = "0.0.334";

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.332",
+  "version": "0.0.334",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -45,9 +45,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.332",
-    "@malloydata/malloy-interfaces": "0.0.332",
-    "@malloydata/malloy-tag": "0.0.332",
+    "@malloydata/malloy-filter": "0.0.334",
+    "@malloydata/malloy-interfaces": "0.0.334",
+    "@malloydata/malloy-tag": "0.0.334",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",