@malloydata/malloy 0.0.56-dev230710162623 → 0.0.56-dev230710182711

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

@@ -179,7 +179,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         if (multiLineStr) {
             for (const part of (0, parse_utils_1.getStringParts)(multiLineStr)) {
                 if (part instanceof antlr4ts_1.ParserRuleContext) {
-                    this.contextError(part, '%{ query }% illegal in this string');
+                    this.contextError(part, '%{ query } illegal in this string');
                 }
                 else {
                     safeParts.push(part);

package/dist/lang/test/sql-block.spec.js

@@ -128,10 +128,10 @@ describe('sql:', () => {
         model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
         expect(model).toTranslate();
     });
-    it('turducken', () => {
+    it('simple turducken', () => {
         const m = new test_translator_1.TestTranslator(`
       sql: someSql is {
-        select: """SELECT * FROM %{ a -> { group_by: astr } }% WHERE 1=1"""
+        select: """SELECT * FROM %{ a -> { group_by: astr } } WHERE 1=1"""
       }
     `);
         expect(m).toParse();
@@ -146,6 +146,56 @@ describe('sql:', () => {
             expect(where).toEqual({ sql: ' WHERE 1=1' });
         }
     });
+    it('old style ', () => {
+        const m = new test_translator_1.TestTranslator(`
+      sql: someSql is {
+        select: """SELECT * FROM %{ a -> { group_by: astr } } WHERE 1=1"""
+      }
+    `);
+        expect(m).toParse();
+        const compileSql = m.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            const select = compileSql.select[0];
+            const star = compileSql.select[1];
+            const where = compileSql.select[2];
+            expect(select).toEqual({ sql: 'SELECT * FROM ' });
+            expect((0, model_1.isSQLFragment)(star)).toBeFalsy();
+            expect(where).toEqual({ sql: ' WHERE 1=1' });
+        }
+    });
+    it('turduckenzilla', () => {
+        const m = new test_translator_1.TestTranslator(`
+      run: duckdb.sql("""
+        SELECT * from (%{
+          duckdb.sql("""SELECT 2 as two""") {
+            query: b is {
+              nest: c is {
+                extend: {
+                  join_one: d is duckdb.sql("""
+                    SELECT * from (%{
+                      duckdb.sql("""SELECT 3 as three""") {
+                        query: b is {
+                          nest: c is {
+                            extend: {
+                              join_one: d is duckdb.sql("""SELECT 4 as four""") on three = d.four - 1
+                            }
+                            group_by: three
+                          }
+                        }
+                      } -> { group_by: three }
+                    })
+                  """) on two = d.three
+                }
+                group_by: two
+              }
+            }
+          } -> { group_by: two }
+        })
+      """) -> { group_by: two }
+    `);
+        expect(m).toParse();
+    });
     it('model preserved', () => {
         const shouldBeOK = `
       source: newa is a

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

@@ -101,7 +101,7 @@ describe('string parsing in language', () => {
         expect(m).toParse();
     });
     test('timezone with illegal query', () => {
-        expect(`run: a->{timezone: """${tz}%{ab->aturtle}%"""; project: *}`).translationToFailWith('%{ query }% illegal in this string');
+        expect(`run: a->{timezone: """${tz}%{ab->aturtle}"""; project: *}`).translationToFailWith('%{ query } illegal in this string');
     });
     test('table single quote', () => {
         const m = new test_translator_1.TestTranslator("source: n is bigquery.table('n')");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.56-dev230710162623",
+  "version": "0.0.56-dev230710182711",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",