Adds content related to ForeignTypeInfo

Author: chalmerlowe

google/cloud/bigquery/schema.py

@@ -20,7 +20,7 @@
 from typing import Any, Dict, Iterable, Optional, Union, cast
 
 from google.cloud.bigquery import standard_sql
-from google.cloud.bigquery._helpers import ResourceBase
+from google.cloud.bigquery._helpers import ResourceBase, _isinstance_or_raise
 from google.cloud.bigquery.enums import StandardSqlTypeNames
 
 
@@ -596,16 +596,15 @@ class TableSchema(ResourceBase):
     """Schema of a table
 
     Args:
-        fields (list): Describes the fields in a table.
-        foreignTypeInfo: Optional. Specifies metadata of the foreign data type
-            definition in field schema
-            (TableFieldSchema.foreign_type_definition).
+        fields (Optional[list]): Describes the fields in a table.
+        foreignTypeInfo (Optional[str]): Specifies metadata of the foreign data type
+            definition in field schema.
     """
 
-    def __init__(self, fields: list = None, foreign_type_info: Optional[str] = None):
+    def __init__(self, fields: Optional[list] = None, foreign_type_info: Optional[str] = None):
         self._properties = {}
-        self._properties["fields"] = fields
-        self._properties["foreignTypeInfo"] = foreign_type_info
+        self.fields = fields
+        self.foreign_type_info = foreign_type_info
 
     @property
     def fields(self) -> Any:
@@ -615,8 +614,7 @@ def fields(self) -> Any:
 
     @fields.setter
     def fields(self, value: list, dtype: str) -> str:
-        if not isinstance(value, list):
-            raise ValueError(f"Pass fields as a '{repr(dtype)}'." f"Got {type(value)}.")
+        value = _isinstance_or_raise(value, (list, None))
         self._properties["fields"] = value
 
     @property
@@ -653,9 +651,9 @@ class ForeignTypeInfo(ResourceBase):
             foreign data type.
     """
 
-    def __init__(self, type_system_="TYPE_SYSTEM_UNSPECIFIED"):
+    def __init__(self, type_system="TYPE_SYSTEM_UNSPECIFIED"):
         self._properties = {}
-        self._properties["typeSystem"] = type_system_
+        self.type_system = type_system
 
     @property
     def type_system(self):
@@ -666,8 +664,7 @@ def type_system(self):
 
     @type_system.setter
     def type_system(self, value: str):
-        if not isinstance(value, str) or value is None:
-            raise ValueError("Pass type_system as a 'str'." f" Got {type(value)}.")
+        value = _isinstance_or_raise(value, (str, None))
         self._properties["typeSystem"] = value
 
     def to_api_repr(self) -> dict:
@@ -678,3 +675,7 @@ def to_api_repr(self) -> dict:
                 A dictionary in the format used by the BigQuery API.
         """
         return copy.deepcopy(self._properties)
+
+
+
+

tests/unit/test_schema.py

@@ -1111,34 +1111,43 @@ def test_to_api_repr_parameterized(field, api):
     assert SchemaField(**field).to_api_repr() == api
 
 
-class TestForeignTypeSystem:
+class TestForeignTypeInfo:
     """TODO: add doc string."""
 
-    def test_foreign_type_system_constructor_valid_type_system(self):
-        foreign_type_info = ForeignTypeInfo("my_type_system")
-        assert foreign_type_info.type_system == "my_type_system"
+    @staticmethod
+    def _get_target_class():
+        from google.cloud.bigquery.schema import ForeignTypeInfo
+        return ForeignTypeInfo
+
+    def _make_one(self, *args, **kw):
+        return self._get_target_class()(*args, **kw)
+
+    @pytest.mark.parametrize(
+        "type_system,expected",
+        [
+            (None, None),
+            ("TYPE_SYSTEM_UNSPECIFIED", "TYPE_SYSTEM_UNSPECIFIED"),
+            ("HIVE", "HIVE"),
+        ],
+    )
+    def test_ctor_valid_input(self, type_system, expected):
+        result = self._make_one(type_system=type_system)
+        
+        assert result._properties['typeSystem'] == expected
 
-    @pytest.mark.parametrize("value", [(42), (None)])
-    def test_foreign_type_system_constructor_invalid_type_system(self, value):
-        foreign_type_info = ForeignTypeInfo("my_type_system")
-        with pytest.raises(ValueError) as exc_info:
-            foreign_type_info.type_system = value
-        assert "Pass type_system as a 'str'." in str(exc_info.value)
+    def test_ctor_invalid_input(self):
+        with pytest.raises(TypeError) as e:
+            result = self._make_one(type_system=123)
+            assert result == e
 
     @pytest.mark.parametrize(
-        "type_system, expected_api_repr",
+        "type_system,expected",
         [
             ("TYPE_SYSTEM_UNSPECIFIED", {"typeSystem": "TYPE_SYSTEM_UNSPECIFIED"}),
             ("HIVE", {"typeSystem": "HIVE"}),
+            (None, {"typeSystem": None}),
         ],
     )
-    def test_to_api_repr(self, type_system, expected_api_repr):
-        foreign_type_info = ForeignTypeInfo(type_system)
-        actual = foreign_type_info.to_api_repr()
-        assert actual == expected_api_repr
-
-    def test_to_api_repr_type_system_unspecified(self):
-        foreign_type_info = ForeignTypeInfo()
-        expected_api_repr = {"typeSystem": "TYPE_SYSTEM_UNSPECIFIED"}
-        actual = foreign_type_info.to_api_repr()
-        assert actual == expected_api_repr
+    def test_to_api_repr(self, type_system, expected):
+        result = self._make_one(type_system=type_system)
+        assert result.to_api_repr() == expected