@malloydata/malloy-tests 0.0.276-crs-composite-joins-2-250513155820 → 0.0.277

package/package.json

@@ -21,14 +21,14 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "0.0.276-crs-composite-joins-2-250513155820",
-    "@malloydata/db-duckdb": "0.0.276-crs-composite-joins-2-250513155820",
-    "@malloydata/db-postgres": "0.0.276-crs-composite-joins-2-250513155820",
-    "@malloydata/db-snowflake": "0.0.276-crs-composite-joins-2-250513155820",
-    "@malloydata/db-trino": "0.0.276-crs-composite-joins-2-250513155820",
-    "@malloydata/malloy": "0.0.276-crs-composite-joins-2-250513155820",
-    "@malloydata/malloy-tag": "0.0.276-crs-composite-joins-2-250513155820",
-    "@malloydata/render": "0.0.276-crs-composite-joins-2-250513155820",
+    "@malloydata/db-bigquery": "0.0.277",
+    "@malloydata/db-duckdb": "0.0.277",
+    "@malloydata/db-postgres": "0.0.277",
+    "@malloydata/db-snowflake": "0.0.277",
+    "@malloydata/db-trino": "0.0.277",
+    "@malloydata/malloy": "0.0.277",
+    "@malloydata/malloy-tag": "0.0.277",
+    "@malloydata/render": "0.0.277",
     "events": "^3.3.0",
     "jsdom": "^22.1.0",
     "luxon": "^2.4.0",
@@ -38,5 +38,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^2.4.0"
   },
-  "version": "0.0.276-crs-composite-joins-2-250513155820"
+  "version": "0.0.277"
 }

package/src/core/tags.spec.ts

@@ -318,4 +318,33 @@ describe('tags in results', () => {
     const fromVal = nestedTags.tag.text('from');
     expect(fromVal).toEqual('notes');
   });
+  test('run: from turtle inherits can disable turtle tags', async () => {
+    const run1 = runtime.loadQuery(`
+      source: one is duckdb.sql("SELECT 1 as one") extend {
+        # blockNote b1
+        view:
+        # note n2
+        view1 is { select: * }
+      }
+      # -blockNote b3
+      run:
+        # -note n4
+        one -> view1
+    `);
+    const result = await run1.run();
+    const lineSrc = result.resultExplore.getTaglines().map(s => s.trim());
+    expect(lineSrc).toEqual([
+      '# blockNote b1',
+      '# note n2',
+      '# -blockNote b3',
+      '# -note n4',
+    ]);
+    const tags = result.resultExplore.tagParse().tag;
+    expect(tags.has('blockNote')).toBeFalsy();
+    expect(tags.has('note')).toBeFalsy();
+    expect(tags.has('b1')).toBeTruthy();
+    expect(tags.has('b3')).toBeTruthy();
+    expect(tags.has('n2')).toBeTruthy();
+    expect(tags.has('n4')).toBeTruthy();
+  });
 });

package/src/databases/all/composite_sources.spec.ts

@@ -62,6 +62,26 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
         run: c -> { group_by: j.f2 }
       `).malloyResultMatches(runtime, {f2: 2});
     });
+    it('selects correct join', async () => {
+      await expect(`
+        ##! experimental.composite_sources
+        source: state_facts is ${databaseName}.table('malloytest.state_facts')
+        source: s1 is state_facts extend {
+          join_one: j is state_facts extend {
+            dimension: jf is 1
+          } on true
+          dimension: f1 is 1
+        }
+        source: s2 is state_facts extend {
+          join_one: j is state_facts extend {
+            dimension: jf is 2
+          } on true
+          dimension: f2 is 2
+        }
+        source: c is compose(s1, s2)
+        run: c -> { group_by: j.jf, f2 }
+      `).malloyResultMatches(runtime, {f2: 2, jf: 2});
+    });
     it('join on depends on selected join', async () => {
       await expect(`
         ##! experimental.composite_sources