@malloydata/malloy 0.0.11-dev221202152346 → 0.0.12-dev221202180754

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

@@ -9,7 +9,7 @@ import { AnonymousQueryContext } from "./MalloyParser";
 import { NamedSourceContext } from "./MalloyParser";
 import { TableSourceContext } from "./MalloyParser";
 import { QuerySourceContext } from "./MalloyParser";
-import { SQLSourceContext } from "./MalloyParser";
+import { SQLSourceNameContext } from "./MalloyParser";
 import { LiteralTimestampContext } from "./MalloyParser";
 import { LiteralDayContext } from "./MalloyParser";
 import { LiteralWeekContext } from "./MalloyParser";
@@ -75,7 +75,10 @@ import { ExploreKeywordContext } from "./MalloyParser";
 import { DefineQueryContext } from "./MalloyParser";
 import { TopLevelAnonQueryDefContext } from "./MalloyParser";
 import { DefineSQLStatementContext } from "./MalloyParser";
-import { SqlStatementDefContext } from "./MalloyParser";
+import { SqlBlockContext } from "./MalloyParser";
+import { BlockSQLDefContext } from "./MalloyParser";
+import { SqlStringContext } from "./MalloyParser";
+import { SqlInterpolationContext } from "./MalloyParser";
 import { ImportStatementContext } from "./MalloyParser";
 import { ImportURLContext } from "./MalloyParser";
 import { TopLevelQueryDefsContext } from "./MalloyParser";
@@ -167,7 +170,7 @@ import { JsonObjectContext } from "./MalloyParser";
 import { JsonPropertyContext } from "./MalloyParser";
 import { JsonArrayContext } from "./MalloyParser";
 import { SqlExploreNameRefContext } from "./MalloyParser";
-import { SqlCommandNameDefContext } from "./MalloyParser";
+import { NameSQLBlockContext } from "./MalloyParser";
 import { ConnectionNameContext } from "./MalloyParser";
 /**
  * This interface defines a complete listener for a parse tree produced by
@@ -295,17 +298,17 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitQuerySource?: (ctx: QuerySourceContext) => void;
     /**
-     * Enter a parse tree produced by the `SQLSource`
+     * Enter a parse tree produced by the `SQLSourceName`
      * labeled alternative in `MalloyParser.exploreSource`.
      * @param ctx the parse tree
      */
-    enterSQLSource?: (ctx: SQLSourceContext) => void;
+    enterSQLSourceName?: (ctx: SQLSourceNameContext) => void;
     /**
-     * Exit a parse tree produced by the `SQLSource`
+     * Exit a parse tree produced by the `SQLSourceName`
      * labeled alternative in `MalloyParser.exploreSource`.
      * @param ctx the parse tree
      */
-    exitSQLSource?: (ctx: SQLSourceContext) => void;
+    exitSQLSourceName?: (ctx: SQLSourceNameContext) => void;
     /**
      * Enter a parse tree produced by the `literalTimestamp`
      * labeled alternative in `MalloyParser.dateLiteral`.
@@ -1073,15 +1076,45 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitDefineSQLStatement?: (ctx: DefineSQLStatementContext) => void;
     /**
-     * Enter a parse tree produced by `MalloyParser.sqlStatementDef`.
+     * Enter a parse tree produced by `MalloyParser.sqlBlock`.
      * @param ctx the parse tree
      */
-    enterSqlStatementDef?: (ctx: SqlStatementDefContext) => void;
+    enterSqlBlock?: (ctx: SqlBlockContext) => void;
     /**
-     * Exit a parse tree produced by `MalloyParser.sqlStatementDef`.
+     * Exit a parse tree produced by `MalloyParser.sqlBlock`.
      * @param ctx the parse tree
      */
-    exitSqlStatementDef?: (ctx: SqlStatementDefContext) => void;
+    exitSqlBlock?: (ctx: SqlBlockContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.blockSQLDef`.
+     * @param ctx the parse tree
+     */
+    enterBlockSQLDef?: (ctx: BlockSQLDefContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.blockSQLDef`.
+     * @param ctx the parse tree
+     */
+    exitBlockSQLDef?: (ctx: BlockSQLDefContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.sqlString`.
+     * @param ctx the parse tree
+     */
+    enterSqlString?: (ctx: SqlStringContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.sqlString`.
+     * @param ctx the parse tree
+     */
+    exitSqlString?: (ctx: SqlStringContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.sqlInterpolation`.
+     * @param ctx the parse tree
+     */
+    enterSqlInterpolation?: (ctx: SqlInterpolationContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.sqlInterpolation`.
+     * @param ctx the parse tree
+     */
+    exitSqlInterpolation?: (ctx: SqlInterpolationContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.importStatement`.
      * @param ctx the parse tree
@@ -1993,15 +2026,15 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitSqlExploreNameRef?: (ctx: SqlExploreNameRefContext) => void;
     /**
-     * Enter a parse tree produced by `MalloyParser.sqlCommandNameDef`.
+     * Enter a parse tree produced by `MalloyParser.nameSQLBlock`.
      * @param ctx the parse tree
      */
-    enterSqlCommandNameDef?: (ctx: SqlCommandNameDefContext) => void;
+    enterNameSQLBlock?: (ctx: NameSQLBlockContext) => void;
     /**
-     * Exit a parse tree produced by `MalloyParser.sqlCommandNameDef`.
+     * Exit a parse tree produced by `MalloyParser.nameSQLBlock`.
      * @param ctx the parse tree
      */
-    exitSqlCommandNameDef?: (ctx: SqlCommandNameDefContext) => void;
+    exitNameSQLBlock?: (ctx: NameSQLBlockContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.connectionName`.
      * @param ctx the parse tree

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

@@ -9,7 +9,7 @@ import { AnonymousQueryContext } from "./MalloyParser";
 import { NamedSourceContext } from "./MalloyParser";
 import { TableSourceContext } from "./MalloyParser";
 import { QuerySourceContext } from "./MalloyParser";
-import { SQLSourceContext } from "./MalloyParser";
+import { SQLSourceNameContext } from "./MalloyParser";
 import { LiteralTimestampContext } from "./MalloyParser";
 import { LiteralDayContext } from "./MalloyParser";
 import { LiteralWeekContext } from "./MalloyParser";
@@ -75,7 +75,10 @@ import { ExploreKeywordContext } from "./MalloyParser";
 import { DefineQueryContext } from "./MalloyParser";
 import { TopLevelAnonQueryDefContext } from "./MalloyParser";
 import { DefineSQLStatementContext } from "./MalloyParser";
-import { SqlStatementDefContext } from "./MalloyParser";
+import { SqlBlockContext } from "./MalloyParser";
+import { BlockSQLDefContext } from "./MalloyParser";
+import { SqlStringContext } from "./MalloyParser";
+import { SqlInterpolationContext } from "./MalloyParser";
 import { ImportStatementContext } from "./MalloyParser";
 import { ImportURLContext } from "./MalloyParser";
 import { TopLevelQueryDefsContext } from "./MalloyParser";
@@ -167,7 +170,7 @@ import { JsonObjectContext } from "./MalloyParser";
 import { JsonPropertyContext } from "./MalloyParser";
 import { JsonArrayContext } from "./MalloyParser";
 import { SqlExploreNameRefContext } from "./MalloyParser";
-import { SqlCommandNameDefContext } from "./MalloyParser";
+import { NameSQLBlockContext } from "./MalloyParser";
 import { ConnectionNameContext } from "./MalloyParser";
 /**
  * This interface defines a complete generic visitor for a parse tree produced
@@ -248,12 +251,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitQuerySource?: (ctx: QuerySourceContext) => Result;
     /**
-     * Visit a parse tree produced by the `SQLSource`
+     * Visit a parse tree produced by the `SQLSourceName`
      * labeled alternative in `MalloyParser.exploreSource`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitSQLSource?: (ctx: SQLSourceContext) => Result;
+    visitSQLSourceName?: (ctx: SQLSourceNameContext) => Result;
     /**
      * Visit a parse tree produced by the `literalTimestamp`
      * labeled alternative in `MalloyParser.dateLiteral`.
@@ -703,11 +706,29 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitDefineSQLStatement?: (ctx: DefineSQLStatementContext) => Result;
     /**
-     * Visit a parse tree produced by `MalloyParser.sqlStatementDef`.
+     * Visit a parse tree produced by `MalloyParser.sqlBlock`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitSqlStatementDef?: (ctx: SqlStatementDefContext) => Result;
+    visitSqlBlock?: (ctx: SqlBlockContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.blockSQLDef`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitBlockSQLDef?: (ctx: BlockSQLDefContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.sqlString`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSqlString?: (ctx: SqlStringContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.sqlInterpolation`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSqlInterpolation?: (ctx: SqlInterpolationContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.importStatement`.
      * @param ctx the parse tree
@@ -1255,11 +1276,11 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitSqlExploreNameRef?: (ctx: SqlExploreNameRefContext) => Result;
     /**
-     * Visit a parse tree produced by `MalloyParser.sqlCommandNameDef`.
+     * Visit a parse tree produced by `MalloyParser.nameSQLBlock`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitSqlCommandNameDef?: (ctx: SqlCommandNameDefContext) => Result;
+    visitNameSQLBlock?: (ctx: NameSQLBlockContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.connectionName`.
      * @param ctx the parse tree

package/dist/lang/parse-malloy.d.ts

@@ -1,6 +1,6 @@
 import { Token, CommonTokenStream, ParserRuleContext, CodePointCharStream } from "antlr4ts";
 import type { ParseTree } from "antlr4ts/tree";
-import { Query, NamedStructDefs, StructDef, ModelDef, SQLBlock, DocumentReference, DocumentPosition, DocumentLocation, DocumentRange } from "../model/malloy_types";
+import { Query, NamedStructDefs, StructDef, ModelDef, SQLBlockSource, DocumentReference, DocumentPosition, DocumentLocation, DocumentRange, SQLBlockStructDef } from "../model/malloy_types";
 import * as ast from "./ast";
 import { LogMessage, MessageLog } from "./parse-log";
 import { Zone, ZoneData } from "./zone";
@@ -26,24 +26,14 @@ export interface NeedSchemaData {
 export interface NeedURLData {
     urls: string[];
 }
-/**
- * An SQL Block contains a unique key inside it, and we use that to
- * reference and define blocks, since Zone really wants keys to be strings.
- *
- * If I had SQLBlocks when Zones were defined, this would not be
- * a one off class, it would be Zone<keyType,valueType>
- */
-export declare class SQLExploreZone extends Zone<StructDef> {
-    keyed: Record<string, SQLBlock>;
-    referenceBlock(from: ast.SQLStatement, at: DocumentLocation): void;
-    getUndefinedBlocks(): SQLBlock[] | undefined;
-}
-export interface NeedSQLStruct {
-    sqlStructs: SQLBlock[];
+export interface NeedCompileSQL {
+    compileSQL: SQLBlockSource;
+    partialModel: ModelDef | undefined;
 }
-interface NeededData extends NeedURLData, NeedSchemaData, NeedSQLStruct {
+interface NeededData extends NeedURLData, NeedSchemaData, NeedCompileSQL {
 }
 export declare type DataRequestResponse = Partial<NeededData> | null;
+export declare type ModelDataRequest = NeedCompileSQL | undefined;
 interface ASTData extends ErrorResponse, NeededData, FinalResponse {
     ast: ast.MalloyElement;
 }
@@ -65,7 +55,7 @@ interface TranslatedResponseData extends NeededData, ErrorResponse, FinalRespons
     translated: {
         modelDef: ModelDef;
         queryList: Query[];
-        sqlBlocks: SQLBlock[];
+        sqlBlocks: SQLBlockStructDef[];
     };
 }
 export declare type TranslateResponse = Partial<TranslatedResponseData>;
@@ -166,7 +156,7 @@ export declare abstract class MalloyTranslation {
     childTranslators: Map<string, MalloyTranslation>;
     urlIsFullPath?: boolean;
     queryList: Query[];
-    sqlBlocks: SQLBlock[];
+    sqlBlocks: SQLBlockStructDef[];
     modelDef: ModelDef;
     readonly parseStep: ParseStep;
     readonly importsAndTablesStep: ImportsAndTablesStep;
@@ -188,6 +178,7 @@ export declare abstract class MalloyTranslation {
     errors(): ErrorResponse;
     getLineMap(url: string): string[] | undefined;
     prettyErrors(): string;
+    childRequest(importURL: string): ModelDataRequest;
     getChildExports(importURL: string): NamedStructDefs;
     private finalAnswer?;
     translate(extendingModel?: ModelDef): TranslateResponse;
@@ -218,7 +209,7 @@ export declare abstract class MalloyTranslation {
 export declare class MalloyTranslator extends MalloyTranslation {
     schemaZone: Zone<StructDef>;
     importZone: Zone<string>;
-    sqlQueryZone: SQLExploreZone;
+    sqlQueryZone: Zone<SQLBlockStructDef>;
     logger: MessageLog;
     readonly root: MalloyTranslator;
     constructor(rootURL: string, preload?: ParseUpdate | null);
@@ -227,7 +218,7 @@ export declare class MalloyTranslator extends MalloyTranslation {
 interface ErrorData {
     tables: Record<string, string>;
     urls: Record<string, string>;
-    sqlStructs: Record<string, string>;
+    compileSQL: Record<string, string>;
 }
 export interface URLData {
     urls: ZoneData<string>;
@@ -235,10 +226,10 @@ export interface URLData {
 export interface SchemaData {
     tables: ZoneData<StructDef>;
 }
-export interface SQLStructData {
-    sqlStructs: ZoneData<StructDef>;
+export interface SQLBlockData {
+    compileSQL: ZoneData<SQLBlockStructDef>;
 }
-export interface UpdateData extends URLData, SchemaData, SQLStructData {
+export interface UpdateData extends URLData, SchemaData, SQLBlockData {
     errors: Partial<ErrorData>;
 }
 export declare type ParseUpdate = Partial<UpdateData>;

package/dist/lang/parse-malloy.js

@@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MalloyTranslator = exports.MalloyTranslation = exports.SQLExploreZone = void 0;
+exports.MalloyTranslator = exports.MalloyTranslation = void 0;
 const antlr4ts_1 = require("antlr4ts");
 const MalloyLexer_1 = require("./lib/Malloy/MalloyLexer");
 const MalloyParser_1 = require("./lib/Malloy/MalloyParser");
@@ -66,34 +66,8 @@ class MalloyParserErrorHandler {
         this.messages.log(error);
     }
 }
-/**
- * An SQL Block contains a unique key inside it, and we use that to
- * reference and define blocks, since Zone really wants keys to be strings.
- *
- * If I had SQLBlocks when Zones were defined, this would not be
- * a one off class, it would be Zone<keyType,valueType>
- */
-class SQLExploreZone extends zone_1.Zone {
-    constructor() {
-        super(...arguments);
-        this.keyed = {};
-    }
-    referenceBlock(from, at) {
-        const sql = from.sqlBlock();
-        this.reference(sql.name, at);
-        this.keyed[sql.name] = sql;
-    }
-    getUndefinedBlocks() {
-        const blockRefs = this.getUndefined();
-        if (blockRefs) {
-            return blockRefs.map((ref) => this.keyed[ref]);
-        }
-        return undefined;
-    }
-}
-exports.SQLExploreZone = SQLExploreZone;
 function isNeedResponse(dr) {
-    return !!dr && (dr.tables || dr.urls || dr.sqlStructs) != undefined;
+    return !!dr && (dr.tables || dr.urls || dr.compileSQL) != undefined;
 }
 class ParseStep {
     step(that) {
@@ -332,30 +306,21 @@ class ASTStep {
             this.response = that.fatalErrors();
             return this.response;
         }
-        // Make sure there is a request/reference for all explored-sql entities
-        const sqlZone = that.root.sqlQueryZone;
-        for (const sqlExploreRef in sqlExplores) {
-            const sqlExplore = sqlExplores[sqlExploreRef];
-            if (sqlExplore.ref && sqlExplore.def) {
-                const sqlAt = {
-                    url: that.sourceURL,
-                    range: sqlExplore.def.location.range,
-                };
-                that.root.sqlQueryZone.referenceBlock(sqlExplore.def, sqlAt);
-            }
-        }
-        // Now make sure that every child also has all sql blocks resolved
+        /*
+    TODO we used to scna the AST for SQL blocks here, don't need to do that
+    becausae that happens at the translate step, but the code I need to
+    understand is how a root translate can return the need of a chiold
+    which has an SQL block ...
+    
+    */
+        // Now make sure that every child has fully translated itself
+        // before this tree is ready to also translate ...
         for (const child of that.childTranslators.values()) {
             const kidNeeds = child.astStep.step(child);
             if (isNeedResponse(kidNeeds)) {
                 return kidNeeds;
             }
         }
-        // TODO report errors from here!
-        const missingSqlStructs = sqlZone.getUndefinedBlocks();
-        if (missingSqlStructs) {
-            return { sqlStructs: missingSqlStructs };
-        }
         newAst.setTranslator(that);
         this.response = {
             ...that.errors(),
@@ -478,9 +443,19 @@ class TranslateStep {
         if (that.grammarRule === "malloyDocument") {
             if (astResponse.ast instanceof ast.Document) {
                 const doc = astResponse.ast;
-                that.modelDef = doc.getModelDef(extendingModel);
-                that.queryList = doc.queryList;
-                that.sqlBlocks = doc.sqlBlocks;
+                doc.initModelDef(extendingModel);
+                for (;;) {
+                    const docCompile = doc.compile();
+                    if (docCompile.needs) {
+                        return docCompile.needs;
+                    }
+                    else {
+                        that.modelDef = docCompile.modelDef;
+                        that.queryList = docCompile.queryList;
+                        that.sqlBlocks = docCompile.sqlBlocks;
+                        break;
+                    }
+                }
             }
             else {
                 that.root.logger.log({
@@ -604,6 +579,17 @@ class MalloyTranslation {
         }
         return lovely;
     }
+    childRequest(importURL) {
+        var _a;
+        const childURL = decodeURI(new URL(importURL, this.sourceURL).toString());
+        const ret = (_a = this.childTranslators.get(childURL)) === null || _a === void 0 ? void 0 : _a.translate();
+        if (ret === null || ret === void 0 ? void 0 : ret.compileSQL) {
+            return {
+                compileSQL: ret.compileSQL,
+                partialModel: ret.partialModel,
+            };
+        }
+    }
     getChildExports(importURL) {
         const exports = {};
         const childURL = decodeURI(new URL(importURL, this.sourceURL).toString());
@@ -711,7 +697,7 @@ class MalloyTranslator extends MalloyTranslation {
         super(rootURL);
         this.schemaZone = new zone_1.Zone();
         this.importZone = new zone_1.Zone();
-        this.sqlQueryZone = new SQLExploreZone();
+        this.sqlQueryZone = new zone_1.Zone();
         this.logger = new parse_log_1.MessageLog();
         this.root = this;
         if (preload) {
@@ -722,7 +708,7 @@ class MalloyTranslator extends MalloyTranslation {
         var _a, _b, _c;
         this.schemaZone.updateFrom(dd.tables, (_a = dd.errors) === null || _a === void 0 ? void 0 : _a.tables);
         this.importZone.updateFrom(dd.urls, (_b = dd.errors) === null || _b === void 0 ? void 0 : _b.urls);
-        this.sqlQueryZone.updateFrom(dd.sqlStructs, (_c = dd.errors) === null || _c === void 0 ? void 0 : _c.sqlStructs);
+        this.sqlQueryZone.updateFrom(dd.compileSQL, (_c = dd.errors) === null || _c === void 0 ? void 0 : _c.compileSQL);
     }
 }
 exports.MalloyTranslator = MalloyTranslator;

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

@@ -37,6 +37,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected onlyNestedQueries(els: ast.MalloyElement[]): ast.NestedQuery[];
     protected onlyQueryRefs(els: ast.MalloyElement[]): ast.QueryItem[];
     protected getNumber(term: ParseTree): number;
+    protected optionalString(fromTerm: ParseTree | undefined): string | undefined;
     protected getIdText(fromTerm: ParseTree): string;
     protected getFieldName(cx: ParserRuleContext): ast.FieldName;
     protected getModelEntryName(cx: ParserRuleContext): ast.ModelEntryReference;
@@ -51,6 +52,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected getSegments(segments: parse.PipeElementContext[]): ast.QOPDesc[];
     protected getFilterShortcut(cx: parse.FilterShortcutContext): ast.Filter;
     protected getExploreSource(pcx: parse.ExploreSourceContext): ast.Mallobj;
+    protected makeSqlString(pcx: parse.SqlStringContext, sqlStr: ast.SQLString): void;
     visitMalloyDocument(pcx: parse.MalloyDocumentContext): ast.Document;
     visitDefineExploreStatement(pcx: parse.DefineExploreStatementContext): ast.DefineSourceList | ast.DefineExplore;
     visitExploreDefinition(pcx: parse.ExploreDefinitionContext): ast.DefineExplore;
@@ -58,7 +60,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitExploreProperties(pcx: parse.ExplorePropertiesContext): ast.ExploreDesc;
     visitExploreTable(pcx: parse.ExploreTableContext): ast.TableSource;
     visitTableSource(pcx: parse.TableSourceContext): ast.TableSource;
-    visitSQLSource(pcx: parse.SQLSourceContext): ast.SQLSource;
+    visitSQLSourceName(pcx: parse.SQLSourceNameContext): ast.SQLSource;
     visitQuerySource(pcx: parse.QuerySourceContext): ast.Mallobj;
     visitDefJoinMany(pcx: parse.DefJoinManyContext): ast.Joins;
     visitDefJoinOne(pcx: parse.DefJoinOneContext): ast.Joins;
@@ -150,6 +152,5 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitImportStatement(pcx: parse.ImportStatementContext): ast.ImportStatement;
     visitJustExpr(pcx: parse.JustExprContext): ast.ExpressionDef;
     visitDefineSQLStatement(pcx: parse.DefineSQLStatementContext): ast.SQLStatement;
-    visitSQLStatementDef(pcx: parse.SqlStatementDefContext): ast.SQLStatement;
     visitSampleStatement(pcx: parse.SampleStatementContext): ast.SampleProperty;
 }

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

@@ -148,6 +148,12 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     getNumber(term) {
         return Number.parseInt(term.text);
     }
+    optionalString(fromTerm) {
+        if (fromTerm) {
+            return this.stripQuotes(fromTerm.text);
+        }
+        return undefined;
+    }
     getIdText(fromTerm) {
         return this.stripQuotes(fromTerm.text);
     }
@@ -230,6 +236,19 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         throw this.internalError(pcx, `'${element.elementType}': illegal explore source`);
     }
+    makeSqlString(pcx, sqlStr) {
+        var _a;
+        for (const part of pcx.sqlInterpolation()) {
+            const upToOpen = part.OPEN_CODE().text;
+            if (upToOpen.length > 2) {
+                sqlStr.push(upToOpen.slice(0, upToOpen.length - 2));
+            }
+            sqlStr.push(this.visit(part.query()));
+        }
+        const lastChars = (_a = pcx.SQL_END()) === null || _a === void 0 ? void 0 : _a.text.slice(0, -3);
+        sqlStr.push(lastChars || "");
+        this.astAt(sqlStr, pcx);
+    }
     visitMalloyDocument(pcx) {
         const stmts = this.onlyDocStatements(pcx.malloyStatement().map((scx) => this.visit(scx)));
         return new ast.Document(stmts);
@@ -270,7 +289,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitTableSource(pcx) {
         return this.visitExploreTable(pcx.exploreTable());
     }
-    visitSQLSource(pcx) {
+    visitSQLSourceName(pcx) {
         const name = this.getModelEntryName(pcx.sqlExploreNameRef());
         return this.astAt(new ast.SQLSource(name), pcx);
     }
@@ -914,19 +933,32 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.getFieldExpr(pcx.fieldExpr());
     }
     visitDefineSQLStatement(pcx) {
-        return this.visitSQLStatementDef(pcx.sqlStatementDef());
-    }
-    visitSQLStatementDef(pcx) {
-        const commands = pcx.SQL_STRING().text;
-        const sqlStmt = new ast.SQLStatement({
-            select: commands.slice(2, commands.length - 2),
-            connection: this.optionalText(pcx.connectionName()),
-        });
-        const nameCx = pcx.sqlCommandNameDef();
-        if (nameCx) {
-            sqlStmt.is = this.getIdText(nameCx);
+        var _a;
+        const blockName = (_a = pcx.nameSQLBlock()) === null || _a === void 0 ? void 0 : _a.text;
+        const blockParts = pcx.sqlBlock().blockSQLDef();
+        const sqlStr = new ast.SQLString();
+        let connectionName;
+        for (const blockEnt of blockParts) {
+            const nmCx = blockEnt.connectionName();
+            if (nmCx) {
+                if (connectionName) {
+                    this.contextError(nmCx, "Cannot redefine connection");
+                }
+                else {
+                    connectionName = this.getIdText(nmCx);
+                }
+            }
+            const selCx = blockEnt.sqlString();
+            if (selCx) {
+                this.makeSqlString(selCx, sqlStr);
+            }
         }
-        return this.astAt(sqlStmt, pcx);
+        const stmt = new ast.SQLStatement(sqlStr);
+        if (connectionName !== undefined) {
+            stmt.connection = connectionName;
+        }
+        stmt.is = blockName;
+        return this.astAt(stmt, pcx);
     }
     visitSampleStatement(pcx) {
         const rowCx = pcx.sampleSpec().INTEGER_LITERAL();

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

@@ -150,9 +150,9 @@ class DocumentSymbolWalker {
             parent.children.push(symbol);
         }
     }
-    enterSqlStatementDef(pcx) {
+    enterDefineSQLStatement(pcx) {
         var _a;
-        const name = (_a = pcx.sqlCommandNameDef()) === null || _a === void 0 ? void 0 : _a.id().text;
+        const name = (_a = pcx.nameSQLBlock()) === null || _a === void 0 ? void 0 : _a.text;
         const symbol = {
             range: this.translator.rangeFromContext(pcx),
             name: name || "unnamed_sql",

package/dist/lang/test/parse.spec.d.ts

@@ -1,12 +1,14 @@
+import { DocumentLocation } from "../../model";
 declare global {
     namespace jest {
         interface Matchers<R> {
-            toCompile(): R;
+            modelParsed(): R;
             toBeErrorless(): R;
-            toTranslate(): R;
+            toCompile(): R;
+            modelCompiled(): R;
             toReturnType(tp: string): R;
             compileToFailWith(...expectedErrors: string[]): R;
+            isLocationIn(at: DocumentLocation, txt: string): R;
         }
     }
 }
-export {};