fix: make sure to pass selectedFields to tabledata.list method (#1449)

alvarowolfx · gcf-owl-bot[bot] · leahecole · web-flow · commit 206aff93d3d3 · 2025-03-17T16:01:45.000-04:00
* fix: make sure to pass selectedFields to tabledata.list method * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Leah E. Cole <6719667+leahecole@users.noreply.github.com>
diff --git a/src/bigquery.ts b/src/bigquery.ts
@@ -588,22 +588,26 @@ export class BigQuery extends Service {
       parseJSON?: boolean;
     }
   ) {
-    // copy schema fields to avoid mutation when filtering selected fields
-    let schemaFields = schema.fields ? [...schema.fields] : [];
+    // deep copy schema fields to avoid mutation
+    let schemaFields: TableField[] = extend(true, [], schema.fields);
+    let selectedFields: string[] = extend(true, [], options.selectedFields);
     if (options.selectedFields && options.selectedFields!.length > 0) {
       const selectedFieldsArray = options.selectedFields!.map(c => {
         return c.split('.');
       });
 
-      const currentFields = selectedFieldsArray.map(c => c.shift());
+      const currentFields = selectedFieldsArray
+        .map(c => c.shift())
+        .filter(c => c !== undefined);
+
       //filter schema fields based on selected fields.
       schemaFields = schemaFields.filter(
         field =>
           currentFields
             .map(c => c!.toLowerCase())
             .indexOf(field.name!.toLowerCase()) >= 0
       );
-      options.selectedFields = selectedFieldsArray
+      selectedFields = selectedFieldsArray
         .filter(c => c.length > 0)
         .map(c => c.join('.'));
     }
@@ -614,12 +618,18 @@ export class BigQuery extends Service {
       return row.f!.map((field: TableRowField, index: number) => {
         const schemaField = schemaFields[index];
         let value = field.v;
-        if (schemaField.mode === 'REPEATED') {
+        if (schemaField && schemaField.mode === 'REPEATED') {
           value = (value as TableRowField[]).map(val => {
-            return convertSchemaFieldValue(schemaField, val.v, options);
+            return convertSchemaFieldValue(schemaField, val.v, {
+              ...options,
+              selectedFields,
+            });
           });
         } else {
-          value = convertSchemaFieldValue(schemaField, value, options);
+          value = convertSchemaFieldValue(schemaField, value, {
+            ...options,
+            selectedFields,
+          });
         }
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const fieldObject: any = {};
diff --git a/src/table.ts b/src/table.ts
@@ -1833,7 +1833,6 @@ class Table extends ServiceObject {
     const selectedFields = options.selectedFields
       ? options.selectedFields.split(',')
       : [];
-    delete options.selectedFields;
     const onComplete = (
       err: Error | null,
       rows: TableRow[] | null,
diff --git a/test/table.ts b/test/table.ts
@@ -2179,6 +2179,7 @@ describe('BigQuery/Table', () => {
       sandbox.restore();
 
       table.request = (reqOpts: DecorateRequestOptions, callback: Function) => {
+        assert(reqOpts.qs.selectedFields, selectedFields);
         callback(null, {rows});
       };
 
@@ -2190,15 +2191,38 @@ describe('BigQuery/Table', () => {
     });
 
     it('should return selected fields after consecutive calls', done => {
+      const buildNestedObject = (value: Record<string, string>) => {
+        return [
+          {
+            v: {
+              f: [
+                {
+                  v: {
+                    f: Object.values(value).map(v => ({v})),
+                  },
+                },
+              ],
+            },
+          },
+        ];
+      };
       const callSequence = [
         {
-          selectedFields: ['age'],
-          rows: [{f: [{v: 40}]}],
-          expected: [{age: 40}],
+          selectedFields: ['age', 'nested.object.a'],
+          rows: [
+            {
+              f: [{v: 40}, {v: buildNestedObject({a: '1'})}],
+            },
+          ],
+          expected: [{age: 40, nested: [{object: {a: '1'}}]}],
         },
         {
           selectedFields: ['name', 'address'],
-          rows: [{f: [{v: 'John'}, {v: '1234 Fake St, Springfield'}]}],
+          rows: [
+            {
+              f: [{v: 'John'}, {v: '1234 Fake St, Springfield'}],
+            },
+          ],
           expected: [{name: 'John', address: '1234 Fake St, Springfield'}],
         },
         {
@@ -2212,6 +2236,27 @@ describe('BigQuery/Table', () => {
           {name: 'name', type: 'string'},
           {name: 'age', type: 'INTEGER'},
           {name: 'address', type: 'string'},
+          {
+            name: 'nested',
+            type: 'RECORD',
+            mode: 'REPEATED',
+            fields: [
+              {
+                name: 'object',
+                type: 'RECORD',
+                fields: [
+                  {
+                    name: 'a',
+                    type: 'STRING',
+                  },
+                  {
+                    name: 'b',
+                    type: 'STRING',
+                  },
+                ],
+              },
+            ],
+          },
         ],
       };
 
