bigquery: convert nested objects to their native types

stephenplusplus · stephenplusplus · commit 898ae7d56afb · 2016-09-29T13:06:45.000-04:00
diff --git a/packages/bigquery/src/table.js b/packages/bigquery/src/table.js
@@ -188,13 +188,20 @@ Table.createSchemaFromString_ = function(str) {
  * @return {array} Fields using their matching names from the table's schema.
  */
 Table.mergeSchemaWithRows_ = function(schema, rows) {
-  return rows.map(mergeSchema).map(flattenRows);
+  return arrify(rows).map(mergeSchema).map(flattenRows);
 
   function mergeSchema(row) {
     return row.f.map(function(field, index) {
       var schemaField = schema.fields[index];
       var value = field.v;
 
+      var fieldObject = {};
+
+      if (value === null) {
+        fieldObject[schemaField.name] = null;
+        return fieldObject;
+      }
+
       switch (schemaField.type) {
         case 'BOOLEAN': {
           value = value === 'true';
@@ -212,13 +219,23 @@ Table.mergeSchemaWithRows_ = function(schema, rows) {
           }
           break;
         }
+        case 'RECORD': {
+          if (schemaField.mode === 'REPEATED') {
+            value = value.map(function(val) {
+              return Table.mergeSchemaWithRows_(schemaField, val.v).pop();
+            });
+          } else {
+            value = Table.mergeSchemaWithRows_(schemaField, value).pop();
+          }
+
+          break;
+        }
         case 'TIMESTAMP': {
           value = new Date(value * 1000);
           break;
         }
       }
 
-      var fieldObject = {};
       fieldObject[schemaField.name] = value;
       return fieldObject;
     });
diff --git a/packages/bigquery/test/table.js b/packages/bigquery/test/table.js
@@ -180,21 +180,75 @@ describe('BigQuery/Table', function() {
               { v: 'Milo' },
               { v: String(now.valueOf() / 1000) },
               { v: 'false' },
-              { v: '5.222330009847' }
+              { v: '5.222330009847' },
+              { v: null },
+              {
+                v: [
+                  {
+                    v: {
+                      f: [
+                        {
+                          v: {
+                            f: [
+                              {
+                                v: 'nested_value'
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
             ]
           },
           expected: {
             id: 3,
             name: 'Milo',
             dob: now,
             has_claws: false,
-            hair_count: 5.222330009847
+            hair_count: 5.222330009847,
+            nullable: null,
+            objects: [
+              {
+                nested_object: {
+                  nested_property: 'nested_value'
+                }
+              }
+            ]
           }
         }
       ];
 
+      var schemaObject = extend(true, SCHEMA_OBJECT, {});
+
+      schemaObject.fields.push({
+        name: 'nullable',
+        type: 'STRING',
+        mode: 'NULLABLE'
+      });
+
+      schemaObject.fields.push({
+        name: 'objects',
+        type: 'RECORD',
+        mode: 'REPEATED',
+        fields: [
+          {
+            name: 'nested_object',
+            type: 'RECORD',
+            fields: [
+              {
+                name: 'nested_property',
+                type: 'STRING'
+              }
+            ]
+          }
+        ]
+      });
+
       var rawRows = rows.map(prop('raw'));
-      var mergedRows = Table.mergeSchemaWithRows_(SCHEMA_OBJECT, rawRows);
+      var mergedRows = Table.mergeSchemaWithRows_(schemaObject, rawRows);
 
       mergedRows.forEach(function(mergedRow, index) {
         assert.deepEqual(mergedRow, rows[index].expected);
