@malloydata/malloy-tests 0.0.119-dev240123183113 → 0.0.119-dev240124170348

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

@@ -29,7 +29,7 @@ import {
   StructDef,
   StructRelationship,
 } from '@malloydata/malloy';
-import {describeIfDatabaseAvailable, fStringLike} from '../../util';
+import {describeIfDatabaseAvailable, fStringLike, fToQF} from '../../util';
 
 import * as malloy from '@malloydata/malloy';
 import {RuntimeList} from '../../runtimes';
@@ -43,14 +43,14 @@ describe('BigQuery hand-built expression test', () => {
     await runtimes.closeAll();
   });
 
-  function withJoin(leftKey: string, rightKey: string): StructRelationship {
+  function withJoin(leftKey: string[], rightKey: string[]): StructRelationship {
     return {
       type: 'one',
       matrixOperation: 'left',
       onExpression: [
-        {type: 'field', path: `${leftKey}`},
+        {type: 'field', path: leftKey},
         '=',
-        {type: 'field', path: `${rightKey}`},
+        {type: 'field', path: rightKey},
       ],
     };
   }
@@ -125,7 +125,7 @@ describe('BigQuery hand-built expression test', () => {
           {
             type: 'aggregate',
             function: 'sum',
-            e: [{type: 'field', path: 'seats'}],
+            e: [{type: 'field', path: ['seats']}],
           },
         ],
         expressionType: 'aggregate',
@@ -142,7 +142,7 @@ describe('BigQuery hand-built expression test', () => {
               {
                 type: 'aggregate',
                 function: 'sum',
-                e: [{type: 'field', path: 'seats'}],
+                e: [{type: 'field', path: ['seats']}],
               },
             ],
             filterList: [
@@ -152,7 +152,7 @@ describe('BigQuery hand-built expression test', () => {
                 expression: [
                   {
                     type: 'field',
-                    path: 'manufacturer',
+                    path: ['manufacturer'],
                   },
                   "='BOEING'",
                 ],
@@ -167,9 +167,9 @@ describe('BigQuery hand-built expression test', () => {
         type: 'number',
         e: [
           '(',
-          {type: 'field', path: 'boeing_seats'},
+          {type: 'field', path: ['boeing_seats']},
           '/',
-          {type: 'field', path: 'total_seats'},
+          {type: 'field', path: ['total_seats']},
           ')*100',
         ],
         expressionType: 'aggregate',
@@ -179,7 +179,7 @@ describe('BigQuery hand-built expression test', () => {
         name: 'percent_boeing_floor',
         type: 'number',
         expressionType: 'aggregate',
-        e: ['FLOOR(', {type: 'field', path: 'percent_boeing'}, ')'],
+        e: ['FLOOR(', {type: 'field', path: ['percent_boeing']}, ')'],
         numberType: 'float',
       },
     ],
@@ -238,14 +238,14 @@ describe('BigQuery hand-built expression test', () => {
       {
         type: 'turtle',
         name: 'hand_turtle',
-        pipeline: [{type: 'reduce', fields: ['aircraft_count']}],
+        pipeline: [{type: 'reduce', queryFields: fToQF(['aircraft_count'])}],
       },
       {
         type: 'turtle',
         name: 'hand_turtle_pipeline',
         pipeline: [
-          {type: 'reduce', fields: ['aircraft_count']},
-          {type: 'reduce', fields: ['aircraft_count']},
+          {type: 'reduce', queryFields: fToQF(['aircraft_count'])},
+          {type: 'reduce', queryFields: fToQF(['aircraft_count'])},
         ],
       },
     ],
@@ -260,8 +260,8 @@ describe('BigQuery hand-built expression test', () => {
       {
         ...modelHandBase,
         structRelationship: withJoin(
-          'aircraft_model_code',
-          'aircraft_models.aircraft_model_code'
+          ['aircraft_model_code'],
+          ['aircraft_models', 'aircraft_model_code']
         ),
       },
     ],
@@ -290,7 +290,7 @@ describe('BigQuery hand-built expression test', () => {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: [
             // "aircraft_models.total_seats",
             // "aircraft_models.boeing_seats"
             // "aircraft_models.percent_boeing",
@@ -319,7 +319,7 @@ describe('BigQuery hand-built expression test', () => {
                       e: [
                         {
                           type: 'field',
-                          path: 'aircraft_models.seats',
+                          path: ['aircraft_models', 'seats'],
                         },
                       ],
                     },
@@ -331,7 +331,7 @@ describe('BigQuery hand-built expression test', () => {
                       expression: [
                         {
                           type: 'field',
-                          path: 'aircraft_models.manufacturer',
+                          path: ['aircraft_models', 'manufacturer'],
                         },
                         "='BOEING'",
                       ],
@@ -359,7 +359,7 @@ describe('BigQuery hand-built expression test', () => {
       ._loadQueryFromQueryDef({
         structRef: 'aircraft',
         name: 'hand_turtle',
-        pipeline: [{type: 'reduce', fields: ['aircraft_count']}],
+        pipeline: [{type: 'reduce', queryFields: fToQF(['aircraft_count'])}],
       })
       .run();
     expect(result.data.value[0]['aircraft_count']).toBe(3599);
@@ -413,17 +413,20 @@ describe('BigQuery hand-built expression test', () => {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             'state',
             'aircraft_count',
             {
               type: 'turtle',
               name: 'my_turtle',
               pipeline: [
-                {type: 'reduce', fields: ['county', 'aircraft_count']},
+                {
+                  type: 'reduce',
+                  queryFields: fToQF(['county', 'aircraft_count']),
+                },
               ],
             },
-          ],
+          ]),
         },
       ],
     });
@@ -438,7 +441,7 @@ describe('BigQuery hand-built expression test', () => {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             'state',
             'aircraft_count',
             {
@@ -448,11 +451,11 @@ describe('BigQuery hand-built expression test', () => {
               e: [
                 {
                   type: 'exclude',
-                  e: [{type: 'field', path: 'aircraft_count'}],
+                  e: [{type: 'field', path: ['aircraft_count']}],
                 },
               ],
             },
-          ],
+          ]),
         },
       ],
     });
@@ -467,7 +470,7 @@ describe('BigQuery hand-built expression test', () => {
       pipeline: [
         {
           type: 'reduce',
-          fields: ['state', 'aircraft_count', 'hand_turtle'],
+          queryFields: fToQF(['state', 'aircraft_count', 'hand_turtle']),
         },
       ],
     });
@@ -482,7 +485,7 @@ describe('BigQuery hand-built expression test', () => {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             'state',
             'aircraft_count',
             {
@@ -491,7 +494,7 @@ describe('BigQuery hand-built expression test', () => {
               pipeline: [
                 {
                   type: 'reduce',
-                  fields: [
+                  queryFields: fToQF([
                     'county',
                     'aircraft_count',
                     {
@@ -501,15 +504,15 @@ describe('BigQuery hand-built expression test', () => {
                       e: [
                         {
                           type: 'exclude',
-                          e: [{type: 'field', path: 'aircraft_count'}],
+                          e: [{type: 'field', path: ['aircraft_count']}],
                         },
                       ],
                     },
-                  ],
+                  ]),
                 },
               ],
             },
-          ],
+          ]),
         },
       ],
     });
@@ -523,8 +526,8 @@ describe('BigQuery hand-built expression test', () => {
       structRef: 'aircraft',
       name: 'hand_turtle_pipeline',
       pipeline: [
-        {type: 'reduce', fields: ['aircraft_count']},
-        {type: 'reduce', fields: ['aircraft_count']},
+        {type: 'reduce', queryFields: fToQF(['aircraft_count'])},
+        {type: 'reduce', queryFields: fToQF(['aircraft_count'])},
       ],
     });
     // console.log(result.sql);
@@ -540,7 +543,7 @@ describe('BigQuery hand-built expression test', () => {
         pipeline: [
           {
             type: 'reduce',
-            fields: [
+            queryFields: fToQF([
               'aircraft_count',
               {
                 type: 'turtle',
@@ -548,12 +551,12 @@ describe('BigQuery hand-built expression test', () => {
                 pipeline: [
                   {
                     type: 'reduce',
-                    fields: ['state', 'county', 'aircraft_count'],
+                    queryFields: fToQF(['state', 'county', 'aircraft_count']),
                   },
                   {
                     type: 'reduce',
                     filterList: [fStringLike('county', '2%')],
-                    fields: [
+                    queryFields: fToQF([
                       'state',
                       {
                         name: 'total_aircraft',
@@ -562,17 +565,17 @@ describe('BigQuery hand-built expression test', () => {
                           {
                             type: 'aggregate',
                             function: 'sum',
-                            e: [{type: 'field', path: 'aircraft_count'}],
+                            e: [{type: 'field', path: ['aircraft_count']}],
                           },
                         ],
                         expressionType: 'aggregate',
                         numberType: 'float',
                       },
-                    ],
+                    ]),
                   },
                 ],
               },
-            ],
+            ]),
           },
         ],
       })
@@ -673,7 +676,7 @@ describe('BigQuery hand-built expression test', () => {
         pipeline: [
           {
             type: 'reduce',
-            fields: [
+            queryFields: [
               {
                 name: 'boeing_seats',
                 type: 'number',
@@ -685,8 +688,10 @@ describe('BigQuery hand-built expression test', () => {
                       {
                         type: 'aggregate',
                         function: 'sum',
-                        structPath: 'aircraft_models',
-                        e: [{type: 'field', path: 'aircraft_models.seats'}],
+                        structPath: ['aircraft_models'],
+                        e: [
+                          {type: 'field', path: ['aircraft_models', 'seats']},
+                        ],
                       },
                     ],
                     filterList: [
@@ -696,7 +701,7 @@ describe('BigQuery hand-built expression test', () => {
                         expression: [
                           {
                             type: 'field',
-                            path: 'aircraft_models.manufacturer',
+                            path: ['aircraft_models', 'manufacturer'],
                           },
                           "='BOEING'",
                         ],
@@ -725,9 +730,9 @@ describe('BigQuery hand-built expression test', () => {
           type: 'many',
           matrixOperation: 'left',
           onExpression: [
-            {type: 'field', path: 'aircraft_model_code'},
+            {type: 'field', path: ['aircraft_model_code']},
             '=',
-            {type: 'field', path: 'aircraft.aircraft_model_code'},
+            {type: 'field', path: ['aircraft', 'aircraft_model_code']},
           ],
         },
       },
@@ -753,11 +758,11 @@ describe('BigQuery hand-built expression test', () => {
         pipeline: [
           {
             type: 'reduce',
-            fields: [
+            queryFields: fToQF([
               'aircraft.state',
               'aircraft.aircraft_count',
               'model_count',
-            ],
+            ]),
           },
         ],
       })
@@ -774,7 +779,7 @@ describe('BigQuery hand-built expression test', () => {
         pipeline: [
           {
             type: 'reduce',
-            fields: ['total_seats', 'aircraft.aircraft_count'],
+            queryFields: fToQF(['total_seats', 'aircraft.aircraft_count']),
           },
         ],
       })

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

@@ -26,7 +26,7 @@ import * as malloy from '@malloydata/malloy';
 import {Query} from '@malloydata/malloy';
 import {testModel} from '../../models/faa_model';
 import {BigQueryTestConnection, RuntimeList} from '../../runtimes';
-import {describeIfDatabaseAvailable, fStringEq} from '../../util';
+import {describeIfDatabaseAvailable, fStringEq, fToQF} from '../../util';
 import '../../util/db-jest-matchers';
 
 const runtimeList = new RuntimeList(['bigquery']);
@@ -85,7 +85,7 @@ describe('BigQuery expression tests', () => {
         // top 5 routes per carrier
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             'carrier',
             'flight_count',
             {
@@ -94,7 +94,7 @@ describe('BigQuery expression tests', () => {
               pipeline: [
                 {
                   type: 'reduce',
-                  fields: [
+                  queryFields: fToQF([
                     'origin_code',
                     'destination_code',
                     'flight_count',
@@ -110,23 +110,23 @@ describe('BigQuery expression tests', () => {
                         },
                       ],
                     },
-                  ],
+                  ]),
                 },
               ],
             },
-          ],
+          ]),
           limit: 5,
           orderBy: [{dir: 'desc', field: 'carrier'}],
         },
         // carrier top routes
         {
           type: 'project',
-          fields: [
+          queryFields: fToQF([
             'carrier',
             'flight_count',
             'routes.origin_code',
             'routes.route_flights',
-          ],
+          ]),
         },
       ],
     });
@@ -136,7 +136,9 @@ describe('BigQuery expression tests', () => {
   it('step_0', async () => {
     const sql = await compileQueryFromQueryDef(faa, {
       structRef: 'flights',
-      pipeline: [{type: 'reduce', fields: ['carriers.name', 'flight_count']}],
+      pipeline: [
+        {type: 'reduce', queryFields: fToQF(['carriers.name', 'flight_count'])},
+      ],
     });
     await bqCompile(sql);
   });
@@ -148,7 +150,9 @@ describe('BigQuery expression tests', () => {
         fStringEq('origin.state', 'CA'),
         fStringEq('destination.state', 'NY'),
       ],
-      pipeline: [{type: 'reduce', fields: ['carriers.name', 'flight_count']}],
+      pipeline: [
+        {type: 'reduce', queryFields: fToQF(['carriers.name', 'flight_count'])},
+      ],
     });
     await bqCompile(sql);
   });
@@ -158,7 +162,7 @@ describe('BigQuery expression tests', () => {
       structRef: 'flights',
       pipeline: [
         {
-          fields: [
+          queryFields: [
             {
               as: 'dep_year',
               name: 'dep_time',
@@ -213,7 +217,7 @@ describe('BigQuery expression tests', () => {
                     {
                       type: 'aggregate',
                       function: 'sum',
-                      e: [{type: 'field', path: 'distance'}],
+                      e: [{type: 'field', path: ['distance']}],
                     },
                   ],
                 },
@@ -232,7 +236,7 @@ describe('BigQuery expression tests', () => {
     const sql = await compileQueryFromQueryDef(faa, {
       pipeline: [
         {
-          fields: [
+          queryFields: fToQF([
             {
               bucketFilter: 'AA,WN,DL',
               bucketOther: 'Other Carrier',
@@ -240,7 +244,7 @@ describe('BigQuery expression tests', () => {
               type: 'string',
             },
             'flight_count',
-          ],
+          ]),
           orderBy: [{dir: 'asc', field: 2}],
           type: 'reduce',
         },
@@ -258,7 +262,9 @@ describe('BigQuery expression tests', () => {
   it('simple_reduce', async () => {
     const sql = await compileQueryFromQueryDef(faa, {
       structRef: 'flights',
-      pipeline: [{type: 'reduce', fields: ['carrier', 'flight_count']}],
+      pipeline: [
+        {type: 'reduce', queryFields: fToQF(['carrier', 'flight_count'])},
+      ],
     });
     await bqCompile(sql);
   });
@@ -269,7 +275,7 @@ describe('BigQuery expression tests', () => {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             {
               type: 'number',
               expressionType: 'aggregate',
@@ -278,12 +284,12 @@ describe('BigQuery expression tests', () => {
                 {
                   type: 'aggregate',
                   function: 'sum',
-                  e: [{type: 'field', path: 'distance'}],
+                  e: [{type: 'field', path: ['distance']}],
                 },
               ],
             },
             'aircraft.aircraft_models.total_seats',
-          ],
+          ]),
         },
       ],
     });
@@ -296,14 +302,18 @@ describe('BigQuery expression tests', () => {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             {
               type: 'string',
               name: 'carrier',
-              e: ['UPPER(', {type: 'field', path: 'carriers.nickname'}, ')'],
+              e: [
+                'UPPER(',
+                {type: 'field', path: ['carriers', 'nickname']},
+                ')',
+              ],
             },
             'flight_count',
-          ],
+          ]),
         },
       ],
     });
@@ -315,7 +325,7 @@ describe('BigQuery expression tests', () => {
       structRef: 'flights',
       pipeline: [
         {
-          fields: [
+          queryFields: fToQF([
             'carriers.name',
             {
               type: 'number',
@@ -325,11 +335,11 @@ describe('BigQuery expression tests', () => {
                 {
                   type: 'aggregate',
                   function: 'sum',
-                  e: [{type: 'field', path: 'distance'}],
+                  e: [{type: 'field', path: ['distance']}],
                 },
               ],
             },
-          ],
+          ]),
           type: 'reduce',
         },
       ],
@@ -343,7 +353,7 @@ describe('BigQuery expression tests', () => {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             'aircraft.aircraft_models.manufacturer',
             {
               type: 'number',
@@ -357,13 +367,13 @@ describe('BigQuery expression tests', () => {
                     {
                       type: 'aggregate',
                       function: 'sum',
-                      e: [{type: 'field', path: 'distance'}],
+                      e: [{type: 'field', path: ['distance']}],
                     },
                   ],
                 },
               ],
             },
-          ],
+          ]),
         },
       ],
     });
@@ -376,7 +386,7 @@ describe('BigQuery expression tests', () => {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             'origin.state',
             'flight_count',
             {
@@ -391,13 +401,13 @@ describe('BigQuery expression tests', () => {
                     {
                       type: 'aggregate',
                       function: 'sum',
-                      e: [{type: 'field', path: 'distance'}],
+                      e: [{type: 'field', path: ['distance']}],
                     },
                   ],
                 },
               ],
             },
-          ],
+          ]),
           filterList: [fStringEq('carriers.code', 'WN')],
         },
       ],
@@ -456,14 +466,14 @@ describe('BigQuery expression tests', () => {
       structRef: 'flights',
       pipeline: [
         {
-          fields: [
+          queryFields: fToQF([
             'origin.state',
             'flight_count',
             'flights_by_model',
             'flights_by_carrier',
             'measures_first',
             'first_turtle',
-          ],
+          ]),
           type: 'reduce',
         },
       ],
@@ -592,7 +602,7 @@ describe('BigQuery expression tests', () => {
         pipeline: [
           {
             type: 'reduce',
-            fields: ['provider_state', 'num_providers'],
+            queryFields: fToQF(['provider_state', 'num_providers']),
             orderBy: [{dir: 'desc', field: 2}],
           },
         ],

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

@@ -160,7 +160,7 @@ describe.each(runtimes.runtimeList)(
           limit: 10
         }
       `).malloyResultMatches(gaModel, {
-        fieldName: 'channelGrouping',
+        // fieldName: 'channelGrouping',
         // fieldValue: 'Organic Search',
         // weight: 10,
       });
@@ -173,7 +173,7 @@ describe.each(runtimes.runtimeList)(
       }
       await expect(`
         run: ${databaseName}.table('malloytest.ga_sample')-> {
-          index: everything
+          index: *
           sample: ${sampleSize}
         }
         -> {