@malloydata/malloy-tests 0.0.195-dev241003204905 → 0.0.195

package/package.json

@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "^0.0.195-dev241003204905",
-    "@malloydata/db-duckdb": "^0.0.195-dev241003204905",
-    "@malloydata/db-postgres": "^0.0.195-dev241003204905",
-    "@malloydata/db-snowflake": "^0.0.195-dev241003204905",
-    "@malloydata/db-trino": "^0.0.195-dev241003204905",
-    "@malloydata/malloy": "^0.0.195-dev241003204905",
-    "@malloydata/render": "^0.0.195-dev241003204905",
+    "@malloydata/db-bigquery": "^0.0.195",
+    "@malloydata/db-duckdb": "^0.0.195",
+    "@malloydata/db-postgres": "^0.0.195",
+    "@malloydata/db-snowflake": "^0.0.195",
+    "@malloydata/db-trino": "^0.0.195",
+    "@malloydata/malloy": "^0.0.195",
+    "@malloydata/render": "^0.0.195",
     "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.195-dev241003204905"
+  "version": "0.0.195"
 }

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

@@ -81,12 +81,12 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
     });
   });
 
-  it('bug with wrong join being used with annotation', async () => {
+  it('join dependencies tracked from annotated references', async () => {
     await expect(`
-      run: aircraft -> {
-        # foo
-        group_by: aircraft_models.seats
-      }
+       run: aircraft -> {
+          # ThisShouldNotAffectTheQuery
+          group_by: aircraft_models.seats
+        }
     `).malloyResultMatches(expressionModel, {
       seats: 0,
     });

package/src/databases/bigquery/handexpr.spec.ts

@@ -23,17 +23,11 @@
 
 /* eslint-disable no-console */
 
-import {
-  ModelDef,
-  Query,
-  StructDef,
-  StructRelationship,
-} from '@malloydata/malloy';
+import {ModelDef, Query, StructDef} from '@malloydata/malloy';
 import {describeIfDatabaseAvailable, fStringLike, fToQF} from '../../util';
 
 import * as malloy from '@malloydata/malloy';
 import {RuntimeList} from '../../runtimes';
-
 const [describe] = describeIfDatabaseAvailable(['bigquery']);
 
 describe('BigQuery hand-built expression test', () => {
@@ -43,18 +37,28 @@ describe('BigQuery hand-built expression test', () => {
     await runtimes.closeAll();
   });
 
-  function withJoin(leftKey: string[], rightKey: string[]): StructRelationship {
-    return {
-      type: 'one',
-      matrixOperation: 'left',
+  function withJoin(
+    sd: malloy.TableSourceDef,
+    join: 'one' | 'many',
+    as: string,
+    keyExpr: string
+  ): malloy.JoinFieldDef {
+    const [leftKey, rightKey] = keyExpr.split('=');
+    const ret: malloy.JoinFieldDef = {
+      ...sd,
+      join,
       onExpression: {
         node: '=',
         kids: {
-          left: {node: 'field', path: leftKey},
-          right: {node: 'field', path: rightKey},
+          left: {node: 'field', path: leftKey.split('.')},
+          right: {node: 'field', path: rightKey.split('.')},
         },
       },
     };
+    if (as !== ret.name) {
+      ret.as = as;
+    }
+    return ret;
   }
 
   async function validateCompilation(
@@ -83,16 +87,13 @@ describe('BigQuery hand-built expression test', () => {
     return model._loadQueryFromQueryDef(queryDef).getSQL();
   }
 
-  const modelHandBase: StructDef = {
+  const modelHandBase: malloy.TableSourceDef = {
     name: 'malloydata-org.malloytest.aircraft_models',
     as: 'aircraft_models',
-    type: 'struct',
+    type: 'table',
     dialect: 'standardsql',
-    structSource: {
-      type: 'table',
-      tablePath: 'malloydata-org.malloytest.aircraft_models',
-    },
-    structRelationship: {type: 'basetable', connectionName: 'bigquery'},
+    tablePath: 'malloydata-org.malloytest.aircraft_models',
+    connection: 'bigquery',
     fields: [
       {type: 'string', name: 'aircraft_model_code'},
       {type: 'string', name: 'manufacturer'},
@@ -190,14 +191,11 @@ describe('BigQuery hand-built expression test', () => {
   };
 
   const aircraftHandBase: StructDef = {
-    type: 'struct',
     name: 'malloydata-org.malloytest.aircraft',
     dialect: 'standardsql',
-    structSource: {
-      type: 'table',
-      tablePath: 'malloydata-org.malloytest.aircraft',
-    },
-    structRelationship: {type: 'basetable', connectionName: 'bigquery'},
+    type: 'table',
+    tablePath: 'malloydata-org.malloytest.aircraft',
+    connection: 'bigquery',
     fields: [
       {type: 'string', name: 'tail_num'},
       {type: 'string', name: 'aircraft_serial'},
@@ -251,30 +249,22 @@ describe('BigQuery hand-built expression test', () => {
           {type: 'reduce', queryFields: fToQF(['aircraft_count'])},
         ],
       },
+      withJoin(
+        modelHandBase,
+        'one',
+        'aircraft_models',
+        'aircraft_model_code=aircraft_models.aircraft_model_code'
+      ),
     ],
     primaryKey: 'tail_num',
     as: 'aircraft',
   };
 
-  const aircraftHandStructDef: StructDef = {
-    ...aircraftHandBase,
-    fields: [
-      ...aircraftHandBase.fields,
-      {
-        ...modelHandBase,
-        structRelationship: withJoin(
-          ['aircraft_model_code'],
-          ['aircraft_models', 'aircraft_model_code']
-        ),
-      },
-    ],
-  };
-
   const handCodedModel: ModelDef = {
     name: 'Hand Coded Models',
     exports: ['aircraft'],
     contents: {
-      aircraft: aircraftHandStructDef,
+      aircraft: aircraftHandBase,
     },
   };
 
@@ -712,18 +702,12 @@ describe('BigQuery hand-built expression test', () => {
     as: 'model_aircraft',
     fields: [
       ...modelHandBase.fields,
-      {
-        ...aircraftHandBase,
-        structRelationship: {
-          type: 'many',
-          matrixOperation: 'left',
-          onExpression: malloy.composeSQLExpr([
-            {node: 'field', path: ['aircraft_model_code']},
-            '=',
-            {node: 'field', path: ['aircraft', 'aircraft_model_code']},
-          ]),
-        },
-      },
+      withJoin(
+        aircraftHandBase,
+        'many',
+        'aircraft',
+        'aircraft_model_code=aircraft.aircraft_model_code'
+      ),
     ],
   };
 

package/src/databases/bigquery/malloy_query.spec.ts

@@ -697,9 +697,7 @@ describe('airport_tests', () => {
   });
 
   it('nested_sums', async () => {
-    const result = await runQuery(
-      model,
-      `
+    await expect(`
       run: airports->{
         aggregate: airport_count
         nest: by_state is {
@@ -716,34 +714,23 @@ describe('airport_tests', () => {
           sum_state is by_state.sum(by_state.airport_count),
           sum_fac is by_state.by_fac_type.sum(by_state.by_fac_type.airport_count)
       }
-    `
-    );
-    // console.log(result.sql);
-    expect(result.data.value[0]['sum_state']).toBe(19793);
-    expect(result.data.value[0]['sum_fac']).toBe(19793);
+    `).malloyResultMatches(model, {sum_state: 19793, sum_fac: 19793});
   });
 
   it('pipeline_as_declared_turtle', async () => {
-    const result = await runQuery(
-      model,
-      `
-        source: my_airports is airports extend {
-          view: pipe_turtle is {
-            aggregate: a is airport_count
-          } -> {
-            select: a
-          }
+    await expect(`
+      run: airports extend {
+        view: pipe_turtle is {
+          aggregate: a is airport_count
+        } -> {
+          select: a
         }
-        run: my_airports->pipe_turtle
-    `
-    );
-    expect(result.data.value[0]['a']).toBe(19793);
+      } -> pipe_turtle
+    `).malloyResultMatches(model, {a: 19793});
   });
 
   it('pipeline Turtle', async () => {
-    const result = await runQuery(
-      model,
-      `
+    await expect(`
       run: bigquery.table('malloytest.airports')->{
         aggregate: airport_count is count()
         nest: pipe_turtle is {
@@ -760,13 +747,7 @@ describe('airport_tests', () => {
           aggregate: total_airports is a.sum()
         }
       }
-      `
-    );
-
-    expect(
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (result.data.value[0] as any).pipe_turtle[0].total_airports
-    ).toBe(1845);
+    `).malloyResultMatches(model, {'pipe_turtle.total_airports': 1845});
   });
 
   it.skip('crossjoined turtles', async () => {

package/src/experimental-dialects.spec.ts

@@ -25,8 +25,7 @@ import {
   DuckDBDialect,
   FetchSchemaOptions,
   MalloyError,
-  SQLBlock,
-  StructDef,
+  SQLSourceDef,
   registerDialect,
 } from '@malloydata/malloy';
 import {testRuntimeFor} from './runtimes';
@@ -57,19 +56,23 @@ async function getError<T>(promise: Promise<T>): Promise<Error | undefined> {
 describe('experimental dialects', () => {
   const duckdbX = 'duckdb_experimental';
   class DuckdbXConnection extends DuckDBConnection {
-    public async fetchSchemaForSQLBlock(
-      sqlRef: SQLBlock,
+    name = duckdbX;
+    public async festchSchemaFOrSQLSource(
+      sqlRef: SQLSourceDef,
       options: FetchSchemaOptions
     ): Promise<
-      | {structDef: StructDef; error?: undefined}
+      | {structDef: SQLSourceDef; error?: undefined}
       | {error: string; structDef?: undefined}
     > {
-      const result = await super.fetchSchemaForSQLBlock(sqlRef, options);
+      const result = await super.fetchSchemaForSQLStruct(sqlRef, options);
       if (result.error === undefined) {
         return {structDef: {...result.structDef, dialect: duckdbX}};
       }
       return result;
     }
+    get dialectName(): string {
+      return duckdbX;
+    }
   }
 
   const connection = new DuckdbXConnection(
@@ -80,6 +83,9 @@ describe('experimental dialects', () => {
   class DuckdbXDialect extends DuckDBDialect {
     experimental = true;
     name = duckdbX;
+    get dialectName(): string {
+      return duckdbX;
+    }
   }
 
   registerDialect(new DuckdbXDialect());

package/src/models/faa_model.ts

@@ -22,39 +22,219 @@
  */
 
 import {
-  composeSQLExpr,
   ModelDef,
   StructDef,
-  StructRelationship,
+  TableSourceDef,
+  JoinFieldDef,
 } from '@malloydata/malloy';
 
 import {fStringEq, fToIF, fToQF, fYearEq} from '../util';
 
 import {medicareModel, medicareStateFacts} from './medicare_model';
 
-function withJoin(leftKey: string, rightKey: string): StructRelationship {
-  return {
-    type: 'one',
-    matrixOperation: 'left',
-    onExpression: composeSQLExpr([
-      {node: 'field', path: leftKey.split('.')},
-      '=',
-      {node: 'field', path: rightKey.split('.')},
-    ]),
+function withJoin(
+  sd: TableSourceDef,
+  join: 'one' | 'many',
+  as: string,
+  keyExpr: string
+): JoinFieldDef {
+  const [leftKey, rightKey] = keyExpr.split('=');
+  const ret: JoinFieldDef = {
+    ...sd,
+    join,
+    onExpression: {
+      node: '=',
+      kids: {
+        left: {node: 'field', path: leftKey.split('.')},
+        right: {node: 'field', path: rightKey.split('.')},
+      },
+    },
   };
+  if (as !== ret.name) {
+    ret.as = as;
+  }
+  return ret;
 }
 
+const AIRCRAFT_MODELS: TableSourceDef = {
+  name: 'malloydata-org.malloytest.aircraft_models',
+  as: 'aircraft_models',
+  dialect: 'standardsql',
+  connection: 'bigquery',
+  primaryKey: 'aircraft_model_code',
+  type: 'table',
+  tablePath: 'malloydata-org.malloytest.aircraft_models',
+  fields: [
+    {type: 'string', name: 'aircraft_model_code'},
+    {type: 'string', name: 'manufacturer'},
+    {type: 'string', name: 'model'},
+    {
+      type: 'number',
+      name: 'aircraft_type_id',
+      numberType: 'integer',
+    },
+    {
+      type: 'number',
+      name: 'aircraft_engine_type_id',
+      numberType: 'integer',
+    },
+    {
+      type: 'number',
+      name: 'aircraft_category_id',
+      numberType: 'integer',
+    },
+    {type: 'number', name: 'amateur', numberType: 'integer'},
+    {type: 'number', name: 'engines', numberType: 'integer'},
+    {type: 'number', name: 'seats', numberType: 'integer'},
+    {type: 'number', name: 'weight', numberType: 'integer'},
+    {type: 'number', name: 'speed', numberType: 'integer'},
+    {
+      type: 'number',
+      expressionType: 'aggregate',
+      name: 'total_seats',
+      e: {
+        node: 'aggregate',
+        function: 'sum',
+        e: {node: 'field', path: ['seats']},
+      },
+    },
+  ],
+};
+
+const AIRPORTS: TableSourceDef = {
+  name: 'malloydata-org.malloytest.airports',
+  as: 'airports',
+  dialect: 'standardsql',
+  type: 'table',
+  tablePath: 'malloydata-org.malloytest.airports',
+  connection: 'bigquery',
+  primaryKey: 'code',
+  fields: [
+    {type: 'number', name: 'id', numberType: 'integer'},
+    {type: 'string', name: 'code'},
+    {type: 'string', name: 'site_number'},
+    {type: 'string', name: 'fac_type', as: 'facility_type'},
+    {type: 'string', name: 'fac_use', as: 'facility_use'},
+    {type: 'string', name: 'faa_region'},
+    {type: 'string', name: 'faa_dist'},
+    {type: 'string', name: 'city'},
+    {type: 'string', name: 'county'},
+    {type: 'string', name: 'state'},
+    {type: 'string', name: 'full_name'},
+    {type: 'string', name: 'own_type'},
+    {type: 'number', name: 'longitude', numberType: 'float'},
+    {type: 'number', name: 'latitude', numberType: 'float'},
+    {type: 'number', name: 'elevation', numberType: 'integer'},
+    {type: 'string', name: 'aero_cht'},
+    {type: 'number', name: 'cbd_dist', numberType: 'integer'},
+    {type: 'string', name: 'cbd_dir'},
+    {type: 'string', name: 'act_date'},
+    {type: 'string', name: 'cert'},
+    {type: 'string', name: 'fed_agree'},
+    {type: 'string', name: 'cust_intl'},
+    {type: 'string', name: 'c_ldg_rts'},
+    {type: 'string', name: 'joint_use'},
+    {type: 'string', name: 'mil_rts'},
+    {type: 'string', name: 'cntl_twr'},
+    {type: 'string', name: 'major'},
+    {
+      type: 'number',
+      name: 'count',
+      expressionType: 'aggregate',
+      e: {node: 'aggregate', function: 'count', e: {node: ''}},
+    },
+  ],
+};
+
+const CARRIERS: TableSourceDef = {
+  name: 'carriers',
+  dialect: 'standardsql',
+  type: 'table',
+  tablePath: 'malloydata-org.malloytest.carriers',
+  connection: 'bigquery',
+  primaryKey: 'code',
+  fields: [
+    {type: 'string', name: 'code'},
+    {type: 'string', name: 'name'},
+    {type: 'string', name: 'nickname'},
+  ],
+};
+const AIRCRAFT: TableSourceDef = {
+  name: 'aircraft',
+  dialect: 'standardsql',
+  type: 'table',
+  tablePath: 'malloydata-org.malloytest.aircraft',
+  primaryKey: 'tail_num',
+  connection: 'bigquery',
+  fields: [
+    {type: 'string', name: 'tail_num'},
+    {type: 'string', name: 'aircraft_serial'},
+    {type: 'string', name: 'aircraft_model_code'},
+    {type: 'string', name: 'aircraft_engine_code'},
+    {type: 'number', name: 'year_built', numberType: 'integer'},
+    {
+      type: 'number',
+      name: 'aircraft_type_id',
+      numberType: 'integer',
+    },
+    {
+      type: 'number',
+      name: 'aircraft_engine_type_id',
+      numberType: 'integer',
+    },
+    {
+      type: 'number',
+      name: 'registrant_type_id',
+      numberType: 'integer',
+    },
+    {type: 'string', name: 'name'},
+    {type: 'string', name: 'address1'},
+    {type: 'string', name: 'address2'},
+    {type: 'string', name: 'city'},
+    {type: 'string', name: 'state'},
+    {type: 'string', name: 'zip'},
+    {type: 'string', name: 'region'},
+    {type: 'string', name: 'county'},
+    {type: 'string', name: 'country'},
+    {type: 'string', name: 'certification'},
+    {type: 'string', name: 'status_code'},
+    {type: 'string', name: 'mode_s_code'},
+    {type: 'string', name: 'fract_owner'},
+    {
+      type: 'number',
+      name: 'aircraft_count',
+      expressionType: 'aggregate',
+      e: {node: 'aggregate', function: 'count', e: {node: ''}},
+    },
+    {
+      type: 'number',
+      name: 'total_engines',
+      expressionType: 'aggregate',
+      e: {
+        node: 'aggregate',
+        function: 'sum',
+        e: {node: 'field', path: ['aircraft_models', 'engines']},
+      },
+    },
+
+    // subjoin aircraft models
+    withJoin(
+      AIRCRAFT_MODELS,
+      'one',
+      'aircraft_models',
+      'aircraft_model_code=aircraft_models.aircraft_model_code'
+    ),
+  ],
+};
+
 /** Flight Model */
 export const FLIGHTS_EXPLORE: StructDef = {
-  type: 'struct',
   name: 'malloydata-org.malloytest.flights',
   as: 'flights',
   dialect: 'standardsql',
-  structSource: {
-    type: 'table',
-    tablePath: 'malloydata-org.malloytest.flights',
-  },
-  structRelationship: {type: 'basetable', connectionName: 'bigquery'},
+  type: 'table',
+  tablePath: 'malloydata-org.malloytest.flights',
+  connection: 'bigquery',
   primaryKey: 'id2',
   fields: [
     // Fields in the flights table.
@@ -90,280 +270,59 @@ export const FLIGHTS_EXPLORE: StructDef = {
       },
     },
 
-    // carriers
-    {
-      type: 'struct',
-      name: 'malloydata-org.malloytest.carriers',
-      as: 'carriers',
-      dialect: 'standardsql',
-      structSource: {
-        type: 'table',
-        tablePath: 'malloydata-org.malloytest.carriers',
-      },
-      structRelationship: {
-        type: 'one',
-        matrixOperation: 'left',
-        onExpression: composeSQLExpr([
-          {node: 'field', path: ['carrier']},
-          '=',
-          {node: 'field', path: ['carriers', 'code']},
-        ]),
-      },
-      primaryKey: 'code',
-      fields: [
-        {type: 'string', name: 'code'},
-        {type: 'string', name: 'name'},
-        {type: 'string', name: 'nickname'},
-      ],
-    },
+    withJoin(CARRIERS, 'one', 'carriers', 'carrier=carriers.code'),
 
     // aircraft
-    {
-      type: 'struct',
-      name: 'malloydata-org.malloytest.aircraft',
-      as: 'aircraft',
-      dialect: 'standardsql',
-      structSource: {
-        type: 'table',
-        tablePath: 'malloydata-org.malloytest.aircraft',
-      },
-      structRelationship: withJoin('tail_num', 'aircraft.tail_num'),
-      primaryKey: 'tail_num',
-      fields: [
-        {type: 'string', name: 'tail_num'},
-        {type: 'string', name: 'aircraft_serial'},
-        {type: 'string', name: 'aircraft_model_code'},
-        {type: 'string', name: 'aircraft_engine_code'},
-        {type: 'number', name: 'year_built', numberType: 'integer'},
-        {
-          type: 'number',
-          name: 'aircraft_type_id',
-          numberType: 'integer',
-        },
-        {
-          type: 'number',
-          name: 'aircraft_engine_type_id',
-          numberType: 'integer',
-        },
-        {
-          type: 'number',
-          name: 'registrant_type_id',
-          numberType: 'integer',
-        },
-        {type: 'string', name: 'name'},
-        {type: 'string', name: 'address1'},
-        {type: 'string', name: 'address2'},
-        {type: 'string', name: 'city'},
-        {type: 'string', name: 'state'},
-        {type: 'string', name: 'zip'},
-        {type: 'string', name: 'region'},
-        {type: 'string', name: 'county'},
-        {type: 'string', name: 'country'},
-        {type: 'string', name: 'certification'},
-        {type: 'string', name: 'status_code'},
-        {type: 'string', name: 'mode_s_code'},
-        {type: 'string', name: 'fract_owner'},
-        {
-          type: 'number',
-          name: 'aircraft_count',
-          expressionType: 'aggregate',
-          e: {node: 'aggregate', function: 'count', e: {node: ''}},
-        },
-        {
-          type: 'number',
-          name: 'total_engines',
-          expressionType: 'aggregate',
-          e: {
-            node: 'aggregate',
-            function: 'sum',
-            e: {node: 'field', path: ['aircraft_models', 'engines']},
-          },
-        },
-
-        // subjoin aircraft models
-        {
-          type: 'struct',
-          name: 'malloydata-org.malloytest.aircraft_models',
-          as: 'aircraft_models',
-          dialect: 'standardsql',
-          primaryKey: 'aircraft_model_code',
-          structSource: {
-            type: 'table',
-            tablePath: 'malloydata-org.malloytest.aircraft_models',
-          },
-          structRelationship: withJoin(
-            'aircraft_model_code',
-            'aircraft_models.aircraft_model_code'
-          ),
-          fields: [
-            {type: 'string', name: 'aircraft_model_code'},
-            {type: 'string', name: 'manufacturer'},
-            {type: 'string', name: 'model'},
-            {
-              type: 'number',
-              name: 'aircraft_type_id',
-              numberType: 'integer',
-            },
-            {
-              type: 'number',
-              name: 'aircraft_engine_type_id',
-              numberType: 'integer',
-            },
-            {
-              type: 'number',
-              name: 'aircraft_category_id',
-              numberType: 'integer',
-            },
-            {type: 'number', name: 'amateur', numberType: 'integer'},
-            {type: 'number', name: 'engines', numberType: 'integer'},
-            {type: 'number', name: 'seats', numberType: 'integer'},
-            {type: 'number', name: 'weight', numberType: 'integer'},
-            {type: 'number', name: 'speed', numberType: 'integer'},
-            {
-              type: 'number',
-              expressionType: 'aggregate',
-              name: 'total_seats',
-              e: {
-                node: 'aggregate',
-                function: 'sum',
-                e: {node: 'field', path: ['seats']},
-              },
-            },
-          ],
-        },
-      ],
-    },
+    withJoin(AIRCRAFT, 'one', 'aircraft', 'tail_num=aircraft.tail_num'),
 
     // origin
-    {
-      type: 'struct',
-      name: 'malloydata-org.malloytest.airports',
-      as: 'origin',
-      dialect: 'standardsql',
-      structSource: {
-        type: 'table',
-        tablePath: 'malloydata-org.malloytest.airports',
-      },
-      structRelationship: withJoin('origin_code', 'origin.code'),
-      primaryKey: 'code',
-      fields: [
-        {type: 'number', name: 'id', numberType: 'integer'},
-        {type: 'string', name: 'code'},
-        {type: 'string', name: 'site_number'},
-        {type: 'string', name: 'fac_type', as: 'facility_type'},
-        {type: 'string', name: 'fac_use', as: 'facility_use'},
-        {type: 'string', name: 'faa_region'},
-        {type: 'string', name: 'faa_dist'},
-        {type: 'string', name: 'city'},
-        {type: 'string', name: 'county'},
-        {type: 'string', name: 'state'},
-        {type: 'string', name: 'full_name'},
-        {type: 'string', name: 'own_type'},
-        {type: 'number', name: 'longitude', numberType: 'float'},
-        {type: 'number', name: 'latitude', numberType: 'float'},
-        {type: 'number', name: 'elevation', numberType: 'integer'},
-        {type: 'string', name: 'aero_cht'},
-        {type: 'number', name: 'cbd_dist', numberType: 'integer'},
-        {type: 'string', name: 'cbd_dir'},
-        {type: 'string', name: 'act_date'},
-        {type: 'string', name: 'cert'},
-        {type: 'string', name: 'fed_agree'},
-        {type: 'string', name: 'cust_intl'},
-        {type: 'string', name: 'c_ldg_rts'},
-        {type: 'string', name: 'joint_use'},
-        {type: 'string', name: 'mil_rts'},
-        {type: 'string', name: 'cntl_twr'},
-        {type: 'string', name: 'major'},
-        {
-          type: 'number',
-          name: 'count',
-          expressionType: 'aggregate',
-          e: {node: 'aggregate', function: 'count', e: {node: ''}},
-        },
-      ],
-    },
+    withJoin(AIRPORTS, 'one', 'origin', 'origin_code=origin.code'),
 
     // destination
-    {
-      type: 'struct',
-      name: 'malloydata-org.malloytest.airports',
-      as: 'destination',
-      dialect: 'standardsql',
-      structSource: {
-        type: 'table',
-        tablePath: 'malloydata-org.malloytest.airports',
-      },
-      structRelationship: withJoin('destination_code', 'destination.code'),
-      primaryKey: 'code',
-      fields: [
-        {type: 'number', name: 'id', numberType: 'integer'},
-        {type: 'string', name: 'code'},
-        {type: 'string', name: 'site_number'},
-        {type: 'string', name: 'fac_type', as: 'facility_type'},
-        {type: 'string', name: 'fac_use', as: 'facility_use'},
-        {type: 'string', name: 'faa_region'},
-        {type: 'string', name: 'faa_dist'},
-        {type: 'string', name: 'city'},
-        {type: 'string', name: 'county'},
-        {type: 'string', name: 'state'},
-        {type: 'string', name: 'full_name'},
-        {type: 'string', name: 'own_type'},
-        {type: 'number', name: 'longitude', numberType: 'float'},
-        {type: 'number', name: 'latitude', numberType: 'float'},
-        {type: 'number', name: 'elevation', numberType: 'integer'},
-        {type: 'string', name: 'aero_cht'},
-        {type: 'number', name: 'cbd_dist', numberType: 'integer'},
-        {type: 'string', name: 'cbd_dir'},
-        {type: 'string', name: 'act_date'},
-        {type: 'string', name: 'cert'},
-        {type: 'string', name: 'fed_agree'},
-        {type: 'string', name: 'cust_intl'},
-        {type: 'string', name: 'c_ldg_rts'},
-        {type: 'string', name: 'joint_use'},
-        {type: 'string', name: 'mil_rts'},
-        {type: 'string', name: 'cntl_twr'},
-        {type: 'string', name: 'major'},
-        {
-          type: 'number',
-          name: 'count',
-          expressionType: 'aggregate',
-          e: {node: 'aggregate', function: 'count', e: {node: ''}},
-        },
-      ],
-    },
+    withJoin(
+      AIRPORTS,
+      'one',
+      'destination',
+      'destination_code=destination.code'
+    ),
 
     // derived table from a named query.
     {
-      type: 'struct',
+      type: 'query_source',
       name: 'aircraft_facts',
       dialect: 'standardsql',
-      structSource: {
+      connection: 'bigquery',
+      query: {
         type: 'query',
-        query: {
-          type: 'query',
-          structRef: 'flights',
-          name: 'aircraft_facts_query',
-          pipeline: [
-            {
-              type: 'reduce',
-              queryFields: fToQF([
-                'tail_num',
-                {
-                  type: 'number',
-                  name: 'lifetime_distance',
-                  expressionType: 'aggregate',
-                  e: {
-                    node: 'aggregate',
-                    function: 'sum',
-                    e: {node: 'field', path: ['distance']},
-                  },
+        structRef: 'flights',
+        name: 'aircraft_facts_query',
+        pipeline: [
+          {
+            type: 'reduce',
+            queryFields: fToQF([
+              'tail_num',
+              {
+                type: 'number',
+                name: 'lifetime_distance',
+                expressionType: 'aggregate',
+                e: {
+                  node: 'aggregate',
+                  function: 'sum',
+                  e: {node: 'field', path: ['distance']},
                 },
-              ]),
-            },
-          ],
+              },
+            ]),
+          },
+        ],
+      },
+      join: 'one',
+      onExpression: {
+        node: '=',
+        kids: {
+          left: {node: 'field', path: ['tail_num']},
+          right: {node: 'field', path: ['aircraft_facts', 'tail_num']},
         },
       },
-      structRelationship: withJoin('tail_num', 'aircraft_facts.tail_num'),
       primaryKey: 'tail_num',
       fields: [
         {type: 'string', name: 'tail_num'},
@@ -922,53 +881,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
   ],
 };
 
-const tableAirports: StructDef = {
-  type: 'struct',
-  name: 'malloydata-org.malloytest.airports',
-  as: 'table_airports',
-  dialect: 'standardsql',
-  structSource: {
-    type: 'table',
-    tablePath: 'malloydata-org.malloytest.airports',
-  },
-  structRelationship: {type: 'basetable', connectionName: 'bigquery'},
-  primaryKey: 'code',
-  fields: [
-    {type: 'number', name: 'id', numberType: 'integer'},
-    {type: 'string', name: 'code'},
-    {type: 'string', name: 'site_number'},
-    {type: 'string', name: 'fac_type', as: 'facility_type'},
-    {type: 'string', name: 'fac_use', as: 'facility_use'},
-    {type: 'string', name: 'faa_region'},
-    {type: 'string', name: 'faa_dist'},
-    {type: 'string', name: 'city'},
-    {type: 'string', name: 'county'},
-    {type: 'string', name: 'state'},
-    {type: 'string', name: 'full_name'},
-    {type: 'string', name: 'own_type'},
-    {type: 'number', name: 'longitude', numberType: 'float'},
-    {type: 'number', name: 'latitude', numberType: 'float'},
-    {type: 'number', name: 'elevation', numberType: 'integer'},
-    {type: 'string', name: 'aero_cht'},
-    {type: 'number', name: 'cbd_dist', numberType: 'integer'},
-    {type: 'string', name: 'cbd_dir'},
-    {type: 'string', name: 'act_date'},
-    {type: 'string', name: 'cert'},
-    {type: 'string', name: 'fed_agree'},
-    {type: 'string', name: 'cust_intl'},
-    {type: 'string', name: 'c_ldg_rts'},
-    {type: 'string', name: 'joint_use'},
-    {type: 'string', name: 'mil_rts'},
-    {type: 'string', name: 'cntl_twr'},
-    {type: 'string', name: 'major'},
-    {
-      type: 'number',
-      name: 'count',
-      expressionType: 'aggregate',
-      e: {node: 'aggregate', function: 'count', e: {node: ''}},
-    },
-  ],
-};
+const tableAirports = {...AIRPORTS, as: 'table_airports'};
 
 /** Test model */
 export const testModel: ModelDef = {

package/src/models/medicare_model.ts

@@ -213,44 +213,38 @@ export const medicareModel: StructDef = {
   ],
   name: 'malloydata-org.malloytest.bq_medicare_test',
   primaryKey: 'id',
-  structRelationship: {type: 'basetable', connectionName: 'bigquery'},
-  structSource: {
-    type: 'table',
-    tablePath: 'malloydata-org.malloytest.bq_medicare_test',
-  },
-  type: 'struct',
+  connection: 'bigquery',
+  type: 'table',
+  tablePath: 'malloydata-org.malloytest.bq_medicare_test',
 };
 
 export const medicareStateFacts: StructDef = {
   fields: [],
   name: 'medicare_state_facts',
   dialect: 'standardsql',
-  structRelationship: {type: 'basetable', connectionName: 'bigquery'},
-  structSource: {
-    query: {
-      structRef: 'medicare_test',
-      pipeline: [
-        {
-          queryFields: fToQF([
-            'provider_state',
-            {
-              type: 'number',
-              name: 'num_providers',
-              expressionType: 'aggregate',
-              e: composeSQLExpr([
-                'COUNT(DISTINCT ',
-                {node: 'field', path: ['provider_id']},
-                ')',
-              ]),
-            },
-          ]),
-          type: 'reduce',
-        },
-      ],
-    },
-    type: 'query',
+  connection: 'bigquery',
+  type: 'query_source',
+  query: {
+    structRef: 'medicare_test',
+    pipeline: [
+      {
+        queryFields: fToQF([
+          'provider_state',
+          {
+            type: 'number',
+            name: 'num_providers',
+            expressionType: 'aggregate',
+            e: composeSQLExpr([
+              'COUNT(DISTINCT ',
+              {node: 'field', path: ['provider_id']},
+              ')',
+            ]),
+          },
+        ]),
+        type: 'reduce',
+      },
+    ],
   },
-  type: 'struct',
 };
 
 // export const medicareStateFacts: StructDef = {

package/src/util/db-jest-matchers.ts

@@ -30,6 +30,7 @@ import {
   MalloyError,
   LogMessage,
   SingleConnectionRuntime,
+  Tag,
 } from '@malloydata/malloy';
 import EventEmitter from 'events';
 import {inspect} from 'util';
@@ -60,8 +61,6 @@ declare global {
        *
        *   * If you use an array, the number of rows in the result must match the rows in the match
        *   * The empty match {} accepts ANY data, but will errror if there is not a row
-       *   * If the query is tagged with # test.debug then the test will fail and the result will be printed
-       *   * If the query is tagged with # test.verbose then the result will be printed only if the test fails
        *   * A match key of nestName.colName expects nestName to be a query which returns multiple rows, it will match
        *     fields from the first row of the rows of nestName
        *   * A match key of nestName/colName expects nestName to be a record/struct type
@@ -134,18 +133,18 @@ expect.extend({
     }
 
     let query: QueryMaterializer;
+    let queryTestTag: Tag | undefined = undefined;
     try {
       query = runtime.loadQuery(querySrc);
+      const queryTags = (await query.getPreparedQuery()).tagParse().tag;
+      queryTestTag = queryTags.tag('test');
     } catch (e) {
       return {
         pass: false,
-        message: () => `loadQuery failed: ${e.message}`,
+        message: () => `Could not prepare query to run: ${e.message}`,
       };
     }
 
-    const queryTags = (await query.getPreparedQuery()).tagParse().tag;
-    const queryTestTag = queryTags.tag('test');
-
     let result: Result;
     try {
       result = await query.run();

package/trino/trino_start.sh

@@ -2,6 +2,11 @@
 rm -rf .tmp
 mkdir .tmp
 
+
+if [ "x${BQ_CREDENTIALS_KEY}" = x ]; then
+  echo "######### BQ_CREDENTIALS_KEY is not set. Cannot start Trino"
+  exit 1
+fi
 # generate config file
 > ./.tmp/bigquery.properties
 cat << EOF > ./.tmp/bigquery.properties
@@ -31,4 +36,4 @@ do
   fi
 done
 
-echo "Trino running on port localhost:8080"
+echo "Trino running on port localhost:8080"