@malloydata/malloy 0.0.310 → 0.0.311

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

@@ -124,7 +124,7 @@ import { AccessModifierListContext } from "./MalloyParser";
 import { DefMeasuresContext } from "./MalloyParser";
 import { DefDimensionsContext } from "./MalloyParser";
 import { RenameListContext } from "./MalloyParser";
-import { ExploreRenameDefContext } from "./MalloyParser";
+import { RenameEntryContext } from "./MalloyParser";
 import { DefListContext } from "./MalloyParser";
 import { FieldDefContext } from "./MalloyParser";
 import { FieldNameDefContext } from "./MalloyParser";
@@ -1666,15 +1666,15 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitRenameList?: (ctx: RenameListContext) => void;
     /**
-     * Enter a parse tree produced by `MalloyParser.exploreRenameDef`.
+     * Enter a parse tree produced by `MalloyParser.renameEntry`.
      * @param ctx the parse tree
      */
-    enterExploreRenameDef?: (ctx: ExploreRenameDefContext) => void;
+    enterRenameEntry?: (ctx: RenameEntryContext) => void;
     /**
-     * Exit a parse tree produced by `MalloyParser.exploreRenameDef`.
+     * Exit a parse tree produced by `MalloyParser.renameEntry`.
      * @param ctx the parse tree
      */
-    exitExploreRenameDef?: (ctx: ExploreRenameDefContext) => void;
+    exitRenameEntry?: (ctx: RenameEntryContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.defList`.
      * @param ctx the parse tree

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

@@ -124,7 +124,7 @@ import { AccessModifierListContext } from "./MalloyParser";
 import { DefMeasuresContext } from "./MalloyParser";
 import { DefDimensionsContext } from "./MalloyParser";
 import { RenameListContext } from "./MalloyParser";
-import { ExploreRenameDefContext } from "./MalloyParser";
+import { RenameEntryContext } from "./MalloyParser";
 import { DefListContext } from "./MalloyParser";
 import { FieldDefContext } from "./MalloyParser";
 import { FieldNameDefContext } from "./MalloyParser";
@@ -1085,11 +1085,11 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitRenameList?: (ctx: RenameListContext) => Result;
     /**
-     * Visit a parse tree produced by `MalloyParser.exploreRenameDef`.
+     * Visit a parse tree produced by `MalloyParser.renameEntry`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitExploreRenameDef?: (ctx: ExploreRenameDefContext) => Result;
+    visitRenameEntry?: (ctx: RenameEntryContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.defList`.
      * @param ctx the parse tree

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

@@ -112,7 +112,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     getAccessLabelProp(pcx: parse.AccessLabelPropContext | undefined): AccessModifierLabel | undefined;
     visitDefMeasures(pcx: parse.DefMeasuresContext): ast.Measures;
     visitQueryExtend(pcx: parse.QueryExtendContext): ast.ExtendBlock;
-    visitExploreRenameDef(pcx: parse.ExploreRenameDefContext): ast.RenameField;
+    visitRenameEntry(pcx: parse.RenameEntryContext): ast.RenameField;
     visitDefExploreRename(pcx: parse.DefExploreRenameContext): ast.Renames;
     visitFilterClauseList(pcx: parse.FilterClauseListContext): ast.Filter;
     visitDrillClauseList(pcx: parse.FilterClauseListContext): ast.Drill;

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

@@ -526,17 +526,21 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const el = new ast.ExtendBlock(extensions);
         return this.astAt(el, pcx);
     }
-    visitExploreRenameDef(pcx) {
+    visitRenameEntry(pcx) {
         const newName = pcx.fieldName(0);
         const oldName = pcx.fieldName(1);
         const rename = new ast.RenameField((0, parse_utils_1.getId)(newName), this.getFieldName(oldName));
+        const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
+        rename.extendNote({ notes });
         return this.astAt(rename, pcx);
     }
     visitDefExploreRename(pcx) {
         const accessLabel = this.getAccessLabel(pcx.accessLabel());
-        const rcxs = pcx.renameList().exploreRenameDef();
-        const renames = rcxs.map(rcx => this.visitExploreRenameDef(rcx));
+        const rcxs = pcx.renameList().renameEntry();
+        const renames = rcxs.map(rcx => this.visitRenameEntry(rcx));
         const stmt = new ast.Renames(renames, accessLabel);
+        const blockNotes = this.getNotes(pcx.tags());
+        stmt.extendNote({ blockNotes });
         return this.astAt(stmt, pcx);
     }
     visitFilterClauseList(pcx) {

package/dist/lang/parse-tree-walkers/document-symbol-walker.js

@@ -202,7 +202,7 @@ class DocumentSymbolWalker {
             parent.children.push(symbol);
         }
     }
-    enterExploreRenameDef(pcx) {
+    enterRenameEntry(pcx) {
         const symbol = {
             range: this.translator.rangeFromContext(pcx),
             name: pcx.fieldName()[0].text,

package/dist/model/filter_compilers.js

@@ -73,10 +73,12 @@ exports.FilterCompilers = {
             case '>':
             case '<':
             case '>=':
-            case '<=':
+            case '<=': {
+                const op = nc.not ? invertCompare(nc.operator) : nc.operator;
                 return nc.values
-                    .map(v => `${x} ${nc.operator} ${v}`)
+                    .map(v => `${x} ${op} ${v}`)
                     .join(nc.not ? ' AND ' : ' OR ');
+            }
             case 'range': {
                 let startOp = nc.startOperator;
                 let endOp = nc.endOperator;
@@ -103,14 +105,16 @@ exports.FilterCompilers = {
     },
     booleanCompile(bc, x, _d) {
         switch (bc.operator) {
+            case 'true':
+                return bc.not ? `NOT COALESCE(${x}, false)` : `COALESCE(${x}, false)`;
             case 'false':
-                return `${x} = false`;
+                return bc.not
+                    ? `COALESCE(${x} != false, true)`
+                    : `COALESCE(${x} = false, false)`;
             case 'false_or_null':
-                return `${x} IS NULL OR ${x} = false`;
+                return bc.not ? `COALESCE(${x}, false)` : `NOT COALESCE(${x}, false)`;
             case 'null':
                 return bc.not ? `${x} IS NOT NULL` : `${x} IS NULL`;
-            case 'true':
-                return x;
         }
     },
     stringCompile(sc, x, d) {
@@ -166,7 +170,7 @@ exports.FilterCompilers = {
             }
             case 'or': {
                 const clauses = sc.members.map(c => exports.FilterCompilers.stringCompile(c, x, d));
-                return clauses.join(' AND ');
+                return clauses.join(' OR ');
             }
             case ',': {
                 /*

package/dist/model/malloy_types.d.ts

@@ -975,6 +975,7 @@ export interface PrepareResultOptions {
     replaceMaterializedReferences?: boolean;
     materializedTablePrefix?: string;
     defaultRowLimit?: number;
+    isPartialQuery?: boolean;
 }
 type UTD = AtomicTypeDef | TypedDef | FunctionParameterTypeDef | FunctionReturnTypeDef | undefined;
 /**

package/dist/model/query_model_impl.js

@@ -73,8 +73,14 @@ class QueryModelImpl {
     loadQuery(query, stageWriter, prepareResultOptions, emitFinalStage = false, isJoinedSubquery = false) {
         var _a;
         const malloy = '';
+        const structRef = (_a = query.compositeResolvedSourceDef) !== null && _a !== void 0 ? _a : query.structRef;
+        const queryStruct = this.getStructFromRef(structRef, query.sourceArguments, prepareResultOptions);
+        // If this query is being written as part of a SQL block don't use CTE (WITH ...)
+        const noCTE = prepareResultOptions &&
+            prepareResultOptions.isPartialQuery &&
+            queryStruct.dialect.name !== 'postgres'; // postgres does weird stuff with final stages that won't work here.
         if (!stageWriter) {
-            stageWriter = new stage_writer_1.StageWriter(true, undefined);
+            stageWriter = new stage_writer_1.StageWriter(!noCTE, undefined);
         }
         const turtleDef = {
             type: 'turtle',
@@ -82,8 +88,7 @@ class QueryModelImpl {
             pipeline: query.pipeline,
             filterList: query.filterList,
         };
-        const structRef = (_a = query.compositeResolvedSourceDef) !== null && _a !== void 0 ? _a : query.structRef;
-        const q = query_query_1.QueryQuery.makeQuery(turtleDef, this.getStructFromRef(structRef, query.sourceArguments, prepareResultOptions), stageWriter, isJoinedSubquery, (name) => this.structs.get(name));
+        const q = query_query_1.QueryQuery.makeQuery(turtleDef, queryStruct, stageWriter, isJoinedSubquery, (name) => this.structs.get(name));
         const ret = q.generateSQLFromPipeline(stageWriter);
         if (emitFinalStage && q.parent.dialect.hasFinalStage) {
             // const fieldNames: string[] = [];
@@ -102,6 +107,7 @@ class QueryModelImpl {
             // );
             ret.lastStageName = stageWriter.addStage(q.parent.dialect.sqlFinalStage(ret.lastStageName, fieldNames));
         }
+        // console.log('---', stageWriter.combineStages(true).sql, '---');
         return {
             lastStageName: ret.lastStageName,
             malloy,

package/dist/model/sql_block.js

@@ -46,8 +46,10 @@ function compileSQLInterpolation(select, connection, partialModel) {
             }
             const compiledSql = queryModel.compileQuery(segment, {
                 defaultRowLimit: undefined,
+                isPartialQuery: true,
             }, false).sql;
             selectStr += parenAlready ? compiledSql : `(${compiledSql})`;
+            // console.log(selectStr);
             parenAlready = false;
         }
     }

package/dist/model/stage_writer.d.ts

@@ -3,12 +3,15 @@ import type { QueryToMaterialize, StructDef, Query } from './malloy_types';
 export declare class StageWriter {
     parent: StageWriter | undefined;
     withs: string[];
+    stageNames: string[];
     udfs: string[];
     pdts: string[];
     dependenciesToMaterialize: Record<string, QueryToMaterialize>;
     stagePrefix: string;
     useCTE: boolean;
+    stageNumber: number;
     constructor(useCTE: boolean | undefined, parent: StageWriter | undefined);
+    private nextName;
     getName(id: number): string;
     root(): StageWriter;
     addStage(sql: string): string;

package/dist/model/stage_writer.js

@@ -11,14 +11,20 @@ class StageWriter {
     constructor(useCTE = true, parent) {
         this.parent = parent;
         this.withs = [];
+        this.stageNames = [];
         this.udfs = [];
         this.pdts = [];
         this.dependenciesToMaterialize = {};
         this.stagePrefix = '__stage';
+        this.stageNumber = 0;
         this.useCTE = useCTE;
     }
+    nextName() {
+        const stageName = `${this.stagePrefix}${this.root().stageNumber++}`;
+        return stageName;
+    }
     getName(id) {
-        return `${this.stagePrefix}${id}`;
+        return this.stageNames[id];
     }
     root() {
         if (this.parent === undefined) {
@@ -31,7 +37,9 @@ class StageWriter {
     addStage(sql) {
         if (this.useCTE) {
             this.withs.push(sql);
-            return this.getName(this.withs.length - 1);
+            const stageName = this.nextName();
+            this.stageNames.push(stageName);
+            return stageName;
         }
         else {
             this.withs[0] = sql;
@@ -102,7 +110,7 @@ class StageWriter {
         }
         const udfs = this.udfs.join('\n');
         const pdts = this.pdts.join('\n');
-        const sql = this.combineStages(false).sql;
+        const sql = this.useCTE ? this.combineStages(false).sql : '';
         return udfs + pdts + sql + this.withs[lastStageNum];
     }
     generateCoorelatedSubQuery(dialect, structDef) {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.310";
+export declare const MALLOY_VERSION = "0.0.311";

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

package/package.json

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