updates allowed arg types to include str, and assoc. tests

Author: chalmerlowe

google/cloud/bigquery/external_config.py

@@ -496,17 +496,17 @@ def source_column_match(self) -> Optional[SourceColumnMatch]:
         """
 
         value = self._properties.get("sourceColumnMatch")
-        # if value is not None:
         return SourceColumnMatch(value) if value is not None else None
-        # return None
 
     @source_column_match.setter
-    def source_column_match(self, value: Optional[SourceColumnMatch]):
-        if value is not None and not isinstance(value, SourceColumnMatch):
+    def source_column_match(self, value: Union[SourceColumnMatch, str, None]):
+        if value is not None and not isinstance(value, (SourceColumnMatch, str)):
             raise TypeError(
-                "value must be a google.cloud.bigquery.enums.SourceColumnMatch or None"
+                "value must be a google.cloud.bigquery.enums.SourceColumnMatch, str, or None"
             )
-        self._properties["sourceColumnMatch"] = value.value if value else None
+        if isinstance(value, SourceColumnMatch):
+            value = value.value
+        self._properties["sourceColumnMatch"] = value if value else None
 
     @property
     def null_markers(self) -> Optional[Iterable[str]]:

google/cloud/bigquery/job/load.py

@@ -15,7 +15,7 @@
 """Classes for load jobs."""
 
 import typing
-from typing import FrozenSet, List, Iterable, Optional
+from typing import FrozenSet, List, Iterable, Optional, Union
 
 from google.cloud.bigquery.encryption_configuration import EncryptionConfiguration
 from google.cloud.bigquery.enums import SourceColumnMatch
@@ -591,17 +591,17 @@ def source_column_match(self) -> Optional[SourceColumnMatch]:
         https://cloud.google.com/bigquery/docs/reference/rest/v2/Job#JobConfigurationLoad.FIELDS.source_column_match
         """
         value = self._get_sub_prop("sourceColumnMatch")
-        if value is not None:
-            return SourceColumnMatch(value)
-        return None
+        return SourceColumnMatch(value) if value is not None else None
 
     @source_column_match.setter
-    def source_column_match(self, value: Optional[SourceColumnMatch]):
-        if value is not None and not isinstance(value, SourceColumnMatch):
+    def source_column_match(self, value: Union[SourceColumnMatch, str, None]):
+        if value is not None and not isinstance(value, (SourceColumnMatch, str)):
             raise TypeError(
-                "value must be a google.cloud.bigquery.enums.SourceColumnMatch or None"
+                "value must be a google.cloud.bigquery.enums.SourceColumnMatch, str, or None"
             )
-        self._set_sub_prop("sourceColumnMatch", value.value if value else None)
+        if isinstance(value, SourceColumnMatch):
+            value = value.value
+        self._set_sub_prop("sourceColumnMatch", value if value else None)
 
     @property
     def date_format(self) -> Optional[str]:
@@ -1018,7 +1018,7 @@ def clustering_fields(self):
         return self.configuration.clustering_fields
 
     @property
-    def source_column_match(self):
+    def source_column_match(self) -> Optional[SourceColumnMatch]:
         """See
         :attr:`google.cloud.bigquery.job.LoadJobConfig.source_column_match`.
         """

tests/unit/job/test_load_config.py

@@ -867,11 +867,14 @@ def test_source_column_match_setter(self):
         self.assertEqual(
             config._properties["load"]["sourceColumnMatch"], option_enum.value
         )
+        option_str = "NAME"
+        config.source_column_match = option_str
+        self.assertEqual(config._properties["load"]["sourceColumnMatch"], option_str)
 
     def test_source_column_match_setter_invalid_type(self):
         config = self._get_target_class()()
         with self.assertRaises(TypeError):
-            config.source_column_match = "INVALID_STRING_TYPE"
+            config.source_column_match = 3.14
 
     def test_date_format_missing(self):
         config = self._get_target_class()()

tests/unit/test_external_config.py

@@ -939,9 +939,9 @@ def test_source_column_match_invalid_input(self):
         ec = external_config.CSVOptions()
         with self.assertRaisesRegex(
             TypeError,
-            "value must be a google.cloud.bigquery.enums.SourceColumnMatch or None",
+            "value must be a google.cloud.bigquery.enums.SourceColumnMatch, str, or None",
         ):
-            ec.source_column_match = "neither None or enum value"
+            ec.source_column_match = 3.14
 
 
 class TestGoogleSheetsOptions(unittest.TestCase):