yet another round of merge conflicts.

Author: chalmerlowe

google/cloud/bigquery/schema.py

@@ -19,7 +19,7 @@
 import collections
 import copy
 import enum
-from typing import Any, cast, Dict, Iterable, Optional, Union
+from typing import Any, cast, Dict, Iterable, Optional, Union, Mapping, List
 
 from google.cloud.bigquery import _helpers
 from google.cloud.bigquery import standard_sql
@@ -260,8 +260,6 @@ def __init__(
                 raise ValueError(
                     "If the 'field_type' is 'FOREIGN', then 'foreign_type_definition' is required."
                 )
-            self._properties["type"] = field_type
-
         if fields:  # Don't set the property if it's not set.
             self._properties["fields"] = [field.to_api_repr() for field in fields]
 

tests/unit/test_schema.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 
+import copy
 import unittest
 from unittest import mock
 
@@ -851,11 +852,30 @@ def test_schema_fields_sequence(self):
 
     def test_unknown_properties(self):
         schema = [
-            {"name": "full_name", "type": "STRING", "mode": "REQUIRED"},
-            {"name": "address", "invalid_key": "STRING", "mode": "REQUIRED"},
+            {
+                "name": "full_name",
+                "type": "STRING",
+                "mode": "REQUIRED",
+                "someNewProperty": "test-value",
+            },
+            {
+                "name": "age",
+                # Note: This type should be included, too. Avoid client-side
+                # validation, as it could prevent backwards-compatible
+                # evolution of the server-side behavior.
+                "typo": "INTEGER",
+                "mode": "REQUIRED",
+                "anotherNewProperty": "another-test",
+            },
         ]
-        with pytest.raises(Exception):  # Or a more specific exception if known
-            _to_schema_fields(schema)
+
+        # Make sure the setter doesn't mutate schema.
+        expected_schema = copy.deepcopy(schema)
+
+        result = self._call_fut(schema)
+
+        for api_repr, field in zip(expected_schema, result):
+            assert field.to_api_repr() == api_repr
 
     @pytest.mark.parametrize(
         "schema, expected_schema",