@malloydata/malloy-tests 0.0.222-dev241212154316 → 0.0.222-dev241212204326

package/package.json

@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "^0.0.222-dev241212154316",
-    "@malloydata/db-duckdb": "^0.0.222-dev241212154316",
-    "@malloydata/db-postgres": "^0.0.222-dev241212154316",
-    "@malloydata/db-snowflake": "^0.0.222-dev241212154316",
-    "@malloydata/db-trino": "^0.0.222-dev241212154316",
-    "@malloydata/malloy": "^0.0.222-dev241212154316",
-    "@malloydata/render": "^0.0.222-dev241212154316",
+    "@malloydata/db-bigquery": "^0.0.222-dev241212204326",
+    "@malloydata/db-duckdb": "^0.0.222-dev241212204326",
+    "@malloydata/db-postgres": "^0.0.222-dev241212204326",
+    "@malloydata/db-snowflake": "^0.0.222-dev241212204326",
+    "@malloydata/db-trino": "^0.0.222-dev241212204326",
+    "@malloydata/malloy": "^0.0.222-dev241212204326",
+    "@malloydata/render": "^0.0.222-dev241212204326",
     "events": "^3.3.0",
     "jsdom": "^22.1.0",
     "luxon": "^2.4.0",
@@ -37,5 +37,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^2.4.0"
   },
-  "version": "0.0.222-dev241212154316"
+  "version": "0.0.222-dev241212204326"
 }

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

@@ -266,4 +266,45 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
       run: x -> { aggregate: foo; group_by: bar, arr.each }
     `).malloyResultMatches(runtime, {foo: 0});
   });
+  it('complex nesting composite without join', async () => {
+    await expect(`
+      ##! experimental.composite_sources
+      source: state_facts is ${databaseName}.table('malloytest.state_facts')
+      source: x is compose(
+        compose(
+          state_facts,
+          state_facts extend {
+            dimension: bar is 1
+          }
+        ) extend {
+          measure: foo is sum(0)
+        },
+        state_facts extend {
+          measure: foo is sum(0) + 1
+          dimension: bar is 2
+        }
+      )
+      run: x -> { aggregate: foo; group_by: bar }
+    `).malloyResultMatches(runtime, {foo: 0, bar: 1});
+  });
+  it('complex nesting composite with join', async () => {
+    await expect(`
+      ##! experimental.composite_sources
+      source: state_facts is ${databaseName}.table('malloytest.state_facts')
+      source: x is compose(
+        compose(
+          state_facts,
+          state_facts extend {
+            dimension: the_state is 'CA'
+          }
+        ),
+        state_facts extend {
+          dimension: the_state is 'IL'
+        }
+      ) extend {
+        join_one: state_facts on the_state = state_facts.state
+      }
+      run: x -> { group_by: state_facts.state }
+    `).malloyResultMatches(runtime, {state: 'CA'});
+  });
 });

package/src/databases/presto-trino/presto-trino.spec.ts

@@ -313,6 +313,13 @@ describe.each(runtimes.runtimeList)(
         query: 'first_param=val_one&second_param=2',
       });
     });
+    test('string split function in tresto', async () => {
+      await expect(`
+        run: ${databaseName}.sql("SELECT 1 AS N") -> {
+          select: some_words is split('hello world', ' ')
+        }
+      `).malloyResultMatches(runtime, {some_words: ['hello', 'world']});
+    });
   }
 );
 

package/src/models/medicare_model.ts

@@ -21,13 +21,13 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import {composeSQLExpr, StructDef} from '@malloydata/malloy';
+import {composeSQLExpr, SourceDef} from '@malloydata/malloy';
 import {fToQF} from '../util';
 
 // will it build?
 
 /** Medicare Model */
-export const medicareModel: StructDef = {
+export const medicareModel: SourceDef = {
   as: 'medicare_test',
   dialect: 'standardsql',
   fields: [
@@ -218,7 +218,7 @@ export const medicareModel: StructDef = {
   tablePath: 'malloydata-org.malloytest.bq_medicare_test',
 };
 
-export const medicareStateFacts: StructDef = {
+export const medicareStateFacts: SourceDef = {
   fields: [],
   name: 'medicare_state_facts',
   dialect: 'standardsql',