@malloydata/malloy-tests 0.0.88-dev231002231014 → 0.0.88-dev231002235732

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

@@ -29,26 +29,26 @@ import '../../util/db-jest-matchers';
 
 const runtimes = new RuntimeList(databasesFromEnvironmentOr(allDatabases));
 const joinModelText = `
-  source: aircraft_models is table('malloytest.aircraft_models') {
+  source: aircraft_models is table('malloytest.aircraft_models') extend {
     primary_key: aircraft_model_code
     measure: model_count is count()
-    query: manufacturer_models is {
+    view: manufacturer_models is {
       group_by: manufacturer
       aggregate: num_models is count()
     }
-    query: manufacturer_seats is {
+    view: manufacturer_seats is {
       group_by: manufacturer
       aggregate: total_seats is seats.sum()
     }
   }
 
-  source: aircraft is table('malloytest.aircraft'){
+  source: aircraft is table('malloytest.aircraft') extend {
     primary_key: tail_num
     measure: aircraft_count is count()
   }
 
-  source: funnel is from(aircraft_models->manufacturer_models) {
-    join_one: seats is from(aircraft_models->manufacturer_seats)
+  source: funnel is aircraft_models->manufacturer_models extend {
+    join_one: seats is aircraft_models->manufacturer_seats
         with manufacturer
   }
 `;
@@ -69,11 +69,11 @@ describe('join expression tests', () => {
         .loadModel(joinModelText)
         .loadQuery(
           `
-      source: a2 is aircraft {
+      source: a2 is aircraft extend {
         join_one: aircraft_models with aircraft_model_code
       }
 
-      query: a2 -> {
+      run: a2 -> {
         aggregate:
           aircraft_count
           aircraft_models.model_count
@@ -89,7 +89,7 @@ describe('join expression tests', () => {
         .loadModel(joinModelText)
         .loadQuery(
           `
-      query: aircraft {
+      run: aircraft {
         join_one: aircraft_models with aircraft_model_code
       } -> {
         aggregate:
@@ -107,14 +107,14 @@ describe('join expression tests', () => {
         .loadModel(joinModelText)
         .loadQuery(
           `
-      query: aircraft_models {
-        join_one: am_facts is from(
+      run: aircraft_models {
+        join_one: am_facts is
           aircraft_models->{
             group_by: m is manufacturer
             aggregate: num_models is count()
-          }) with manufacturer
+          } with manufacturer
       } -> {
-        project:
+        select:
           manufacturer
           am_facts.num_models
         order_by: 2 desc
@@ -131,13 +131,13 @@ describe('join expression tests', () => {
         .loadModel(joinModelText)
         .loadQuery(
           `
-      query:
+      run:
           aircraft_models-> {
             group_by: m is manufacturer
             aggregate: num_models is count()
           }
       -> {
-        project:
+        select:
           m
           num_models
         order_by: 2 desc
@@ -154,19 +154,18 @@ describe('join expression tests', () => {
         .loadModel(joinModelText)
         .loadQuery(
           `
-          query: from(aircraft_models->{
+          run: aircraft_models->{
             group_by: m is manufacturer
             aggregate: num_models is count()
-            }){
-            join_one: seats is from(
+            } extend {
+            join_one: seats is
               aircraft_models->{
                 group_by: m is manufacturer
                 aggregate: total_seats is seats.sum()
-              }
-            ) with m
+              } with m
           }
           -> {
-            project:
+            select:
               m
               num_models
               seats.total_seats
@@ -185,12 +184,11 @@ describe('join expression tests', () => {
         .loadModel(joinModelText)
         .loadQuery(
           `
-      source: foo is from(aircraft_models-> manufacturer_models){
-        join_one: seats is from(aircraft_models->manufacturer_seats)
-          with manufacturer
+      source: foo is aircraft_models-> manufacturer_models extend {
+        join_one: seats is aircraft_models->manufacturer_seats with manufacturer
       }
-      query: foo-> {
-        project:
+      run: foo-> {
+        select:
           manufacturer,
           num_models,
           seats.total_seats
@@ -209,8 +207,8 @@ describe('join expression tests', () => {
         .loadModel(joinModelText)
         .loadQuery(
           `
-      query: funnel->{
-        project:
+      run: funnel->{
+        select:
          manufacturer
           num_models
           seats.total_seats
@@ -229,13 +227,13 @@ describe('join expression tests', () => {
         .loadModel(joinModelText)
         .loadQuery(
           `
-      query: aircraft_models->{
+      run: aircraft_models->{
         group_by: manufacturer
         aggregate: f is count()
       }->{
         aggregate: f_sum is f.sum()
       }->{
-        project: f_sum2 is f_sum+1
+        select: f_sum2 is f_sum+1
       }
     `
         )
@@ -258,8 +256,8 @@ describe('join expression tests', () => {
           // join the 4 rows and reference the
           //  nested column. should return all the rows.
           //  If the unnest is an inner join, we'll get back just 4 rows.
-          query: table('malloytest.state_facts') {
-            join_one: a_states is from(->a_states) with state
+          run: table('malloytest.state_facts') {
+            join_one: a_states is a_states with state
           }
           -> {
             group_by: state
@@ -280,14 +278,14 @@ describe('join expression tests', () => {
       const result = await runtime
         .loadQuery(
           `
-        source: flights is table('malloytest.flights') {
+        source: flights is table('malloytest.flights') extend {
           join_one: aircraft is table('malloytest.aircraft')
             on tail_num = aircraft.tail_num
           join_one: aircraft_models is table('malloytest.aircraft_models')
             on aircraft.aircraft_model_code = aircraft_models.aircraft_model_code
         }
 
-        query: flights -> {
+        run: flights -> {
           group_by: aircraft_models.seats
           aggregate: flight_count is count()
         }
@@ -306,12 +304,12 @@ describe('join expression tests', () => {
 
         source: aircraft is table('malloytest.aircraft')
 
-        source: flights is table('malloytest.flights'){
+        source: flights is table('malloytest.flights') extend {
           join_one: aircraft on aircraft.tail_num = tail_num
           join_one: aircraft_models on aircraft_models.aircraft_model_code = aircraft.aircraft_model_code
         }
 
-        query: flights-> {
+        run: flights-> {
           group_by: testingtwo is aircraft_models.model
         }
       `
@@ -325,7 +323,7 @@ describe('join expression tests', () => {
       const result = await runtime
         .loadQuery(
           `
-          query: table('malloytest.state_facts') -> {
+          run: table('malloytest.state_facts') -> {
             join_one: sf is table('malloytest.state_facts') on sf.state = state
             aggregate: x is sf.births.sum() { ? state = 'CA' }
           }

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

@@ -111,7 +111,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
           {
             dimension: lower_state is lower(state)
           }
-          -> {project: lower_state}
+          -> {select: lower_state}
         `
       )
       .run();
@@ -250,7 +250,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
       }
       query: f->{
         aggregate:
-          row_count is count(distinct concat(state,a.state))
+          row_count is count(concat(state,a.state))
           left_count is count()
           right_count is a.count()
           left_sum is airport_count.sum()
@@ -279,7 +279,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
       }
       query: f->{
         aggregate:
-          row_count is count(distinct concat(state,a.r))
+          row_count is count(concat(state,a.r))
           left_sum is airport_count.sum()
           right_sum is a.r.sum()
           sum_sum is sum(airport_count + a.r)
@@ -306,7 +306,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
       }
       query: f->{
         aggregate:
-          row_count is count(distinct concat(state,a.state))
+          row_count is count(concat(state,a.state))
           left_sum is airport_count.sum()
           right_sum is a.airport_count.sum()
       }
@@ -409,11 +409,11 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
       .loadQuery(
         `
       query: table('malloytest.state_facts') -> {
-        project: state
+        select: state
         limit: 10
       }
       -> {
-        project: state
+        select: state
         limit: 3
       }
       `
@@ -762,7 +762,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
           aggregate: t is count()
         }
         -> {
-          project: t1 is t+1
+          select: t1 is t+1
         }
       }
       query: f-> {
@@ -788,7 +788,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
           aggregate: t is count()
         }
         -> {
-          project: t1 is t+1
+          select: t1 is t+1
         }
       }
       query: f-> {
@@ -843,7 +843,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
       ${sql1234}
       source: eone is  from_sql(one) {}
 
-      query: eone -> { project: a }
+      query: eone -> { select: a }
       `
       )
       .run();
@@ -855,7 +855,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
       .loadQuery(
         `
           ${sql1234}
-          query: from_sql(one) -> { project: a }
+          query: from_sql(one) -> { select: a }
       `
       )
       .run();
@@ -880,7 +880,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
           """
         }
         query: from_sql(state_as_sql) -> {
-          project: *; where: popular_name = 'Emma'
+          select: *; where: popular_name = 'Emma'
         }`;
       const result = await runtime.loadQuery(turduckenQuery).run();
       expect(result.data.value[0]['state_count']).toBe(6);
@@ -895,7 +895,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
   //       select version() as version
   //     ;;
 
-  //     query: from_sql(one) -> { project: version }
+  //     query: from_sql(one) -> { select: version }
   //     `
   //     )
   //     .run();
@@ -910,7 +910,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
       ${sql1234}
       query: from_sql(one) -> {
         declare: c is a + 1
-        project: c
+        select: c
       }
       `
       )
@@ -926,7 +926,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
       source: foo is from_sql(one) + {
         query: bar is {
           declare: c is a + 1
-          project: c
+          select: c
         }
       }
 
@@ -945,12 +945,12 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
       source: foo is from_sql(one) + {
         query: bar is {
           declare: c is a + 1
-          project: c
+          select: c
         }
 
         query: baz is bar + {
           declare: d is c + 1
-          project: d
+          select: d
         }
       }
 
@@ -992,7 +992,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
 
       query: from_sql(one) -> {
         declare: c is b + 4
-        project: x is a * c
+        select: x is a * c
       }
       `
       )
@@ -1114,7 +1114,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
         .loadQuery(
           `
             query: table('malloytest.state_facts') -> {
-              project: tick is '${back}${tick}'
+              select: tick is '${back}${tick}'
             }
         `
         )
@@ -1126,7 +1126,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
         .loadQuery(
           `
             query: table('malloytest.state_facts') -> {
-              project: back is '${back}${back}'
+              select: back is '${back}${back}'
             }
         `
         )

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

@@ -141,7 +141,7 @@ expressionModels.forEach((orderByModel, databaseName) => {
           aggregate: fetch is count()
         }
       } -> {
-        project:
+        select:
           withxz is lower(withx.select)
           fetch is withx.fetch
       }
@@ -161,8 +161,8 @@ expressionModels.forEach((orderByModel, databaseName) => {
           aggregate: fetch is count()
         }
       } -> {
-        project: withxis lower(withx.select)
-        project: fetch is with.fetch
+        select: withxis lower(withx.select)
+        select: fetch is with.fetch
       }
       `
       )
@@ -196,7 +196,7 @@ expressionModels.forEach((orderByModel, databaseName) => {
 
         query: popular_names->{
           order_by: 2
-          project: manufacturer, model_count
+          select: manufacturer, model_count
         }
         `
       )
@@ -221,7 +221,7 @@ expressionModels.forEach((orderByModel, databaseName) => {
 
         query: popular_names->{
          order_by: 2
-         project: manufacturer, model_count
+         select: manufacturer, model_count
         }
         `
       )

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

@@ -46,8 +46,8 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
     // so this can't work yet.
     it.skip(`can appear after errors - ${databaseName}`, async () => {
       const source = `
-        source: foo is table('asdfds');
-        source: bar is table('malloytest.state_facts') {
+        source: foo is ${databaseName}.table('asdfds');
+        source: bar is ${databaseName}.table('malloytest.state_facts') extend {
           dimension: a is LENGTH('foo')
         }
       `;
@@ -69,10 +69,10 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
 
     it(`can appear before errors - ${databaseName}`, async () => {
       const source = `
-        source: bar is table('malloytest.state_facts') {
+        source: bar is ${databaseName}.table('malloytest.state_facts') extend {
           dimension: a is LENGTH('foo')
         }
-        source: foo is table('asdfds');
+        source: foo is ${databaseName}.table('asdfds');
       `;
       const error = await getError(() => runtime.getModel(source));
       expect(error).not.toBeUndefined();
@@ -92,7 +92,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
 
     it(`can appear alone - ${databaseName}`, async () => {
       const source = `
-        source: bar is table('malloytest.state_facts') {
+        source: bar is ${databaseName}.table('malloytest.state_facts') extend {
           dimension: a is LENGTH('foo')
         }
       `;

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

@@ -47,7 +47,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
             }
           }) AS state_facts """
         ) -> {
-          project: *
+          select: *
         }
       `
       )
@@ -63,9 +63,9 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
             aggregate: c is count()
           }
           b is ${databaseName}.sql(
-            """SELECT * FROM (%{ -> a -> { project: * } }) AS state_facts """
+            """SELECT * FROM (%{ -> a -> { select: * } }) AS state_facts """
           ) -> {
-            project: *
+            select: *
           }
         run: b
       `

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

@@ -502,7 +502,7 @@ describe.each(runtimes.runtimeList)('%s date and time', (dbName, runtime) => {
           dimension: default_time is @2021-02-24 03:05:06
           query: la_query is {
             timezone: 'America/Los_Angeles'
-            project: la_time is @2021-02-24 03:05:06
+            select: la_time is @2021-02-24 03:05:06
           }
         }
 
@@ -533,7 +533,7 @@ describe.each(runtimes.runtimeList)('%s date and time', (dbName, runtime) => {
         source: timezone is from_sql(timeData) + {
           dimension: default_time is @2021-02-24 03:05:06
           query: undef_query is {
-            project: undef_time is @2021-02-24 03:05:06
+            select: undef_time is @2021-02-24 03:05:06
           }
         }
 
@@ -560,11 +560,11 @@ describe.each(runtimes.runtimeList)('%s date and time', (dbName, runtime) => {
           dimension: ny_time is @2021-02-24 03:05:06
           query: la_query is {
             timezone: 'America/Los_Angeles'
-            project: la_time is @2021-02-24 03:05:06
+            select: la_time is @2021-02-24 03:05:06
           }
           query: mex_query is {
             timezone: 'America/Mexico_City'
-            project: mex_time is @2021-02-24 03:05:06
+            select: mex_time is @2021-02-24 03:05:06
           }
         }
 
@@ -681,7 +681,7 @@ describe.each(runtimes.runtimeList)('%s: query tz', (dbName, runtime) => {
       query: from_sql(tzTest) -> {
         timezone: '${zone}'
         declare: utc_midnight is @2020-02-20 00:00:00[UTC]
-        project:
+        select:
           mex_midnight is hour(utc_midnight)
           mex_day is day(utc_midnight)
       }`,
@@ -698,7 +698,7 @@ describe.each(runtimes.runtimeList)('%s: query tz', (dbName, runtime) => {
       query: from_sql(tzTest) -> {
         timezone: '${zone}'
         declare: utc_midnight is @2020-02-20 00:00:00[UTC]
-        project:
+        select:
           mex_day is utc_midnight.day
       }`,
       {mex_day: mex_19.toJSDate()}
@@ -713,7 +713,7 @@ describe.each(runtimes.runtimeList)('%s: query tz', (dbName, runtime) => {
       query: from_sql(tzTest) -> {
         timezone: '${zone}'
         declare: utc_midnight is @2020-02-20 00:00:00[UTC]
-        project: mex_day is day(utc_midnight::date)
+        select: mex_day is day(utc_midnight::date)
       }`,
       {mex_day: 19}
     );
@@ -726,7 +726,7 @@ describe.each(runtimes.runtimeList)('%s: query tz', (dbName, runtime) => {
       """ }
       query: from_sql(tzTest) -> {
         timezone: '${zone}'
-        project: mex_ts is mex_20::timestamp
+        select: mex_ts is mex_20::timestamp
       }`,
       {mex_ts: zone_2020.toJSDate()}
     );
@@ -739,7 +739,7 @@ describe.each(runtimes.runtimeList)('%s: query tz', (dbName, runtime) => {
             SELECT DATETIME '2020-02-20 00:00:00' as t_datetime
             """}
           query: from_sql(timeData) -> {
-            project: mex_220 is t_datetime::timestamp
+            select: mex_220 is t_datetime::timestamp
           }`,
         {mex_220: utc_2020.toJSDate()}
       );
@@ -749,7 +749,7 @@ describe.each(runtimes.runtimeList)('%s: query tz', (dbName, runtime) => {
               SELECT TIMESTAMPTZ '2020-02-20 00:00:00 ${zone}' as t_tstz
             """}
           query: from_sql(timeData) -> {
-            project: mex_220 is t_tstz::timestamp
+            select: mex_220 is t_tstz::timestamp
           }`,
         {mex_220: zone_2020.toJSDate()}
       );

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

@@ -82,7 +82,7 @@ describe('JSON tests', () => {
             ${modelString}
 
             query: s-> {
-              project: j, r
+              select: j, r
               order_by: 2 desc
             }
               `

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

@@ -625,7 +625,7 @@ describe('BigQuery expression tests', () => {
       faa,
       `
       query: flights->{
-        aggregate: carrier_count is count(distinct carrier)
+        aggregate: carrier_count is count(carrier)
       }
     `
     );
@@ -763,7 +763,7 @@ describe('airport_tests', () => {
           }
         }
       } -> { limit: 1
-        project: zero.by_faa_region_Z.by_state.by_county.county
+        select: zero.by_faa_region_Z.by_state.by_county.county
       }
 
     `
@@ -778,13 +778,13 @@ describe('airport_tests', () => {
     query: airports -> {
       group_by: county
       nest: stuff is {
-        project: elevation
+        select: elevation
         order_by: 1 desc
         limit: 10
       }
       order_by: 1
     } -> {
-      project: stuff.elevation
+      select: stuff.elevation
       limit: 1
     }
     `
@@ -827,7 +827,7 @@ describe('airport_tests', () => {
           query: pipe_turtle is {
             aggregate: a is airport_count
           } -> {
-            project: a
+            select: a
           }
         }
         query: my_airports->pipe_turtle
@@ -848,7 +848,7 @@ describe('airport_tests', () => {
             county
           aggregate: a is count()
         } -> {
-          project:
+          select:
             state is upper(state)
             a
         } -> {
@@ -1027,7 +1027,7 @@ describe('unsupported type tests', () => {
         sql: badType is {
           select: """SELECT ST_GEOGFROMTEXT('LINESTRING(1 2, 3 4)') as geo"""
         }
-        query: from_sql(badType)->{ project: *}
+        query: from_sql(badType)->{ select: *}
       `
       )
       .run();

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

@@ -51,7 +51,7 @@ describe('BigQuery double truncation', () => {
       SELECT DATETIME '2020-02-20 00:00:00' as t_datetime
       """}
     query: from_sql(timeData) -> {
-      project: mex_220 is t_datetime::timestamp
+      select: mex_220 is t_datetime::timestamp
     }`,
       {mex_220: utc_2020.toJSDate()}
     );

package/src/databases/bigquery-duckdb/nested_source_table.spec.ts

@@ -39,7 +39,7 @@ const modelText = `
 source:ga_sessions is table('malloytest.ga_sample'){
 
   measure:
-    user_count is count(distinct fullVisitorId)
+    user_count is count(fullVisitorId)
     session_count is count()
     total_visits is totals.visits.sum()
     total_hits is totals.hits.sum()
@@ -162,7 +162,7 @@ describe.each(runtimes.runtimeList)(
           `
         query: ga_sessions->search_index -> {
           where: fieldName != null
-          project: *
+          select: *
           order_by: fieldName, weight desc
           limit: 10
         }
@@ -188,7 +188,7 @@ describe.each(runtimes.runtimeList)(
           sample: ${sampleSize}
         }
         -> {
-          aggregate: field_count is count(DISTINCT fieldName)
+          aggregate: field_count is count(fieldName)
           nest: top_fields is {
             group_by: fieldName
             aggregate: row_count is count()
@@ -249,7 +249,7 @@ describe.each(runtimes.runtimeList)(
         source: eone is  table('malloytest.airports') {}
 
         query: eone -> {
-          project:
+          select:
             bad_date is '123':::date
             bad_number is 'abc':::number
             limit: 1

package/src/databases/bigquery-postgres/multi_connection.spec.ts

@@ -67,15 +67,15 @@ describe('Multi-connection', () => {
 
   const expressionModelText = `
 source: default_aircraft is table('malloytest.aircraft'){
-  measure: aircraft_count is count(DISTINCT tail_num)
+  measure: aircraft_count is count(tail_num)
 }
 
 source: bigquery_state_facts is table('malloytest.state_facts'){
-  measure: state_count is count(DISTINCT state)+2
+  measure: state_count is count(state)+2
 }
 
 source: postgres_aircraft is table('postgres:malloytest.aircraft'){
-  measure: aircraft_count is count(DISTINCT tail_num)+4
+  measure: aircraft_count is count(tail_num)+4
 }
 `;
 
@@ -130,7 +130,7 @@ source: postgres_aircraft is table('postgres:malloytest.aircraft'){
         group_by:
           version is version!()
         aggregate:
-          code_count is count(distinct code)
+          code_count is count(code)
           airport_count is count()
       }
     `