@malloydata/malloy 0.0.16-dev221216150223 → 0.0.16-dev221220164559

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

@@ -2140,7 +2140,8 @@ class SQLStatement extends MalloyElement {
         sqlDefEntry.reference(sql.name, this.location);
         const lookup = sqlDefEntry.getEntry(sql.name);
         if (lookup.status == "error") {
-            this.select.log(`'Schema error: ${lookup.message}`);
+            const msgLines = lookup.message.split(/\r?\n/);
+            this.select.log("Invalid SQL, " + msgLines.join("\n    "));
             return undefined;
         }
         if (lookup.status == "present") {

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

@@ -1280,6 +1280,22 @@ describe("error handling", () => {
     test("popping out of embedding when not embedded", () => {
         expect("}%").compileToFailWith("extraneous input '}%' expecting {<EOF>, EXPLORE, QUERY, SOURCE, SQL, IMPORT, ';'}");
     });
+    test("bad sql in sql block", () => {
+        const badModel = new BetaModel(`sql: { select: """)""" }`);
+        expect(badModel).modelParsed();
+        const needSchema = badModel.translate();
+        expect(needSchema.compileSQL).toBeDefined();
+        if (needSchema.compileSQL) {
+            badModel.update({
+                errors: {
+                    compileSQL: {
+                        [needSchema.compileSQL.name]: "ZZZZ",
+                    },
+                },
+            });
+        }
+        expect(badModel).compileToFailWith("Invalid SQL, ZZZZ");
+    });
 });
 function getSelectOneStruct(sqlBlock) {
     const selectThis = sqlBlock.select[0];

package/dist/model/malloy_query.d.ts

@@ -215,7 +215,7 @@ declare class QueryQuery extends QueryField {
     static makeQuery(fieldDef: TurtleDef, parentStruct: QueryStruct, stageWriter?: StageWriter | undefined): QueryQuery;
     getFieldList(): QueryFieldDef[];
     expandField(f: QueryFieldDef): {
-        as: string;
+        as: any;
         field: QuerySomething;
     };
     expandDependantField(resultStruct: FieldInstanceResult, fieldRef: FieldRef): void;
@@ -247,10 +247,7 @@ declare class QueryQuery extends QueryField {
     generateTurtleSQL(resultStruct: FieldInstanceResult, stageWriter: StageWriter, sqlFieldName: string, outputPipelinedSQL: OutputPipelinedSQL[]): string;
     generateTurtlePipelineSQL(fi: FieldInstanceResult, stageWriter: StageWriter, sourceSQLExpression: string): {
         structDef: StructDef;
-        pipeOut: {
-            lastStageName: string;
-            outputStruct: StructDef;
-        } | undefined;
+        pipeOut: any;
     };
     generateComplexSQL(stageWriter: StageWriter): string;
     generateSQL(stageWriter: StageWriter): string;
@@ -286,7 +283,7 @@ declare class QueryStruct extends QueryNode {
     getJoinableParent(): QueryStruct;
     addFieldToNameMap(as: string, n: QuerySomething): void;
     /** the the primary key or throw an error. */
-    getPrimaryKeyField(fieldDef: FieldDef): QueryAtomicField;
+    getPrimaryKeyField(fieldDef: FieldDef): any;
     /**
      * called after all structure has been loaded.  Examine this structure to see
      * if if it is based on a query and if it is, add the output fields (unless

package/package.json

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