@malloydata/malloy 0.0.12 → 0.0.13-dev221205193434

package/dist/lang/ast/ast-main.d.ts

@@ -299,6 +299,7 @@ export declare class Document extends MalloyElement implements NameSpace {
     queryList: model.Query[];
     sqlBlocks: model.SQLBlockStructDef[];
     statements: RunList;
+    didInitModel: boolean;
     constructor(statements: DocStatement[]);
     initModelDef(extendingModelDef: model.ModelDef | undefined): void;
     compile(): DocumentCompileResult;

package/dist/lang/ast/ast-main.js

@@ -1408,10 +1408,14 @@ class Document extends MalloyElement {
         this.documentModel = {};
         this.queryList = [];
         this.sqlBlocks = [];
+        this.didInitModel = false;
         this.statements = new RunList("topLevelStatements", statements);
         this.has({ statements });
     }
     initModelDef(extendingModelDef) {
+        if (this.didInitModel) {
+            return;
+        }
         this.documentModel = {};
         this.queryList = [];
         this.sqlBlocks = [];
@@ -1424,6 +1428,7 @@ class Document extends MalloyElement {
                 }
             }
         }
+        this.didInitModel = true;
     }
     compile() {
         const needs = this.statements.executeList(this);

package/dist/lang/test/parse.spec.js

@@ -1174,6 +1174,22 @@ describe("sql:", () => {
             expect(where).toEqual({ sql: " WHERE 1=1" });
         }
     });
+    it("model preserved", () => {
+        const selStmt = "SELECT * FROM aTable";
+        const shouldBeOK = `
+      source: newa is a
+      sql: someSql is { select: """${selStmt}""" }
+      source: newaa is newa
+    `;
+        const model = new BetaModel(shouldBeOK);
+        expect(model).modelParsed();
+        const needReq = model.translate();
+        const needs = needReq === null || needReq === void 0 ? void 0 : needReq.compileSQL;
+        expect(needs).toBeDefined();
+        const sql = (0, sql_block_1.makeSQLBlock)([{ sql: selStmt }]);
+        model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
+        expect(model).modelCompiled();
+    });
 });
 describe("error handling", () => {
     test("field and query with same name does not overflow", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.12",
+  "version": "0.0.13-dev221205193434",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",