@malloydata/malloy 0.0.55-dev230707164317 → 0.0.55-dev230707183945

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

@@ -88,8 +88,13 @@ function getShortString(cx) {
     // shortString: DQ_STRING | SQ_STRING; So this will never happen
     return '';
 }
-function containsID(cx) {
-    return 'id' in cx;
+function getOptionalString(cx) {
+    function containsString(cx) {
+        return 'shortString' in cx;
+    }
+    if (containsString(cx) && cx.shortString()) {
+        return getShortString(cx);
+    }
 }
 /**
  * An identifier is either a sequence of id characters or a `quoted`
@@ -105,6 +110,9 @@ function getId(cx) {
     return cx.id().text;
 }
 function getOptionalId(cx) {
+    function containsID(cx) {
+        return 'id' in cx;
+    }
     if (containsID(cx) && cx.id()) {
         return getId(cx);
     }
@@ -310,7 +318,13 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const connectionName = this.astAt(this.getModelEntryName(connId), connId);
         const sqlStr = new ast.SQLString();
         const selCx = pcx.sqlString();
-        this.makeSqlString(selCx, sqlStr);
+        if (selCx) {
+            this.makeSqlString(selCx, sqlStr);
+        }
+        const shortSelect = getOptionalString(pcx);
+        if (shortSelect) {
+            sqlStr.push(shortSelect);
+        }
         const expr = new ast.SQLSource(connectionName, sqlStr);
         return this.astAt(expr, pcx);
     }

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

@@ -2788,6 +2788,34 @@ describe('sql expressions', () => {
             expect(m).toTranslate();
         }
     });
+    test('sql expression legal with single quote', () => {
+        const m = (0, test_translator_1.model) `
+      source: na is bigquery.sql('SELECT 1 as one')
+    `;
+        expect(m).toParse();
+        const compileSql = m.translator.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            m.translator.update({
+                compileSQL: { [compileSql.name]: getSelectOneStruct(compileSql) },
+            });
+            expect(m).toTranslate();
+        }
+    });
+    test('sql expression legal with double quote', () => {
+        const m = (0, test_translator_1.model) `
+      source: na is bigquery.sql("SELECT 1 as one")
+    `;
+        expect(m).toParse();
+        const compileSql = m.translator.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            m.translator.update({
+                compileSQL: { [compileSql.name]: getSelectOneStruct(compileSql) },
+            });
+            expect(m).toTranslate();
+        }
+    });
     test('reference to sql expression in extended source', () => {
         const m = (0, test_translator_1.model) `
       source: na is bigquery.sql("""SELECT 1 as one""") {

package/package.json

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