@malloydata/malloy-tests 0.0.95-dev231019211822 → 0.0.95

package/dist/databases/bigquery/wildcard_table_names.spec.js

@@ -36,12 +36,12 @@ describe('Wildcard BigQuery Tables', () => {
         if (runtime) {
             const result = await runtime
                 .loadQuery(`
-        source: aircraft is table('malloy-data.malloytest.wildcard_aircraft_*') {
+        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
           primary_key: id
           measure: aircraft_count is count()
         }
 
-        query: aircraft -> {
+        run: aircraft -> {
           aggregate: aircraft_count
         }
       `)
@@ -55,13 +55,13 @@ describe('Wildcard BigQuery Tables', () => {
         if (runtime) {
             const result = await runtime
                 .loadQuery(`
-        source: aircraft is table('malloy-data.malloytest.wildcard_aircraft_*') {
+        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
           primary_key: id
           measure: aircraft_count is count()
           where: _TABLE_SUFFIX = '01'
         }
 
-        query: aircraft -> {
+        run: aircraft -> {
           aggregate: aircraft_count
         }
 `)
@@ -75,14 +75,14 @@ describe('Wildcard BigQuery Tables', () => {
         if (runtime) {
             const result = await runtime
                 .loadQuery(`
-        source: aircraft is table('malloy-data.malloytest.wildcard_aircraft_*') {
+        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
           primary_key: id
         }
 
-        source: state_facts is table('malloy-data.malloytest.state_facts') {
+        source: state_facts is bigquery.table('malloy-data.malloytest.state_facts') extend {
           join_many: aircraft on state = aircraft.state
         }
-        query: state_facts -> {
+        run: state_facts -> {
           group_by: aircraft.state
           aggregate: aircraft_count is aircraft.count()
           order_by: 1
@@ -108,15 +108,15 @@ describe('Wildcard BigQuery Tables', () => {
         if (runtime) {
             const result = await runtime
                 .loadQuery(`
-        source: aircraft is table('malloy-data.malloytest.wildcard_aircraft_*') {
+        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
           primary_key: id
           where: _TABLE_SUFFIX = '02'
         }
 
-        source: state_facts is table('malloy-data.malloytest.state_facts') {
+        source: state_facts is bigquery.table('malloy-data.malloytest.state_facts') extend {
           join_many: aircraft on state = aircraft.state
         }
-        query: state_facts -> {
+        run: state_facts -> {
           group_by: aircraft.state
           aggregate: aircraft_count is aircraft.count()
           order_by: 1
@@ -139,12 +139,12 @@ describe('Wildcard BigQuery Tables', () => {
         if (runtime) {
             const result = await runtime
                 .loadQuery(`
-        source: aircraft is table('malloy-data.malloytest.wildcard_aircraft_*') {
-          join_many: state_facts is table('malloy-data.malloytest.state_facts')
+        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
+          join_many: state_facts is bigquery.table('malloy-data.malloytest.state_facts')
             on state_facts.state = state
         }
 
-        query: aircraft -> {
+        run: aircraft -> {
           group_by: state_facts.state
           aggregate: aircraft_count is count()
           where: _TABLE_SUFFIX = '02'
@@ -162,15 +162,15 @@ describe('Wildcard BigQuery Tables', () => {
         if (runtime) {
             const result = await runtime
                 .loadQuery(`
-        source: aircraft is table('malloy-data.malloytest.wildcard_aircraft_*') {
+        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
           primary_key: id
           where: _TABLE_SUFFIX = '02'
         }
 
-        source: state_facts is table('malloy-data.malloytest.state_facts') {
+        source: state_facts is bigquery.table('malloy-data.malloytest.state_facts') extend {
           join_many: aircraft on state = aircraft.state
         }
-        query: state_facts -> {
+        run: state_facts -> {
           group_by: aircraft._TABLE_SUFFIX
           aggregate: aircraft_count is aircraft.count()
           order_by: 1
@@ -189,15 +189,15 @@ describe('Wildcard BigQuery Tables', () => {
         if (runtime) {
             const result = await runtime
                 .loadQuery(`
-        source: aircraft is table('malloy-data.malloytest.wildcard_aircraft_*') {
+        source: aircraft is bigquery.table('malloy-data.malloytest.wildcard_aircraft_*') extend {
           primary_key: id
           where: _TABLE_SUFFIX = '02'
         }
 
-        source: state_facts is table('malloy-data.malloytest.state_facts') {
+        source: state_facts is bigquery.table('malloy-data.malloytest.state_facts') extend {
           join_many: aircraft on state = aircraft.state
         }
-        query: state_facts -> {
+        run: state_facts -> {
           group_by: aircraft._TABLE_SUFFIX
           aggregate: aircraft_count is aircraft.count()
           where: aircraft._TABLE_SUFFIX = '01'

package/dist/databases/bigquery-duckdb/nested_source_table.spec.js

@@ -32,8 +32,9 @@ const [describe, databases] = (0, util_1.describeIfDatabaseAvailable)([
     'bigquery',
     'duckdb',
 ]);
-const modelText = `
-source:ga_sessions is table('malloytest.ga_sample'){
+function modelText(databaseName) {
+    return `
+source: ga_sessions is ${databaseName}.table('malloytest.ga_sample') extend {
 
   measure:
     user_count is count(fullVisitorId)
@@ -46,41 +47,41 @@ source:ga_sessions is table('malloytest.ga_sample'){
     hits_count is hits.count()
     sold_count is hits.count() { where: hits.product.productQuantity > 0 }
 
-  query: by_source is {
+  view: by_source is {
     where: trafficSource.\`source\` != '(direct)'
     group_by: trafficSource.\`source\`
     aggregate: hits_count
     limit: 10
   }
-  query: by_adContent_bar_chart is {
+  view: by_adContent_bar_chart is {
     group_by: device.browser
     aggregate: user_count
     group_by: device.deviceCategory
   }
-  query: by_region is {
+  view: by_region is {
     where: geoNetwork.region !~ '%demo%'
     group_by: geoNetwork.region
     aggregate: user_count
     limit: 10
   }
-  query: by_device is {
+  view: by_device is {
     group_by: device.browser
     aggregate: user_count
     group_by: device.deviceCategory
   }
-  query: by_category is {
+  view: by_category is {
     group_by: category is hits.product.v2ProductCategory
     aggregate: total_productRevenue
     aggregate: sold_count
     limit: 10
   }
-  query: by_hour_of_day is {
+  view: by_hour_of_day is {
     // group_by: gsession_hour is hour(start_time::timestamp)
     aggregate: session_count
     order_by: 1
   }
 
-  query: page_load_times is {
+  view: page_load_times is {
     group_by: hits.page.pageTitle
     aggregate: hit_count is hits.count()
     nest: load_bar_chart is {
@@ -90,20 +91,20 @@ source:ga_sessions is table('malloytest.ga_sample'){
     limit: 10
   }
 
-  query: by_page_title is { where: totals.transactionRevenue > 0
+  view: by_page_title is { where: totals.transactionRevenue > 0
     group_by: hits.page.pageTitle
     aggregate: hits_count
     aggregate: sold_count
   }
 
-  query: by_all is {
+  view: by_all is {
     nest: by_source
     nest: by_adContent_bar_chart
     nest: by_region
     nest: by_category
   }
 
-  query: search_index is {
+  view: search_index is {
     index: *, hits.*, customDimensions.* totals.*, trafficSource.*, hits.product.*
     sample: 1%
   }
@@ -121,20 +122,14 @@ query: sessions_dashboard is ga_sessions -> {
     }
 }
 `;
+}
 const runtimes = new runtimes_1.RuntimeList(databases);
 describe.each(runtimes.runtimeList)('Nested Source Table - %s', (databaseName, runtime) => {
+    const gaModel = runtime.loadModel(modelText(databaseName));
     test(`repeated child of record - ${databaseName}`, async () => {
-        const result = await runtime
-            .loadModel(modelText)
-            .loadQuery(`
-        query: ga_sessions->by_page_title
-        `)
-            .run();
-        // console.log(result.data.toObject());
-        // console.log(result.sql);
-        expect(result.data.path(0, 'pageTitle').value).toBe('Shopping Cart');
+        await expect('run: ga_sessions->by_page_title').malloyResultMatches(gaModel, { pageTitle: 'Shopping Cart' });
     });
-    // SKIPPED because the tests intermittently fail and lloyd said
+    // Tests intermittently fail and lloyd said
     // "I bet it has to do with my sampling test on indexing. Intermittently
     //  getting different results. I'd comment out the test and I'll take a
     //  look at it when I get back." and that seems reasonable.
@@ -146,31 +141,27 @@ describe.each(runtimes.runtimeList)('Nested Source Table - %s', (databaseName, r
     //
     //      Expected: "Organic Search"
     //      Received: "Referral"
-    test.skip(`search_index - ${databaseName}`, async () => {
-        const result = await runtime
-            .loadModel(modelText)
-            .loadQuery(`
-        query: ga_sessions->search_index -> {
+    test(`search_index - ${databaseName}`, async () => {
+        await expect(`
+        run: ga_sessions->search_index -> {
           where: fieldName != null
           select: *
           order_by: fieldName, weight desc
           limit: 10
         }
-        `)
-            .run();
-        // console.log(result.data.toObject());
-        expect(result.data.path(0, 'fieldName').value).toBe('channelGrouping');
-        expect(result.data.path(0, 'fieldValue').value).toBe('Organic Search');
-        // expect(result.data.path(0, "weight").value).toBe(18);
+      `).malloyResultMatches(gaModel, {
+            fieldName: 'channelGrouping',
+            // fieldValue: 'Organic Search',
+            // weight: 10,
+        });
     });
-    test.skip(`manual index - ${databaseName}`, async () => {
+    test(`manual index - ${databaseName}`, async () => {
         let sampleSize = '10';
         if (databaseName === 'bigquery') {
             sampleSize = 'false';
         }
-        const _result = await runtime
-            .loadQuery(`
-        query: table('malloytest.ga_sample')-> {
+        await expect(`
+        run: ${databaseName}.table('malloytest.ga_sample')-> {
           index: everything
           sample: ${sampleSize}
         }
@@ -182,63 +173,38 @@ describe.each(runtimes.runtimeList)('Nested Source Table - %s', (databaseName, r
             limit: 100
           }
         }
-        `)
-            .run();
-        // console.log(JSON.stringify(result.data.toObject(), null, 2));
-        // expect(result.data.path(0, "fieldName").value).toBe("channelGrouping");
-        // expect(result.data.path(0, "fieldValue").value).toBe("Organic Search");
-        // expect(result.data.path(0, "weight").value).toBe(18);
+      `).malloyResultMatches(runtime, {
+        // 'top_fields.fieldName': 'channelGrouping',
+        // 'top_fields.fieldValue': 'Organic Search',
+        // 'top_fields.weight': 18,
+        });
     });
     test(`autobin - ${databaseName}`, async () => {
-        const _result = await runtime
-            .loadQuery(`
-          source: airports is table('malloytest.airports') + {
-            measure:
-              airport_count is count()
-            query: by_elevation is {
-              aggregate: bin_size is NULLIF((max(elevation) - min(elevation))/30,0)
-              nest: data is {
-                group_by: elevation
-                aggregate: row_count is count()
-              }
-            }
-            -> {
-              group_by: elevation is floor(data.elevation/bin_size)*bin_size + bin_size/2
-              aggregate: airport_count is data.row_count.sum()
-              order_by: elevation
+        await expect(`
+        source: airports is ${databaseName}.table('malloytest.airports') extend {
+          measure: airport_count is count()
+          view: by_elevation is {
+            aggregate: bin_size is NULLIF((max(elevation) - min(elevation))/30,0)
+            nest: data is {
+              group_by: elevation
+              aggregate: row_count is count()
             }
           }
-
-          query: airports -> {
-            group_by: state is state
-            aggregate: airport_count
-            nest: by_elevation_bar_chart is by_elevation
+          -> {
+            group_by: elevation is floor(data.elevation/bin_size)*bin_size + bin_size/2
+            aggregate: airport_count is data.row_count.sum()
+            order_by: elevation
           }
-        `)
-            .run();
-        // console.log(result.sql);
-        // console.log(result.data.toObject());
-        // expect(result.data.path(0, 'fieldName').value).toBe('channelGrouping');
-        // expect(result.data.path(0, 'fieldValue').value).toBe('Organic Search');
-        // expect(result.data.path(0, "weight").value).toBe(18);
-    });
-    // this really shouldn't be here, we need to be able to test dialect capiblities
-    //  from the connection.
-    test(`safe_cast - ${databaseName}`, async () => {
-        const result = await runtime
-            .loadQuery(`
-        source: eone is  table('malloytest.airports') {}
+        }
 
-        query: eone -> {
-          select:
-            bad_date is '123':::date
-            bad_number is 'abc':::number
-            limit: 1
+        run: airports -> {
+          group_by: state is state
+          aggregate: airport_count
+          nest: by_elevation_bar_chart is by_elevation
         }
-        `)
-            .run();
-        expect(result.data.value[0]['bad_date']).toBe(null);
-        expect(result.data.value[0]['bad_number']).toBe(null);
+      `).malloyResultMatches(runtime, {
+        // don't know what to expect ...
+        });
     });
 });
 afterAll(async () => {

package/dist/databases/bigquery-duckdb/nested_source_table.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"nested_source_table.spec.js","sourceRoot":"","sources":["../../../src/databases/bigquery-duckdb/nested_source_table.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nested_source_table.spec.js","sourceRoot":"","sources":["../../../src/databases/bigquery-duckdb/nested_source_table.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;AAEH,8DAA8D;AAC9D,+BAA+B;AAE/B,uCAAqC;AACrC,6CAA2C;AAC3C,qCAAuD;AAEvD,4EAA4E;AAE5E,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAA,kCAA2B,EAAC;IACxD,UAAU;IACV,QAAQ;CACT,CAAC,CAAC;AAEH,SAAS,SAAS,CAAC,YAAoB;IACrC,OAAO;yBACgB,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuFpC,CAAC;AACF,CAAC;AAED,MAAM,QAAQ,GAAG,IAAI,sBAAW,CAAC,SAAS,CAAC,CAAC;AAC5C,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CACjC,0BAA0B,EAC1B,CAAC,YAAY,EAAE,OAAO,EAAE,EAAE;IACxB,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;IAC3D,IAAI,CAAC,8BAA8B,YAAY,EAAE,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC,mBAAmB,CACjE,OAAO,EACP,EAAC,SAAS,EAAE,eAAe,EAAC,CAC7B,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,2CAA2C;IAC3C,wEAAwE;IACxE,uEAAuE;IACvE,2DAA2D;IAC3D,6DAA6D;IAC7D,kDAAkD;IAClD,kDAAkD;IAClD,EAAE;IACF,6DAA6D;IAC7D,EAAE;IACF,kCAAkC;IAClC,4BAA4B;IAC5B,IAAI,CAAC,kBAAkB,YAAY,EAAE,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,MAAM,CAAC;;;;;;;OAOZ,CAAC,CAAC,mBAAmB,CAAC,OAAO,EAAE;YAC9B,SAAS,EAAE,iBAAiB;YAC5B,gCAAgC;YAChC,cAAc;SACf,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kBAAkB,YAAY,EAAE,EAAE,KAAK,IAAI,EAAE;QAChD,IAAI,UAAU,GAAG,IAAI,CAAC;QACtB,IAAI,YAAY,KAAK,UAAU,EAAE;YAC/B,UAAU,GAAG,OAAO,CAAC;SACtB;QACD,MAAM,MAAM,CAAC;eACJ,YAAY;;oBAEP,UAAU;;;;;;;;;;OAUvB,CAAC,CAAC,mBAAmB,CAAC,OAAO,EAAE;QAC9B,6CAA6C;QAC7C,6CAA6C;QAC7C,2BAA2B;SAC5B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,aAAa,YAAY,EAAE,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,MAAM,CAAC;8BACW,YAAY;;;;;;;;;;;;;;;;;;;;;OAqBnC,CAAC,CAAC,mBAAmB,CAAC,OAAO,EAAE;QAC9B,gCAAgC;SACjC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,QAAQ,CAAC,KAAK,IAAI,EAAE;IAClB,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAC5B,CAAC,CAAC,CAAC"}

package/dist/databases/bigquery-postgres/multi_connection.spec.js

@@ -73,34 +73,19 @@ describe('Multi-connection', () => {
         await postgresConnection.close();
     });
     const expressionModelText = `
-source: default_aircraft is table('malloytest.aircraft'){
-  measure: aircraft_count is count(tail_num)
-}
-
-source: bigquery_state_facts is table('malloytest.state_facts'){
+source: bigquery_state_facts is bigquery.table('malloytest.state_facts') extend {
   measure: state_count is count(state)+2
 }
 
-source: postgres_aircraft is table('postgres:malloytest.aircraft'){
+source: postgres_aircraft is postgres.table('malloytest.aircraft') extend {
   measure: aircraft_count is count(tail_num)+4
 }
 `;
     const expressionModel = runtime.loadModel(expressionModelText);
-    it('default query', async () => {
-        const result = await expressionModel
-            .loadQuery(`
-      query: default_aircraft-> {
-        aggregate: aircraft_count
-      }
-    `)
-            .run();
-        // console.log(result.sql);
-        expect(result.data.path(0, 'aircraft_count').value).toBe(3599);
-    });
     it('bigquery query', async () => {
         const result = await expressionModel
             .loadQuery(`
-      query: bigquery_state_facts-> {
+      run: bigquery_state_facts-> {
         aggregate: state_count
       }
     `)
@@ -111,7 +96,7 @@ source: postgres_aircraft is table('postgres:malloytest.aircraft'){
     it('postgres query', async () => {
         const result = await expressionModel
             .loadQuery(`
-      query: postgres_aircraft-> {
+      run: postgres_aircraft-> {
         aggregate: aircraft_count
       }
     `)
@@ -121,7 +106,7 @@ source: postgres_aircraft is table('postgres:malloytest.aircraft'){
     it('postgres raw query', async () => {
         const result = await runtime
             .loadQuery(`
-      query: table('postgres:malloytest.airports')->{
+      run: postgres.table('malloytest.airports')->{
         group_by:
           version is version!()
         aggregate:

package/dist/databases/bigquery-postgres/multi_connection.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"multi_connection.spec.js","sourceRoot":"","sources":["../../../src/databases/bigquery-postgres/multi_connection.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"multi_connection.spec.js","sourceRoot":"","sources":["../../../src/databases/bigquery-postgres/multi_connection.spec.ts"],"names":[],"mappings":"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"}

package/dist/databases/bigquery-postgres/streaming.spec.js

@@ -48,8 +48,8 @@ describe('Streaming tests', () => {
     runtimes.runtimeMap.forEach((runtime, databaseName) => {
         it(`basic stream test  - ${databaseName}`, async () => {
             const stream = runtime
-                .loadModel("source: airports is table('malloytest.airports') {}")
-                .loadQuery('query: airports -> { select: code }')
+                .loadModel(`source: airports is ${databaseName}.table('malloytest.airports')`)
+                .loadQuery('run: airports -> { select: code }')
                 .runStream({ rowLimit: 10 });
             const rows = [];
             for await (const row of stream) {
@@ -60,8 +60,8 @@ describe('Streaming tests', () => {
         });
         it(`stream to JSON - ${databaseName}`, async () => {
             const stream = runtime
-                .loadModel("source: airports is table('malloytest.airports') {}")
-                .loadQuery('query: airports -> { select: code }')
+                .loadModel(`source: airports is ${databaseName}.table('malloytest.airports')`)
+                .loadQuery('run: airports -> { select: code }')
                 .runStream({ rowLimit: 1 });
             const accummulator = new StringAccumulator();
             const jsonWriter = new malloy_1.JSONWriter(accummulator);
@@ -75,8 +75,8 @@ describe('Streaming tests', () => {
         });
         it(`stream to CSV - ${databaseName}`, async () => {
             const stream = runtime
-                .loadModel("source: airports is table('malloytest.airports') {}")
-                .loadQuery('query: airports -> { select: code }')
+                .loadModel(`source: airports is ${databaseName}.table('malloytest.airports')`)
+                .loadQuery('run: airports -> { select: code }')
                 .runStream({ rowLimit: 1 });
             const accummulator = new StringAccumulator();
             const csvWriter = new malloy_1.CSVWriter(accummulator);

package/dist/databases/bigquery-postgres/streaming.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"streaming.spec.js","sourceRoot":"","sources":["../../../src/databases/bigquery-postgres/streaming.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;AAEH,+CAK4B;AAC5B,6CAA2C;AAC3C,qCAAuD;AAEvD,MAAM,iBAAiB;IAAvB;QACS,qBAAgB,GAAG,EAAE,CAAC;IAS/B,CAAC;IAPC,KAAK,CAAC,IAAY;QAChB,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC;IAChC,CAAC;IAED,KAAK;QACH,OAAO;IACT,CAAC;CACF;AAED,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAA,kCAA2B,EAAC;IACxD,UAAU;IACV,UAAU;CACX,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,MAAM,QAAQ,GAAG,IAAI,sBAAW,CAAC,SAAS,CAAC,CAAC;IAE5C,QAAQ,CAAC,KAAK,IAAI,EAAE;QAClB,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE;QACpD,EAAE,CAAC,wBAAwB,YAAY,EAAE,EAAE,KAAK,IAAI,EAAE;YACpD,MAAM,MAAM,GAAG,OAAO;iBACnB,SAAS,CAAC,qDAAqD,CAAC;iBAChE,SAAS,CAAC,qCAAqC,CAAC;iBAChD,SAAS,CAAC,EAAC,QAAQ,EAAE,EAAE,EAAC,CAAC,CAAC;YAC7B,MAAM,IAAI,GAAiB,EAAE,CAAC;YAC9B,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,MAAM,EAAE;gBAC9B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAChB;YACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oBAAoB,YAAY,EAAE,EAAE,KAAK,IAAI,EAAE;YAChD,MAAM,MAAM,GAAG,OAAO;iBACnB,SAAS,CAAC,qDAAqD,CAAC;iBAChE,SAAS,CAAC,qCAAqC,CAAC;iBAChD,SAAS,CAAC,EAAC,QAAQ,EAAE,CAAC,EAAC,CAAC,CAAC;YAC5B,MAAM,YAAY,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAC7C,MAAM,UAAU,GAAG,IAAI,mBAAU,CAAC,YAAY,CAAC,CAAC;YAChD,MAAM,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,IAAI,CACxC;;;;;CAKP,CACM,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mBAAmB,YAAY,EAAE,EAAE,KAAK,IAAI,EAAE;YAC/C,MAAM,MAAM,GAAG,OAAO;iBACnB,SAAS,CAAC,qDAAqD,CAAC;iBAChE,SAAS,CAAC,qCAAqC,CAAC;iBAChD,SAAS,CAAC,EAAC,QAAQ,EAAE,CAAC,EAAC,CAAC,CAAC;YAC5B,MAAM,YAAY,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAC7C,MAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,YAAY,CAAC,CAAC;YAC9C,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAChC,MAAM,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"streaming.spec.js","sourceRoot":"","sources":["../../../src/databases/bigquery-postgres/streaming.spec.ts"],"names":[],"mappings":"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"}

package/dist/databases/duckdb/duckdb.spec.js

@@ -26,20 +26,18 @@ const luxon_1 = require("luxon");
 const runtimes_1 = require("../../runtimes");
 require("../../util/db-jest-matchers");
 const util_1 = require("../../util");
+// TODO identify which tests need to run on wasm and move them into their own file
 const runtimes = ['duckdb', 'duckdb_wasm'];
 const [_describe, databases] = (0, util_1.describeIfDatabaseAvailable)(runtimes);
 const allDucks = new runtimes_1.RuntimeList(databases);
 describe.each(allDucks.runtimeList)('duckdb:%s', (dbName, runtime) => {
     it('can open tables with wildcards', async () => {
-        const result = await runtime
-            .loadQuery(`
-        query: table('duckdb:test/data/duckdb/flights/part.*.parquet') -> {
-          top: 1
-          group_by: carrier;
-        }
-      `)
-            .run();
-        expect(result.data.path(0, 'carrier').value).toEqual('AA');
+        await expect(`
+      run: duckdb.table('test/data/duckdb/flights/part.*.parquet') -> {
+        top: 1
+        group_by: carrier;
+      }
+    `).malloyResultMatches(runtime, { carrier: 'AA' });
     });
     it('accepts all schema numbers', async () => {
         const allInts = [
@@ -55,33 +53,28 @@ describe.each(allDucks.runtimeList)('duckdb:%s', (dbName, runtime) => {
         ];
         const allFields = allInts.map(intType => `a${intType.toLowerCase()}`);
         const query = `
-      sql: allInts is { connection: "${dbName}" select: """
+      run: ${dbName}.sql("""
         SELECT
         ${allInts
             .map(intType => `1::${intType} as a${intType.toLowerCase()}`)
             .join(',\n')}
-      """}
-      query: from_sql(allInts) -> {
+      """) -> {
         aggregate:
         ${allFields
             .map(fieldType => `sum_${fieldType} is sum(${fieldType})`)
             .join('\n')}
       }
     `;
-        const result = await runtime.loadQuery(query).run();
-        for (const fieldType of allFields) {
-            expect(result.data.path(0, `sum_${fieldType}`).value).toEqual(1);
-        }
+        await expect(query).malloyResultMatches(runtime, allInts.reduce((building, ent) => {
+            building[`sum_a${ent.toLowerCase()}`] = 1;
+            return building;
+        }, {}));
     });
     it('can open json files', async () => {
-        const result = await runtime
-            .loadQuery(`
-          query: table('duckdb:test/data/duckdb/test.json') -> {
-            select: *
-          }
-        `)
-            .run();
-        expect(result.data.path(0, 'foo').value).toEqual('bar');
+        await expect(`
+      run: duckdb.table('test/data/duckdb/test.json') -> {
+        select: *
+      }`).malloyResultMatches(runtime, { foo: 'bar' });
     });
     it('supports timezones', async () => {
         await runtime.connection.runSQL("SET TimeZone='CET'");
@@ -89,7 +82,7 @@ describe.each(allDucks.runtimeList)('duckdb:%s', (dbName, runtime) => {
         expect(result.rows[0]).toEqual({ "current_setting('TimeZone')": 'CET' });
     });
     it('supports varchars with parameters', async () => {
-        await expect(runtime).queryMatches("run: duckdb.sql(\"SELECT 'a'::VARCHAR as abc, 'a3'::VARCHAR(3) as abc3\")", { abc: 'a', abc3: 'a3' });
+        await expect("run: duckdb.sql(\"SELECT 'a'::VARCHAR as abc, 'a3'::VARCHAR(3) as abc3\")").malloyResultMatches(runtime, { abc: 'a', abc3: 'a3' });
     });
     describe('time', () => {
         const zone = 'America/Mexico_City'; // -06:00 no DST
@@ -102,14 +95,12 @@ describe.each(allDucks.runtimeList)('duckdb:%s', (dbName, runtime) => {
             second: 0,
             zone,
         });
-        // TODO: Investigate why its no working.
-        test.skip('can use unsupported types', async () => {
-            await expect(runtime).queryMatches(`sql: timeData is { connection: "duckdb"  select: """
-          SELECT TIMESTAMPTZ '2020-02-20 00:00:00 ${zone}' as t_tstz
-        """}
-      query: from_sql(timeData) -> {
-        select: mex_220 is t_tstz::timestamp
-      }`, { mex_220: zone_2020.toJSDate() });
+        test('can cast TIMESTAMPTZ to timestamp', async () => {
+            await expect(`run: duckdb.sql("""
+              SELECT TIMESTAMPTZ '2020-02-20 00:00:00 ${zone}' as t_tstz
+          """) -> {
+            select: mex_220 is t_tstz::timestamp
+          }`).malloyResultMatches(runtime, { mex_220: zone_2020.toJSDate() });
         });
     });
 });

package/dist/databases/duckdb/duckdb.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"duckdb.spec.js","sourceRoot":"","sources":["../../../src/databases/duckdb/duckdb.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;AAEH,iCAA+B;AAC/B,6CAA2C;AAC3C,uCAAqC;AACrC,qCAAuD;AAEvD,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;AAE3C,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,IAAA,kCAA2B,EAAC,QAAQ,CAAC,CAAC;AACrE,MAAM,QAAQ,GAAG,IAAI,sBAAW,CAAC,SAAS,CAAC,CAAC;AAE5C,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;IACnE,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,MAAM,GAAG,MAAM,OAAO;aACzB,SAAS,CACR;;;;;OAKD,CACA;aACA,GAAG,EAAE,CAAC;QACT,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC1C,MAAM,OAAO,GAAG;YACd,QAAQ;YACR,SAAS;YACT,SAAS;YACT,UAAU;YACV,SAAS;YACT,UAAU;YACV,UAAU;YACV,WAAW;YACX,SAAS;SACV,CAAC;QACF,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG;uCACqB,MAAM;;UAEnC,OAAO;aACN,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,OAAO,QAAQ,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;aAC5D,IAAI,CAAC,KAAK,CAAC;;;;UAIZ,SAAS;aACR,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,SAAS,WAAW,SAAS,GAAG,CAAC;aACzD,IAAI,CAAC,IAAI,CAAC;;KAEhB,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;QACpD,KAAK,MAAM,SAAS,IAAI,SAAS,EAAE;YACjC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SAClE;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;QACnC,MAAM,MAAM,GAAG,MAAM,OAAO;aACzB,SAAS,CACR;;;;SAIC,CACF;aACA,GAAG,EAAE,CAAC;QACT,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;QAClC,MAAM,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,MAAM,CAC5C,oCAAoC,CACrC,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAC,6BAA6B,EAAE,KAAK,EAAC,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACjD,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAChC,2EAA2E,EAC3E,EAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAC,CACvB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;QACpB,MAAM,IAAI,GAAG,qBAAqB,CAAC,CAAC,gBAAgB;QACpD,MAAM,SAAS,GAAG,gBAAQ,CAAC,UAAU,CAAC;YACpC,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,CAAC;YACR,GAAG,EAAE,EAAE;YACP,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,CAAC;YACT,MAAM,EAAE,CAAC;YACT,IAAI;SACL,CAAC,CAAC;QACH,wCAAwC;QACxC,IAAI,CAAC,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;YAChD,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAChC;oDAC4C,IAAI;;;;QAIhD,EACA,EAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,EAAE,EAAC,CAChC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;IAClB,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAC5B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"duckdb.spec.js","sourceRoot":"","sources":["../../../src/databases/duckdb/duckdb.spec.ts"],"names":[],"mappings":"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"}