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

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

@@ -58,7 +58,7 @@ describe('Streaming tests', () => {
     it(`basic stream test  - ${databaseName}`, async () => {
       const stream = runtime
         .loadModel("source: airports is table('malloytest.airports') {}")
-        .loadQuery('query: airports -> { project: code }')
+        .loadQuery('query: airports -> { select: code }')
         .runStream({rowLimit: 10});
       const rows: DataRecord[] = [];
       for await (const row of stream) {
@@ -71,7 +71,7 @@ describe('Streaming tests', () => {
     it(`stream to JSON - ${databaseName}`, async () => {
       const stream = runtime
         .loadModel("source: airports is table('malloytest.airports') {}")
-        .loadQuery('query: airports -> { project: code }')
+        .loadQuery('query: airports -> { select: code }')
         .runStream({rowLimit: 1});
       const accummulator = new StringAccumulator();
       const jsonWriter = new JSONWriter(accummulator);
@@ -89,7 +89,7 @@ describe('Streaming tests', () => {
     it(`stream to CSV - ${databaseName}`, async () => {
       const stream = runtime
         .loadModel("source: airports is table('malloytest.airports') {}")
-        .loadQuery('query: airports -> { project: code }')
+        .loadQuery('query: airports -> { select: code }')
         .runStream({rowLimit: 1});
       const accummulator = new StringAccumulator();
       const csvWriter = new CSVWriter(accummulator);

package/src/databases/duckdb/duckdb.spec.ts

@@ -84,7 +84,7 @@ describe.each(allDucks.runtimeList)('duckdb:%s', (dbName, runtime) => {
       .loadQuery(
         `
           query: table('duckdb:test/data/duckdb/test.json') -> {
-            project: *
+            select: *
           }
         `
       )
@@ -118,7 +118,7 @@ describe.each(allDucks.runtimeList)('duckdb:%s', (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/postgres/postgres.spec.ts

@@ -64,7 +64,7 @@ describe('Postgres tests', () => {
         SELECT 1 as n
        """}
 
-      query: from_sql(one) -> { project: n }
+      query: from_sql(one) -> { select: n }
       `
       )
       .run();
@@ -79,7 +79,7 @@ describe('Postgres tests', () => {
         SELECT 1 as "upperLower"
        """}
 
-      query: from_sql(one) -> { project: upperLower }
+      query: from_sql(one) -> { select: upperLower }
       `
       )
       .run();
@@ -95,7 +95,7 @@ describe('Postgres tests', () => {
        """}
 
       query: from_sql(one) -> {
-        project:
+        select:
           select
           create is select + 1
       }
@@ -111,7 +111,7 @@ describe('Postgres tests', () => {
     const result = await runtime
       .loadQuery(
         `
-      query: table('public.UpperTablePublic') -> { project: one }
+      query: table('public.UpperTablePublic') -> { select: one }
       `
       )
       .run();
@@ -122,7 +122,7 @@ describe('Postgres tests', () => {
     const result = await runtime
       .loadQuery(
         `
-      query: table('UpperSchema.UpperSchemaUpperTable') -> { project: one }
+      query: table('UpperSchema.UpperSchemaUpperTable') -> { select: one }
       `
       )
       .run();
@@ -134,7 +134,7 @@ describe('Postgres tests', () => {
       .loadQuery(
         `
         sql: badType is { select: """SELECT int4range(10, 20) as ranger""" }
-        query: from_sql(badType)->{ project: *}
+        query: from_sql(badType)->{ select: *}
       `
       )
       .run();
@@ -158,7 +158,7 @@ describe('Postgres tests', () => {
           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/render/render.spec.ts

@@ -39,7 +39,7 @@ async function runUnsupportedRenderTest(
     const src = `
       query: q is
         ${connectionName}.sql("""SELECT ${expr} AS test""")
-        -> { project: * }
+        -> { select: * }
     `;
     const result = await runtime.loadModel(src).loadQueryByName('q').run();
     // console.log("DATA", result.data.toObject());
@@ -221,11 +221,11 @@ describe('rendering results', () => {
           nest: height_by_age
             # line_chart
           is {
-            project: monthy, height
+            select: monthy, height
           }
 
           nest: weight_by_age_bar_chart is {
-            project: monthy, wt
+            select: monthy, wt
           }
 
           aggregate:
@@ -296,7 +296,7 @@ describe('rendering results', () => {
               order_by: nm
               nest: height_by_age
               is {
-                project:
+                select:
                   # hidden
                   monthy,
                   height
@@ -305,12 +305,12 @@ describe('rendering results', () => {
               # hidden
               nest: height_by_age_hidden
               is {
-                project: monthy, height
+                select: monthy, height
               }
 
               # list
               nest: monthy is {
-                project: price
+                select: price
               }
 
               aggregate:
@@ -419,7 +419,7 @@ describe('rendering results', () => {
       const src = `
         query: mex_query is duckdb.sql('SELECT 1') -> {
           timezone: 'America/Mexico_City'
-          project: mex_time is @2021-02-24 03:05:06
+          select: mex_time is @2021-02-24 03:05:06
         }
       `;
       const result = await (
@@ -443,7 +443,7 @@ describe('rendering results', () => {
 
         query:
           data_trunc is timeDataTrunc -> {
-            project: yr is times.year, qt is times.quarter, mt is times.month, dy is times.day
+            select: yr is times.year, qt is times.quarter, mt is times.month, dy is times.day
         }
       `;
       const result = await (
@@ -464,7 +464,7 @@ describe('rendering results', () => {
         query: mex_query # bar_chart
           is duckdb.sql('SELECT 1') -> {
             timezone: 'America/Mexico_City'
-            project: mex_time is @2021-02-24 03:05:06
+            select: mex_time is @2021-02-24 03:05:06
           }
       `;
       const result = await (
@@ -507,7 +507,7 @@ describe('rendering results', () => {
     test('value format tags works correctly', async () => {
       const src = `
         query: number_query is duckdb.sql('SELECT 12.345 as anumber') -> {
-          project:
+          select:
             anumber
             # number= "#,##0.0000"
             larger is anumber
@@ -531,7 +531,7 @@ describe('rendering results', () => {
     test('data volume tags works correctly', async () => {
       const src = `
         query: bytes_query is duckdb.sql('SELECT 1') -> {
-          project:
+          select:
           # data_volume = bytes
           usage_b is 3758
           # data_volume = kb
@@ -560,7 +560,7 @@ describe('rendering results', () => {
     test('duration tags works correctly', async () => {
       const src = `
         query: duration_query is duckdb.sql('SELECT 1') -> {
-          project:
+          select:
           # duration = nanoseconds
           ns1 is 1
           # duration = nanoseconds

package/src/tags.spec.ts

@@ -277,11 +277,11 @@ describe('tags in results', () => {
   test('nameless query', async () => {
     const loaded = runtime.loadQuery(
       `
-          ## modelDef=ok
-          sql: one is {connection: "duckdb" select: """SELECT 1 as one"""}
-          # b4query
-          query: # afterQuery import=$(modelDef)
-            from_sql(one) -> { project: * }`
+        ## modelDef=ok
+        source: one is duckdb.sql("SELECT 1 as one")
+        # b4query
+        run: # afterQuery import=$(modelDef)
+          one -> { select: * }`
     );
     const qTag = {b4query: {}, afterQuery: {}, import: {eq: 'ok'}};
     const query = await loaded.getPreparedQuery();
@@ -294,17 +294,18 @@ describe('tags in results', () => {
   test('named query', async () => {
     const loaded = runtime.loadQuery(
       `
-          sql: one is {connection: "duckdb" select: """SELECT 1 as one"""}
-          ## modelDef=ok
-          # BQ
-          query: # AQ
-            # import=$(modelDef)
-            theName
-            # Bis
-            is
-            # Ais
-            from_sql(one) -> { project: * }
-          query: -> theName`
+        ## modelDef=ok
+        source: one is duckdb.sql("SELECT 1 as one")
+        # BQ
+        query: # AQ
+          # import=$(modelDef)
+          theName
+          # Bis
+          is
+          # Ais
+          one -> { select: * }
+        run: theName
+      `
     );
     const query = await loaded.getPreparedQuery();
     expect(query).toBeDefined();
@@ -315,18 +316,18 @@ describe('tags in results', () => {
   test('turtle query', async () => {
     const loaded = runtime.loadQuery(
       `
-          ## modelDef=ok
-          sql: one is {connection: "duckdb" select: """SELECT 1 as one"""}
-          query: from_sql(one) + {
-            # BQ import=$(modelDef)
-            query: # AQ
-              in_one
-              # Bis
-              is
-              # Ais
-              { project: one }
-            }
-          -> in_one`
+        ## modelDef=ok
+        source: one is duckdb.sql("SELECT 1 as one") extend {
+          # BQ import=$(modelDef)
+          view: # AQ
+            in_one
+            # Bis
+            is
+            # Ais
+            { select: one }
+        }
+        run: one -> in_one
+      `
     );
     const query = await loaded.getPreparedQuery();
     expect(query).toBeDefined();
@@ -338,9 +339,9 @@ describe('tags in results', () => {
     const loaded = runtime.loadQuery(
       `
           ## modelDef=ok
-          sql: one is {connection: "duckdb" select: """SELECT 1 as one"""}
-          query: from_sql(one) -> {
-            project:
+          source: one is duckdb.sql("SELECT 1 as one")
+          run: one -> {
+            select:
               # note1 import=$(modelDef)
               one
           }`
@@ -357,12 +358,12 @@ describe('tags in results', () => {
     const loaded = runtime.loadQuery(
       `
           ## modelDef=ok
-          sql: one is {connection: "duckdb" select: """SELECT 1 as one"""}
-          source: malloy_one is from_sql(one) + {
-            query: in_one is {
-              project: one
+          source: one is duckdb.sql("SELECT 1 as one")
+          source: malloy_one is one extend {
+            view: in_one is {
+              select: one
             }
-            query: one_and_one is {
+            view: one_and_one is {
               group_by: one
               # note1
               nest:
@@ -370,7 +371,7 @@ describe('tags in results', () => {
                 in_one
             }
           }
-          query: malloy_one -> one_and_one`
+          run: malloy_one -> one_and_one`
     );
     const result = await loaded.run();
     const shape = result.resultExplore;
@@ -388,20 +389,20 @@ describe('tags in results', () => {
         source: ages is duckdb.sql('SELECT 1 as one') extend {
           # name
           dimension: name is 'John'
-          query: height
+          view: height
           # barchart
           is {
-            project: heightd is 10
+            select: heightd is 10
           }
 
-          query: age
+          view: age
           # barchart
           is {
-            project: aged is 20
+            select: aged is 20
           }
 
         }
-        query: ages -> {
+        run: ages -> {
           group_by: name
           nest: height
           nest: age
@@ -417,13 +418,12 @@ describe('tags in results', () => {
     expect(age.tagParse().tag).tagsAre({barchart: {}});
     expect(name.tagParse().tag).tagsAre({name: {}});
   });
-  test('User defines scopes nest properly', async () => {
+  test('User defined scopes nest properly', async () => {
     const loaded = runtime.loadQuery(
       `
           ## scope=model
-          sql: one is {connection: "duckdb" select: """SELECT 1 as one"""}
-          query: from_sql(one) -> {
-            project:
+          run: duckdb.sql("SELECT 1 as one") -> {
+            select:
               # valueFrom=$(scope)
               one
           }`

package/src/util/index.ts

@@ -120,7 +120,7 @@ export function mkSqlEqWith(runtime: Runtime, initV?: InitValues) {
           query: basicTypes
           -> {
             declare: ${varName} is ${expr}
-            project: calc is pick ${whenPick} else ${elsePick}
+            select: calc is pick ${whenPick} else ${elsePick}
           }`;
     } else if (typeof result === 'number') {
       query = `${sourceDef}
@@ -128,7 +128,7 @@ export function mkSqlEqWith(runtime: Runtime, initV?: InitValues) {
           -> {
             declare: expect is ${result}
             declare: got is ${expr}
-            project: calc is
+            select: calc is
               pick '=' when expect = got
               else concat('sqlEq failed', CHR(10), '    Expected: ${qExpr} == ${result}', CHR(10), '    Received: ', got::string)
           }`;
@@ -139,10 +139,10 @@ export function mkSqlEqWith(runtime: Runtime, initV?: InitValues) {
       query = `${sourceDef}
           query: basicTypes
           -> {
-            project: expect is ${qResult}
-            project: got is ${expr}
+            select: expect is ${qResult}
+            select: got is ${expr}
           } -> {
-            project: calc is
+            select: calc is
               pick '=' when expect = got
               else concat('sqlEq failed', CHR(10), '    Expected: ${sqlSafe(
                 expr
@@ -153,10 +153,10 @@ export function mkSqlEqWith(runtime: Runtime, initV?: InitValues) {
       query = `${sourceDef}
           query: basicTypes
           -> {
-            project: expect is ${result}
-            project: got is ${expr}
+            select: expect is ${result}
+            select: got is ${expr}
           } -> {
-            project: calc is
+            select: calc is
               pick '=' when expect = got
               else concat('sqlEq failed', CHR(10), '    Expected: ${qExpr} == ${qResult}', CHR(10), '    Received: ', got::string)
           }`;