Omit 'schema' as part of 'Table.{create,update}' when 'view_query` is set (#1703)

* Omit 'schema' as part of 'Table.{create,update}' when 'view_query is set.

Closes #1701.

* Adjust comment about omitting schema when 'view_query' is set.

Addresses:
#1703 (comment)

* Wait to add schema until after checking for 'view_query'.

Addresses:
#1703 (comment).

Author: tseaver

gcloud/bigquery/table.py

@@ -401,7 +401,6 @@ def _build_resource(self):
                 'projectId': self._dataset.project,
                 'datasetId': self._dataset.name,
                 'tableId': self.name},
-            'schema': {'fields': _build_schema_resource(self._schema)},
         }
         if self.description is not None:
             resource['description'] = self.description
@@ -419,6 +418,10 @@ def _build_resource(self):
         if self.view_query is not None:
             view = resource['view'] = {}
             view['query'] = self.view_query
+        elif self._schema:
+            resource['schema'] = {
+                'fields': _build_schema_resource(self._schema)
+            }
 
         return resource
 

gcloud/bigquery/test_table.py

@@ -511,9 +511,6 @@ def test_create_w_alternate_client(self):
                 'projectId': self.PROJECT,
                 'datasetId': self.DS_NAME,
                 'tableId': self.TABLE_NAME},
-            'schema': {'fields': [
-                {'name': 'full_name', 'type': 'STRING', 'mode': 'REQUIRED'},
-                {'name': 'age', 'type': 'INTEGER', 'mode': 'REQUIRED'}]},
             'description': DESCRIPTION,
             'friendlyName': TITLE,
             'view': {'query': QUERY},
@@ -800,10 +797,7 @@ def test_update_w_alternate_client(self):
         conn2 = _Connection(RESOURCE)
         client2 = _Client(project=self.PROJECT, connection=conn2)
         dataset = _Dataset(client1)
-        full_name = SchemaField('full_name', 'STRING', mode='REQUIRED')
-        age = SchemaField('age', 'INTEGER', mode='REQUIRED')
-        table = self._makeOne(self.TABLE_NAME, dataset=dataset,
-                              schema=[full_name, age])
+        table = self._makeOne(self.TABLE_NAME, dataset=dataset)
         table.default_table_expiration_ms = DEF_TABLE_EXP
         table.location = LOCATION
         table.expires = self.EXP_TIME
@@ -821,9 +815,6 @@ def test_update_w_alternate_client(self):
                 {'projectId': self.PROJECT,
                  'datasetId': self.DS_NAME,
                  'tableId': self.TABLE_NAME},
-            'schema': {'fields': [
-                {'name': 'full_name', 'type': 'STRING', 'mode': 'REQUIRED'},
-                {'name': 'age', 'type': 'INTEGER', 'mode': 'REQUIRED'}]},
             'expirationTime': _millis(self.EXP_TIME),
             'location': 'EU',
             'view': {'query': QUERY},