@malloydata/malloy-tests 0.0.184 → 0.0.185-dev240919025438

package/package.json

@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "^0.0.184",
-    "@malloydata/db-duckdb": "^0.0.184",
-    "@malloydata/db-postgres": "^0.0.184",
-    "@malloydata/db-snowflake": "^0.0.184",
-    "@malloydata/db-trino": "^0.0.184",
-    "@malloydata/malloy": "^0.0.184",
-    "@malloydata/render": "^0.0.184",
+    "@malloydata/db-bigquery": "^0.0.185-dev240919025438",
+    "@malloydata/db-duckdb": "^0.0.185-dev240919025438",
+    "@malloydata/db-postgres": "^0.0.185-dev240919025438",
+    "@malloydata/db-snowflake": "^0.0.185-dev240919025438",
+    "@malloydata/db-trino": "^0.0.185-dev240919025438",
+    "@malloydata/malloy": "^0.0.185-dev240919025438",
+    "@malloydata/render": "^0.0.185-dev240919025438",
     "jsdom": "^22.1.0",
     "luxon": "^2.4.0",
     "madge": "^6.0.0"
@@ -36,5 +36,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^2.4.0"
   },
-  "version": "0.0.184"
+  "version": "0.0.185-dev240919025438"
 }

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

@@ -32,7 +32,7 @@ const runtimes = new RuntimeList(databasesFromEnvironmentOr(allDatabases));
 
 // No prebuilt shared model, each test is complete.  Makes debugging easier.
 function rootDbPath(databaseName: string) {
-  return databaseName === 'bigquery' ? 'malloy-data.' : '';
+  return databaseName === 'bigquery' ? 'malloydata-org.' : '';
 }
 
 // TODO: Figure out how to generalize this.

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

@@ -37,7 +37,7 @@ describe('BigQuery double truncation', () => {
     expect(runtime).toBeDefined();
     if (runtime) {
       const src = `
-        run: bigquery.table('malloy-data.faa.flights') -> {
+        run: bigquery.table('malloydata-org.malloytest.flights') -> {
           group_by: takeoff_week is dep_time.week
         }
       `;

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

@@ -84,13 +84,13 @@ describe('BigQuery hand-built expression test', () => {
   }
 
   const modelHandBase: StructDef = {
-    name: 'malloy-data.malloytest.aircraft_models',
+    name: 'malloydata-org.malloytest.aircraft_models',
     as: 'aircraft_models',
     type: 'struct',
     dialect: 'standardsql',
     structSource: {
       type: 'table',
-      tablePath: 'malloy-data.malloytest.aircraft_models',
+      tablePath: 'malloydata-org.malloytest.aircraft_models',
     },
     structRelationship: {type: 'basetable', connectionName: 'bigquery'},
     fields: [
@@ -191,11 +191,11 @@ describe('BigQuery hand-built expression test', () => {
 
   const aircraftHandBase: StructDef = {
     type: 'struct',
-    name: 'malloy-data.malloytest.aircraft',
+    name: 'malloydata-org.malloytest.aircraft',
     dialect: 'standardsql',
     structSource: {
       type: 'table',
-      tablePath: 'malloy-data.malloytest.aircraft',
+      tablePath: 'malloydata-org.malloytest.aircraft',
     },
     structRelationship: {type: 'basetable', connectionName: 'bigquery'},
     fields: [

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

@@ -25,7 +25,7 @@ import {RuntimeList} from '../../runtimes';
 import {describeIfDatabaseAvailable} from '../../util';
 
 const [describe, databases] = describeIfDatabaseAvailable(['bigquery']);
-describe('Wildcard BigQuery Tables', () => {
+describe.skip('Wildcard BigQuery Tables', () => {
   const runtimes = new RuntimeList(databases);
 
   afterAll(async () => {
@@ -39,7 +39,7 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.itp_hourly_aircraft') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.itp_hourly_aircraft') extend {
           primary_key: id
           measure: aircraft_count is count()
           where: _PARTITIONTIME = @2023-03-06 17:00:00 to @2023-03-06 19:00:00
@@ -62,7 +62,7 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.itp_daily_aircraft') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.itp_daily_aircraft') extend {
           primary_key: id
           measure: aircraft_count is count()
           where: _PARTITIONTIME = @2023-03-06 00:00:00
@@ -79,7 +79,7 @@ describe('Wildcard BigQuery Tables', () => {
       const empty_result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.itp_daily_aircraft') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.itp_daily_aircraft') extend {
           primary_key: id
           measure: aircraft_count is count()
           where: _PARTITIONTIME = @2023-03-06 00:00:01
@@ -102,7 +102,7 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.itp_monthly_aircraft') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.itp_monthly_aircraft') extend {
           primary_key: id
           measure: aircraft_count is count()
           where: _PARTITIONTIME = @2023-03-01 00:00:00
@@ -119,7 +119,7 @@ describe('Wildcard BigQuery Tables', () => {
       const empty_result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.itp_monthly_aircraft') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.itp_monthly_aircraft') extend {
           primary_key: id
           measure: aircraft_count is count()
           where: _PARTITIONTIME = @2023-03-01 00:00:01
@@ -142,12 +142,12 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.itp_hourly_aircraft') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.itp_hourly_aircraft') extend {
           primary_key: id
           measure: aircraft_count is count()
           where: _PARTITIONTIME = @2023-03-06 17:00:00 to @2023-03-06 19:00:00
         }
-        source: state_facts is bigquery.table('malloy-data.malloytest.state_facts') extend {
+        source: state_facts is bigquery.table('malloydata-org.malloytest.state_facts') extend {
           join_many: aircraft on state = aircraft.state
         }
         run: state_facts -> {
@@ -179,12 +179,12 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-          source: aircraft is bigquery.table('malloy-data.malloytest.itp_hourly_aircraft') extend {
+          source: aircraft is bigquery.table('malloydata-org.malloytest.itp_hourly_aircraft') extend {
             primary_key: id
             measure: aircraft_count is count()
             where: _PARTITIONTIME = @2023-03-06 17:00:00 to @2023-03-06 19:00:00
           }
-          source: state_facts is bigquery.table('malloy-data.malloytest.state_facts') extend {
+          source: state_facts is bigquery.table('malloydata-org.malloytest.state_facts') extend {
             join_many: aircraft on state = aircraft.state
           }
           run: state_facts -> {
@@ -212,7 +212,7 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.itp_daily_aircraft') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.itp_daily_aircraft') extend {
           primary_key: id
           measure: aircraft_count is count()
           where: _PARTITIONDATE = @2023-03-06
@@ -235,7 +235,7 @@ describe('Wildcard BigQuery Tables', () => {
         runtime
           .loadQuery(
             `
-        source: aircraft is bigquery.table('malloy-data.malloytest.itp_hourly_aircraft') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.itp_hourly_aircraft') extend {
           primary_key: id
           measure: aircraft_count is count()
           where: _PARTITIONDATE = @2023-03-06
@@ -251,7 +251,7 @@ describe('Wildcard BigQuery Tables', () => {
         runtime
           .loadQuery(
             `
-        source: aircraft is bigquery.table('malloy-data.malloytest.itp_monthly_aircraft') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.itp_monthly_aircraft') extend {
           primary_key: id
           measure: aircraft_count is count()
           where: _PARTITIONDATE = @2023-03-06

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

@@ -26,12 +26,12 @@ import {describeIfDatabaseAvailable} from '../../util';
 
 function sourceCodeWithFilter(filter: string) {
   return `
-  source: aircraft_models is bigquery.table('malloy-data.faa.aircraft_models') extend {
+  source: aircraft_models is bigquery.table('malloydata-org.malloytest.aircraft_models') extend {
     primary_key: aircraft_model_code
     where: ${filter}
   }
 
-  source: aircraft is bigquery.table('malloy-data.faa.aircraft') extend {
+  source: aircraft is bigquery.table('malloydata-org.malloytest.aircraft') extend {
     primary_key: tail_num
     measure: aircraft_count is count()
     join_one: aircraft_models with aircraft_model_code

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

@@ -597,7 +597,7 @@ describe('BigQuery expression tests', () => {
 });
 
 const airportModelText = `
-source: airports is bigquery.table('malloy-data.malloytest.airports') extend {
+source: airports is bigquery.table('malloydata-org.malloytest.airports') extend {
   primary_key: code
   measure: airport_count is count()
 

package/src/databases/bigquery/performance.skipped.spec.ts

@@ -34,7 +34,7 @@ it.skip('accessors are not too expensive', async () => {
   if (runtime) {
     const result = await runtime
       .loadQuery(
-        "source 'malloy-data.faa.flights' | reduce inner is (reduce top 1000000 distance id2)"
+        "source 'malloydata-org.malloytest.flights' | reduce inner is (reduce top 1000000 distance id2)"
       )
       .run();
     let noAccessorTime;

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

@@ -39,7 +39,7 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.wildcard_aircraft_*') extend {
           primary_key: id
           measure: aircraft_count is count()
         }
@@ -61,7 +61,7 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.wildcard_aircraft_*') extend {
           primary_key: id
           measure: aircraft_count is count()
           where: _TABLE_SUFFIX = '01'
@@ -84,11 +84,11 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.wildcard_aircraft_*') extend {
           primary_key: id
         }
 
-        source: state_facts is bigquery.table('malloy-data.malloytest.state_facts') extend {
+        source: state_facts is bigquery.table('malloydata-org.malloytest.state_facts') extend {
           join_many: aircraft on state = aircraft.state
         }
         run: state_facts -> {
@@ -120,12 +120,12 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.wildcard_aircraft_*') extend {
           primary_key: id
           where: _TABLE_SUFFIX = '02'
         }
 
-        source: state_facts is bigquery.table('malloy-data.malloytest.state_facts') extend {
+        source: state_facts is bigquery.table('malloydata-org.malloytest.state_facts') extend {
           join_many: aircraft on state = aircraft.state
         }
         run: state_facts -> {
@@ -154,8 +154,8 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
-          join_many: state_facts is bigquery.table('malloy-data.malloytest.state_facts')
+        source: aircraft is bigquery.table('malloydata-org.malloytest.wildcard_aircraft_*') extend {
+          join_many: state_facts is bigquery.table('malloydata-org.malloytest.state_facts')
             on state_facts.state = state
         }
 
@@ -180,12 +180,12 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.wildcard_aircraft_*') extend {
           primary_key: id
           where: _TABLE_SUFFIX = '02'
         }
 
-        source: state_facts is bigquery.table('malloy-data.malloytest.state_facts') extend {
+        source: state_facts is bigquery.table('malloydata-org.malloytest.state_facts') extend {
           join_many: aircraft on state = aircraft.state
         }
         run: state_facts -> {
@@ -210,12 +210,12 @@ describe('Wildcard BigQuery Tables', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
+        source: aircraft is bigquery.table('malloydata-org.malloytest.wildcard_aircraft_*') extend {
           primary_key: id
           where: _TABLE_SUFFIX = '02'
         }
 
-        source: state_facts is bigquery.table('malloy-data.malloytest.state_facts') extend {
+        source: state_facts is bigquery.table('malloydata-org.malloytest.state_facts') extend {
           join_many: aircraft on state = aircraft.state
         }
         run: state_facts -> {

package/src/databases/streaming/streaming.spec.ts

@@ -43,7 +43,8 @@ class StringAccumulator implements WriteStream {
 }
 
 const [describe, databases] = describeIfDatabaseAvailable([
-  'bigquery',
+  // FIXME
+  // 'bigquery',
   'postgres',
   'duckdb',
   'duckdb_wasm',

package/src/models/faa_model.ts

@@ -47,12 +47,12 @@ function withJoin(leftKey: string, rightKey: string): StructRelationship {
 /** Flight Model */
 export const FLIGHTS_EXPLORE: StructDef = {
   type: 'struct',
-  name: 'malloy-data.malloytest.flights',
+  name: 'malloydata-org.malloytest.flights',
   as: 'flights',
   dialect: 'standardsql',
   structSource: {
     type: 'table',
-    tablePath: 'malloy-data.malloytest.flights',
+    tablePath: 'malloydata-org.malloytest.flights',
   },
   structRelationship: {type: 'basetable', connectionName: 'bigquery'},
   primaryKey: 'id2',
@@ -93,12 +93,12 @@ export const FLIGHTS_EXPLORE: StructDef = {
     // carriers
     {
       type: 'struct',
-      name: 'malloy-data.malloytest.carriers',
+      name: 'malloydata-org.malloytest.carriers',
       as: 'carriers',
       dialect: 'standardsql',
       structSource: {
         type: 'table',
-        tablePath: 'malloy-data.malloytest.carriers',
+        tablePath: 'malloydata-org.malloytest.carriers',
       },
       structRelationship: {
         type: 'one',
@@ -120,12 +120,12 @@ export const FLIGHTS_EXPLORE: StructDef = {
     // aircraft
     {
       type: 'struct',
-      name: 'malloy-data.malloytest.aircraft',
+      name: 'malloydata-org.malloytest.aircraft',
       as: 'aircraft',
       dialect: 'standardsql',
       structSource: {
         type: 'table',
-        tablePath: 'malloy-data.malloytest.aircraft',
+        tablePath: 'malloydata-org.malloytest.aircraft',
       },
       structRelationship: withJoin('tail_num', 'aircraft.tail_num'),
       primaryKey: 'tail_num',
@@ -183,13 +183,13 @@ export const FLIGHTS_EXPLORE: StructDef = {
         // subjoin aircraft models
         {
           type: 'struct',
-          name: 'malloy-data.malloytest.aircraft_models',
+          name: 'malloydata-org.malloytest.aircraft_models',
           as: 'aircraft_models',
           dialect: 'standardsql',
           primaryKey: 'aircraft_model_code',
           structSource: {
             type: 'table',
-            tablePath: 'malloy-data.malloytest.aircraft_models',
+            tablePath: 'malloydata-org.malloytest.aircraft_models',
           },
           structRelationship: withJoin(
             'aircraft_model_code',
@@ -237,12 +237,12 @@ export const FLIGHTS_EXPLORE: StructDef = {
     // origin
     {
       type: 'struct',
-      name: 'malloy-data.malloytest.airports',
+      name: 'malloydata-org.malloytest.airports',
       as: 'origin',
       dialect: 'standardsql',
       structSource: {
         type: 'table',
-        tablePath: 'malloy-data.malloytest.airports',
+        tablePath: 'malloydata-org.malloytest.airports',
       },
       structRelationship: withJoin('origin_code', 'origin.code'),
       primaryKey: 'code',
@@ -286,12 +286,12 @@ export const FLIGHTS_EXPLORE: StructDef = {
     // destination
     {
       type: 'struct',
-      name: 'malloy-data.malloytest.airports',
+      name: 'malloydata-org.malloytest.airports',
       as: 'destination',
       dialect: 'standardsql',
       structSource: {
         type: 'table',
-        tablePath: 'malloy-data.malloytest.airports',
+        tablePath: 'malloydata-org.malloytest.airports',
       },
       structRelationship: withJoin('destination_code', 'destination.code'),
       primaryKey: 'code',
@@ -924,12 +924,12 @@ export const FLIGHTS_EXPLORE: StructDef = {
 
 const tableAirports: StructDef = {
   type: 'struct',
-  name: 'malloy-data.malloytest.airports',
+  name: 'malloydata-org.malloytest.airports',
   as: 'table_airports',
   dialect: 'standardsql',
   structSource: {
     type: 'table',
-    tablePath: 'malloy-data.malloytest.airports',
+    tablePath: 'malloydata-org.malloytest.airports',
   },
   structRelationship: {type: 'basetable', connectionName: 'bigquery'},
   primaryKey: 'code',

package/src/models/medicare_model.ts

@@ -211,12 +211,12 @@ export const medicareModel: StructDef = {
       ],
     },
   ],
-  name: 'malloy-data.malloytest.bq_medicare_test',
+  name: 'malloydata-org.malloytest.bq_medicare_test',
   primaryKey: 'id',
   structRelationship: {type: 'basetable', connectionName: 'bigquery'},
   structSource: {
     type: 'table',
-    tablePath: 'malloy-data.malloytest.bq_medicare_test',
+    tablePath: 'malloydata-org.malloytest.bq_medicare_test',
   },
   type: 'struct',
 };

package/src/render/render.spec.ts

@@ -75,7 +75,7 @@ describe('rendering results', () => {
     expect(runtime).toBeDefined();
     if (runtime) {
       const src = `
-        run: bigquery.table('malloy-data.faa.flights') -> {
+        run: bigquery.table('malloydata-org.malloytest.flights') -> {
           group_by: carrier
           aggregate: flight_count is count()
         }

package/src/runtimes.ts

@@ -136,7 +136,7 @@ export function runtimeFor(dbName: string): SingleConnectionRuntime {
         connection = new BigQueryTestConnection(
           dbName,
           {},
-          {projectId: 'malloy-data'}
+          {projectId: 'malloydata-org'}
         );
         break;
       case 'postgres':

package/src/tags.spec.ts

@@ -522,4 +522,29 @@ describe('tags in results', () => {
     expect(plotTag!.numeric('x')).toEqual(2);
     expect(x).toEqual(2);
   });
+  test('nested fields of same field do not share tags', async () => {
+    const loaded = runtime.loadQuery(`
+      source: one is duckdb.sql("SELECT 1 as one")
+      run: one -> {
+        nest: a is {
+          # a
+          group_by: one
+        }
+        nest: b is {
+          # b
+          group_by: one
+        }
+      }
+    `);
+    const result = await loaded.run();
+    const shape = result.resultExplore;
+    const a = shape.getFieldByName('a');
+    expect(a.isExploreField()).toBe(true);
+    if (a.isExploreField()) {
+      const one = a.getFieldByName('one');
+      expect(one.tagParse().tag).tagsAre({
+        a: {},
+      });
+    }
+  });
 });