@malloydata/malloy 0.0.16-dev221216125519 → 0.0.16-dev221217002701

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/package.json

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