@malloydata/malloy 0.0.56-dev230710210438 → 0.0.56-dev230711015353

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

@@ -358,7 +358,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitSQLSourceName(pcx) {
         const name = this.getModelEntryName(pcx.sqlExploreNameRef());
-        return this.astAt(new ast.FromSQLSource(name), pcx);
+        const res = this.astAt(new ast.FromSQLSource(name), pcx);
+        if (this.m4WarningsEnabled()) {
+            this.astError(res, '`from_sql` is deprecated; use `connection_name.sql(...)` as a source directly', 'warn');
+        }
+        return res;
     }
     visitSqlSource(pcx) {
         const connId = pcx.connectionId();
@@ -378,7 +382,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitQuerySource(pcx) {
         const query = this.visit(pcx.query());
         if (ast.isQueryElement(query)) {
-            return this.astAt(new ast.QuerySource(query), pcx);
+            const el = this.astAt(new ast.QuerySource(query), pcx);
+            if (this.m4WarningsEnabled()) {
+                this.astError(el, '`from(some_query)` is deprecated; use `some_query` directly', 'warn');
+            }
+            return el;
         }
         throw this.internalError(pcx, `Expect query definition, got a '${query.elementType}'`);
     }

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

@@ -2937,6 +2937,18 @@ describe('sql expressions', () => {
         }
         expect(m).toTranslateWithWarnings('`sql:` statement is deprecated, use `connection_name.sql(...)` instead');
     });
+    test('from_sql deprecation warning', () => {
+        const m = new test_translator_1.TestTranslator(`##! m4warnings
+      sql: bad_sql is {select: """SELECT 1 as one"""}
+      source: foo is from_sql(bad_sql)`);
+        const req = m.translate().compileSQL;
+        if (req) {
+            m.update({
+                compileSQL: { [req.name]: getSelectOneStruct(req) },
+            });
+        }
+        expect(m).toTranslateWithWarnings('`sql:` statement is deprecated, use `connection_name.sql(...)` instead', '`from_sql` is deprecated; use `connection_name.sql(...)` as a source directly');
+    });
     test('reference to sql expression in run', () => {
         const m = new test_translator_1.TestTranslator(`
       run: bigquery.sql("""select 1 as one""")
@@ -3196,6 +3208,20 @@ describe('extend and refine', () => {
     });
 });
 describe('miscellaneous m4 warnings', () => {
+    test('from() is deprecated', () => {
+        expect(`
+      ##! m4warnings
+      query: q is a -> { project: * }
+      source: c is from(q) extend {
+        dimension: x is 1
+    }`).toTranslateWithWarnings('`from(some_query)` is deprecated; use `some_query` directly');
+        expect(`
+      ##! m4warnings
+      query: q is a -> { project: * }
+      source: c is q extend {
+        dimension: x is 1
+    }`).toTranslate();
+    });
     test('query leading arrow', () => {
         expect(`
       ##! m4warnings

package/package.json

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