@malloydata/malloy-tests 0.0.299 → 0.0.301

package/src/models/faa_model.ts

@@ -21,887 +21,279 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import type {
-  ModelDef,
-  StructDef,
-  TableSourceDef,
-  JoinFieldDef,
-} from '@malloydata/malloy';
-
-import {fStringEq, fToIF, fToQF, fYearEq} from '../util';
-
-import {medicareModel, medicareStateFacts} from './medicare_model';
-
-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;
+import {medicareModel} from './medicare_model';
+
+const faaModel = `
+  source: aircraft_models is bigquery.table('malloytest.aircraft_models') extend {
+    primary_key: aircraft_model_code
+
+    measure:
+      total_seats is seats.sum()
+  }
+
+  source: airports is bigquery.table('malloytest.airports') extend {
+    primary_key: code
+    measure: \`count\` is count()
+  }
+
+  source: carriers is bigquery.table('malloytest.carriers') extend {
+    primary_key: code
   }
-  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 = {
-  name: 'malloydata-org.malloytest.flights',
-  as: 'flights',
-  dialect: 'standardsql',
-  type: 'table',
-  tablePath: 'malloydata-org.malloytest.flights',
-  connection: 'bigquery',
-  primaryKey: 'id2',
-  fields: [
-    // Fields in the flights table.
-    {type: 'string', name: 'carrier'},
-    {type: 'string', name: 'origin', as: 'origin_code'},
-    {type: 'timestamp', name: 'dep_time'},
-    {type: 'string', name: 'destination', as: 'destination_code'},
-    {type: 'string', name: 'flight_num'},
-    {type: 'number', name: 'flight_time', numberType: 'integer'},
-    {type: 'string', name: 'tail_num'},
-    {type: 'number', name: 'dep_delay', numberType: 'integer'},
-    {type: 'number', name: 'arr_delay', numberType: 'integer'},
-    {type: 'number', name: 'taxi_out', numberType: 'integer'},
-    {type: 'number', name: 'taxi_in', numberType: 'integer'},
-    {type: 'number', name: 'distance', numberType: 'integer'},
-    {type: 'string', name: 'cancelled'},
-    {type: 'string', name: 'diverted'},
-    {type: 'number', name: 'id2', numberType: 'integer'},
-    {
-      type: 'number',
-      name: 'flight_count',
-      expressionType: 'aggregate',
-      e: {node: 'aggregate', function: 'count', e: {node: ''}},
-    },
-    {
-      type: 'number',
-      name: 'total_distance',
-      expressionType: 'aggregate',
-      e: {
-        node: 'aggregate',
-        function: 'sum',
-        e: {node: 'field', path: ['distance']},
-      },
-    },
-
-    withJoin(CARRIERS, 'one', 'carriers', 'carrier=carriers.code'),
-
-    // aircraft
-    withJoin(AIRCRAFT, 'one', 'aircraft', 'tail_num=aircraft.tail_num'),
-
-    // origin
-    withJoin(AIRPORTS, 'one', 'origin', 'origin_code=origin.code'),
-
-    // destination
-    withJoin(
-      AIRPORTS,
-      'one',
-      'destination',
-      'destination_code=destination.code'
-    ),
-
-    // derived table from a named query.
-    {
-      type: 'query_source',
-      name: 'aircraft_facts',
-      dialect: 'standardsql',
-      connection: 'bigquery',
-      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']},
-                },
-              },
-            ]),
-          },
-        ],
-      },
-      join: 'one',
-      onExpression: {
-        node: '=',
-        kids: {
-          left: {node: 'field', path: ['tail_num']},
-          right: {node: 'field', path: ['aircraft_facts', 'tail_num']},
-        },
-      },
-      primaryKey: 'tail_num',
-      fields: [
-        {type: 'string', name: 'tail_num'},
-        {type: 'number', name: 'lifetime_distance'},
-      ],
-    },
-
-    {
-      type: 'turtle',
-      name: 'flights_by_carrier',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF([
-            'carriers.name',
-            'flight_count',
-            // { name: "origin.count", as: "origin_count" },
-            {
-              type: 'number',
-              name: 'origin_count',
-              expressionType: 'aggregate',
-              e: {
-                node: 'aggregate',
-                function: 'count',
-                e: {node: ''},
-                structPath: ['origin'],
-              },
-            },
-            {
-              type: 'number',
-              name: 'my_total_distance',
-              expressionType: 'aggregate',
-              e: {
-                node: 'aggregate',
-                function: 'sum',
-                e: {node: 'field', path: ['distance']},
-              },
-            },
-          ]),
-          orderBy: [{field: 'name', dir: 'asc'}],
-        },
-      ],
-    },
-    {
-      type: 'turtle',
-      name: 'flights_by_carrier_2001_2002',
-      pipeline: [
-        {
-          type: 'reduce',
-
-          queryFields: fToQF([
-            'carriers.name',
-            {
-              name: 'flights_2001',
-              type: 'number',
-              expressionType: 'aggregate',
-              e: {
-                node: 'filteredExpr',
-                kids: {
-                  filterList: [fYearEq('dep_time', 2001)],
-                  e: {node: 'aggregate', function: 'count', e: {node: ''}},
-                },
-              },
-            },
-            {
-              name: 'flights_2002',
-              type: 'number',
-              expressionType: 'aggregate',
-              e: {
-                node: 'filteredExpr',
-                kids: {
-                  filterList: [fYearEq('dep_time', 2001)],
-                  e: {node: 'aggregate', function: 'count', e: {node: ''}},
-                },
-              },
-            },
-          ]),
-          orderBy: [{field: 'name', dir: 'asc'}],
-        },
-      ],
-    },
-    // EXPLORE flights | REDUCE destination.city, flight_count ORDER BY 2 desc
-    {
-      type: 'turtle',
-      name: 'flights_by_city_top_5',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF(['destination.city', 'flight_count']),
-          orderBy: [{field: 2, dir: 'desc'}],
-          limit: 5,
-        },
-      ],
-    },
-    // EXPLORE flights [origin.state:'CA] | REDUCE aircraft.aircraft_models.manufacturer, aircraft.aircraft_models.manufacturer.
-    //    aircraft.aircraft_count, flight_count ORDER BY flight_count LIMIT 5
-    {
-      type: 'turtle',
-      name: 'flights_by_model',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF([
-            'aircraft.aircraft_models.manufacturer',
-            'aircraft.aircraft_models.model',
-            'aircraft.aircraft_count',
-            'flight_count',
-          ]),
-          orderBy: [{field: 'flight_count', dir: 'desc'}],
-          filterList: [fStringEq('origin.state', 'CA')],
-          limit: 5,
-        },
-      ],
-    },
-    // EXPLORE flights | REDUCE tail_num, total_distance as lifetime_distance
-    {
-      type: 'turtle',
-      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']},
-              },
-            },
-          ]),
-        },
-      ],
-    },
-    // expore flights | reduce carriers.name, aircraft.total_engines, flight_count
-    {
-      type: 'turtle',
-      name: 'carriers_by_total_engines',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF([
-            'carriers.name',
-            'aircraft.total_engines',
-            'flight_count',
-          ]),
-        },
-      ],
-    },
-    // expore flights | reduce aircraft_facts.lifetime_distance, flight_count
-    {
-      type: 'turtle',
-      name: 'aircraft_facts_test',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF([
-            'aircraft_facts.lifetime_distance',
-            'flight_count',
-          ]),
-        },
-      ],
-    },
-    // expore flights | reduce flight_count, origin.city, origin.state
-    {
-      type: 'turtle',
-      name: 'measures_first',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF(['flight_count', 'origin.city', 'origin.state']),
-        },
-      ],
-    },
-
-    // explore flights
-    // | reduce
-    //   carrier
-    //   flight_count
-    //   top_5_routes is (reduce top 5 order by 3 desc
-    //      origin_code
-    //      destination_code,
-    //      flight_count
-    //   )
-    {
-      type: 'turtle',
-      name: 'first_turtle',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF([
-            'carrier',
-            'flight_count',
-            {
-              type: 'turtle',
-              name: 'top_5_routes',
-              pipeline: [
-                {
-                  type: 'reduce',
-                  queryFields: fToQF([
-                    'origin_code',
-                    'destination_code',
-                    'flight_count',
-                  ]),
-                  limit: 5,
-                  orderBy: [{field: 'flight_count', dir: 'desc'}],
-                },
-              ],
-            },
-          ]),
-        },
-      ],
-    },
-    // explore flights
-    // | reduce order by 3 desc
-    //    origin_code
-    //    destination_code
-    //    flight_count
-    {
-      type: 'turtle',
-      name: 'top_5_routes',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF([
-            'origin_code',
-            'destination_code',
-            'flight_count',
-          ]),
-          limit: 5,
-          orderBy: [{field: 'flight_count', dir: 'desc'}],
-        },
-      ],
-    },
-    // EXPLORE flights | REDUCE carrier, flight_count, top_5_routes
-    {
-      type: 'turtle',
-      name: 'carriers_routes',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF(['carrier', 'flight_count', 'top_5_routes']),
-        },
-      ],
-    },
-    // EXPLORE flights [destination.state: 'NY] | REDUCE destination.code as newyork_airport, flight_count ORDER BY 2 DESC
-    {
-      type: 'turtle',
-      name: 'new_york_airports',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF(['destination.code', 'flight_count']),
-          filterList: [fStringEq('destination.state', 'NY')],
-          orderBy: [{field: 'flight_count', dir: 'desc'}],
-        },
-      ],
-    },
-    // EXPLORE flights | REDUCE aircraft.aircraft_models.manufacturer, aircraft.aircraft_count, flight_count ORDER BY 3 DESC
-    {
-      type: 'turtle',
-      name: 'flights_by_manufacturer',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF([
-            'aircraft.aircraft_models.manufacturer',
-            'aircraft.aircraft_count',
-            'flight_count',
-          ]),
-          orderBy: [{field: 'flight_count', dir: 'desc'}],
-          limit: 5,
-        },
-      ],
-    },
-    // EXPLORE flights [origin.state:'CA'x] | REDUCE carrier, flight_count, top_5_routes, flights_by_manufacturer
-    {
-      type: 'turtle',
-      name: 'carriers_routes_manufacturer',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF([
-            'carrier',
-            'flight_count',
-            'top_5_routes',
-            'flights_by_manufacturer',
-          ]),
-          filterList: [fStringEq('origin.state', 'CA')],
-        },
-      ],
-    },
-    {
-      type: 'turtle',
-      name: 'top_5_routes_carriers',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF([
-            'origin_code',
-            'destination_code',
-            'flight_count',
-            'flights_by_carrier',
-          ]),
-          limit: 5,
-          orderBy: [{field: 'flight_count', dir: 'desc'}],
-        },
-      ],
-    },
-    {
-      type: 'turtle',
-      name: 'flights_by_carrier_with_totals',
-      pipeline: [
-        {
-          type: 'reduce',
-          filterList: [fStringEq('origin.state', 'CA')],
-          queryFields: fToQF([
-            {
-              type: 'turtle',
-              name: 'main',
-              pipeline: [
-                {
-                  type: 'reduce',
-                  queryFields: fToQF([
-                    'carriers.name',
-                    'flight_count',
-                    //{ name: "origin.count", as: "origin_count" },
-                    {
-                      type: 'number',
-                      name: 'origin_count',
-                      expressionType: 'aggregate',
-                      e: {
-                        node: 'aggregate',
-                        function: 'count',
-                        e: {node: ''},
-                        structPath: ['origin'],
-                      },
-                    },
-                  ]),
-                  orderBy: [{field: 'flight_count', dir: 'desc'}],
-                },
-              ],
-            },
-            {
-              type: 'turtle',
-              name: 'totals',
-              pipeline: [
-                {
-                  type: 'reduce',
-                  queryFields: fToQF(['flight_count']),
-                },
-              ],
-            },
-          ]),
-        },
-      ],
-    },
-    {
-      type: 'turtle',
-      name: 'flight_detail',
-      pipeline: [
-        {
-          type: 'reduce',
-          orderBy: [{field: 'dep_time', dir: 'asc'}],
-          queryFields: fToQF([
-            'id2',
-            'dep_time',
-            'tail_num',
-            'carrier',
-            'origin_code',
-            'destination_code',
-            'distance',
-            'dep_delay',
-          ]),
-          limit: 500,
-        },
-      ],
-    },
-    {
-      type: 'turtle',
-      name: 'some_measures',
-      pipeline: [
-        {
-          type: 'reduce',
-          queryFields: fToQF([
-            'flight_count',
-            'total_distance',
-            'aircraft.aircraft_count',
-          ]),
-        },
-      ],
-    },
-    {
-      type: 'turtle',
-      name: 'flights_routes_sessionized',
-      pipeline: [
-        {
-          type: 'reduce',
-          filterList: [
-            fStringEq('origin.state', 'CA'),
-            fStringEq('carrier', 'UA'),
-          ],
-          limit: 20,
-          queryFields: fToQF([
-            {
-              type: 'timestamp',
-              name: 'dep_time',
-              as: 'dep_date',
-              timeframe: 'day',
-            },
-            'carrier',
-            {
-              type: 'turtle',
-              name: 'routes',
-              pipeline: [
-                {
-                  type: 'reduce',
-                  queryFields: fToQF([
-                    'origin_code',
-                    'destination_code',
-                    'flight_count',
-                    {
-                      type: 'turtle',
-                      name: 'flight_detail',
-                      pipeline: [
-                        {
-                          type: 'reduce',
-                          orderBy: [{field: 'dep_time', dir: 'asc'}],
-                          limit: 5,
-                          queryFields: fToQF([
-                            'id2',
-                            'dep_time',
-                            'tail_num',
-                            'flight_num',
-                            'dep_delay',
-                          ]),
-                        },
-                      ],
-                    },
-                  ]),
-                  orderBy: [{field: 'flight_count', dir: 'desc'}],
-                },
-              ],
-            },
-          ]),
-        },
-      ],
-    },
-    /*
-      FROM flights |
-        REDUCE
-          dep_time.date as dep_date,
-          carrier,
-          flight_count,
-          (REDUCE
-            tail_num,
-            flight_count,
-            (REDUCE
-              id2, dep_time, origin_code, destination_code, flight_num, dep_delay
-              ORDER BY 2
-            )
-          ) as aircraft
-    */
-    {
-      type: 'turtle',
-      name: 'flights_aircraft_sessionized',
-      pipeline: [
-        {
-          type: 'reduce',
-          filterList: [fStringEq('carrier', 'UA')],
-          limit: 2,
-          queryFields: fToQF([
-            {
-              type: 'timestamp',
-              name: 'dep_time',
-              as: 'dep_date',
-              timeframe: 'day',
-            },
-            'carrier',
-            'flight_count',
-            {
-              type: 'turtle',
-              name: 'aircraft',
-              pipeline: [
-                {
-                  type: 'reduce',
-                  limit: 10,
-                  queryFields: fToQF([
-                    'tail_num',
-                    'flight_count',
-                    {
-                      type: 'turtle',
-                      name: 'flight_detail',
-                      pipeline: [
-                        {
-                          type: 'reduce',
-                          orderBy: [{field: 'dep_time', dir: 'asc'}],
-                          queryFields: fToQF([
-                            'id2',
-                            'dep_time',
-                            'origin_code',
-                            'destination_code',
-                            'flight_num',
-                            'dep_delay',
-                          ]),
-                        },
-                      ],
-                    },
-                  ]),
-                  orderBy: [{field: 'flight_count', dir: 'desc'}],
-                },
-              ],
-            },
-          ]),
-        },
-      ],
-    },
-    {
-      type: 'turtle',
-      name: 'search_index',
-      pipeline: [
-        {
-          type: 'index',
-          weightMeasure: 'flight_count',
-          indexFields: fToIF([
-            'carrier',
-            'origin_code',
-            'destination_code',
-            'carriers.name',
-            'carriers.nickname',
-            'carriers.code',
-            'origin.code',
-            'origin.full_name',
-            'origin.city',
-            'origin.state',
-            'destination.code',
-            'destination.full_name',
-            'destination.city',
-            'destination.state',
-            'aircraft.aircraft_model_code',
-            'aircraft.aircraft_models.manufacturer',
-            'aircraft.aircraft_models.model',
-          ]),
-        },
-      ],
-    },
-    // {
-    //   type: "reduce",
-    //   name: "some_measures",
-    //   fields: ["flight_count", "total_distance"],
-    // },
-  ],
-};
-
-const tableAirports = {...AIRPORTS, as: 'table_airports'};
-
-/** Test model */
-export const testModel: ModelDef = {
-  name: 'Hand Coded Models',
-  exports: [
-    'flights',
-    'table_airports',
-    'medicare_test',
-    'medicare_state_facts',
-    // "aircraft",
-  ],
-  queryList: [],
-  dependencies: {},
-  contents: {
-    flights: FLIGHTS_EXPLORE,
-    table_airports: tableAirports,
-    medicare_test: medicareModel,
-    medicare_state_facts: medicareStateFacts,
-    // aircraft: aircraftHandStructDef,
-  },
-};
-
-// // clang-format on
+
+  source: aircraft is bigquery.table('malloytest.aircraft') extend {
+    primary_key: tail_num
+
+    join_one: aircraft_models on aircraft_model_code = aircraft_models.aircraft_model_code
+
+    measure:
+      aircraft_count is count()
+      total_engines is aircraft_models.engines.sum()
+  }
+
+  source: flights is bigquery.table('malloytest.flights') extend {
+    primary_key: id2
+
+    rename:
+      origin_code is origin
+      destination_code is destination
+
+    measure:
+      flight_count is count()
+      total_distance is distance.sum()
+
+    join_one: carriers on carrier = carriers.code
+
+    join_one: aircraft on tail_num = aircraft.tail_num
+
+    join_one: origin is airports on origin_code = origin.code
+
+    join_one: destination is airports on destination_code = destination.code
+
+    join_one: aircraft_facts is  bigquery.table('malloytest.flights') -> {
+      group_by: tail_num
+      aggregate: lifetime_distance is distance.sum()
+    } extend {
+      primary_key: tail_num
+    } on tail_num = aircraft_facts.tail_num
+
+    view: flights_by_carrier is {
+      group_by: carriers.name
+      aggregate: flight_count
+      aggregate: origin_count is origin.count()
+      aggregate: my_total_distance is distance.sum()
+      order_by: name asc
+    }
+
+    view: flights_by_carrier_2001_2002 is {
+      group_by: carriers.name
+      aggregate: flights_2001 is count() {
+        where: dep_time.year = @2001
+      }
+      aggregate: flights_2002 is count() {
+        where: dep_time.year = @2002
+      }
+      order_by: name asc
+    }
+
+    view: flights_by_city_top_5 is {
+      group_by: destination.city
+      aggregate: flight_count
+      limit: 5
+    }
+
+    view: flights_by_model is {
+      group_by:
+        aircraft.aircraft_models.manufacturer
+        aircraft.aircraft_models.model
+      aggregate:
+        aircraft.aircraft_count
+        flight_count
+      limit: 5
+    }
+
+    view: aircraft_facts_query is {
+      group_by: tail_num
+      aggregate: lifetime_distance is distance.sum()
+    }
+
+    view: carriers_by_total_engines is {
+      group_by: carriers.name
+      aggregate:
+        aircraft.total_engines
+        flight_count
+    }
+
+    view: aircraft_facts_test is {
+      group_by: aircraft_facts.lifetime_distance
+      aggregate: flight_count
+    }
+
+    view: measures_first is {
+      aggregate:
+        flight_count
+      group_by:
+        origin.city
+        origin.state
+    }
+
+    view: top_5_routes is {
+      group_by:
+        origin_code
+        destination_code
+      aggregate: flight_count
+      order_by: flight_count desc
+      limit: 5
+    }
+
+    view: first_turtle is {
+      group_by: carrier
+      aggregate: flight_count
+      nest: top_5_routes
+    }
+
+    view: carriers_routes is {
+      group_by: carrier
+      aggregate: flight_count
+      nest: top_5_routes
+    }
+
+    view: new_york_airports is {
+      group_by: destination.code
+      aggregate: flight_count
+      where: destination.state = 'NY'
+      order_by: flight_count desc
+    }
+
+    view: flights_by_manufacturer is {
+      group_by: aircraft.aircraft_models.manufacturer
+      aggregate:
+        aircraft.aircraft_count
+        flight_count
+      limit: 5
+    }
+
+    view: carriers_routes_manufacturer is {
+      group_by: carrier
+      aggregate: flight_count
+      nest: top_5_routes
+      nest: flights_by_manufacturer
+    }
+
+    view: top_5_routes_carriers is {
+      group_by:
+        origin_code
+        destination_code
+      aggregate: flight_count
+      nest: flights_by_carrier
+      limit: 5
+      order_by: flight_count desc
+    }
+
+    view: flights_by_carrier_with_totals is {
+      where: origin.state = 'CA'
+      nest: main is {
+        group_by: carriers.name
+        aggregate: flight_count
+        aggregate: origin_count is origin.count()
+        order_by: flight_count desc
+      }
+    }
+
+    view: totals is {
+      aggregate: flight_count
+    }
+
+    view: flight_detail is {
+      group_by:
+        id2
+        dep_time
+        tail_num
+        carrier
+        origin_code
+        destination_code
+        distance
+        dep_delay
+      order_by: dep_time asc
+      limit: 500
+    }
+
+    view: some_measures is {
+      aggregate:
+        flight_count
+        total_distance
+        aircraft.aircraft_count
+    }
+
+    view: flights_routes_sessionized is {
+      where: origin.state = 'CA'
+      where: carrier = 'UA'
+      limit: 20
+      group_by: dep_date is dep_time.day
+      group_by: carrier
+      nest: routes is {
+        group_by:
+          origin_code
+          destination_code
+        aggregate:
+          flight_count
+        nest: flight_detail is {
+          group_by:
+            id2
+            dep_time
+            tail_num
+            distance
+            dep_delay
+          order_by: dep_time asc
+          limit: 5
+        }
+        order_by: flight_count desc
+      }
+    }
+
+    view: flights_aircraft_sessionized is {
+      group_by: dep_date is dep_time.day
+      group_by: carrier
+      aggregate: flight_count
+      nest: aircraft is {
+        group_by: tail_num
+        aggregate: flight_count
+        nest: flight_detail is {
+          group_by:
+            id2
+            dep_time
+            origin_code
+            destination_code
+            flight_num
+            dep_delay
+          order_by: 2
+        }
+        order_by: flight_count desc
+      }
+    }
+
+    view: search_index is {
+      index:
+        carrier
+        origin_code
+        destination_code
+        carriers.name
+        carriers.nickname
+        carriers.code
+        origin.code
+        origin.full_name
+        origin.city
+        origin.state
+        destination.code
+        destination.full_name
+        destination.city
+        destination.state
+        aircraft.aircraft_model_code
+        aircraft.aircraft_models.manufacturer
+        aircraft.aircraft_models.model
+    }
+  }
+
+  source: table_airports is airports
+`;
+
+export const testModel = faaModel + medicareModel;