updates some tests and constants

Author: chalmerlowe

google/cloud/bigquery/external_config.py

@@ -30,6 +30,7 @@
 from google.cloud.bigquery._helpers import _int_or_none
 from google.cloud.bigquery._helpers import _str_or_none
 from google.cloud.bigquery import _helpers
+from google.cloud.bigquery.enums import SourceColumnMatch
 from google.cloud.bigquery.format_options import AvroOptions, ParquetOptions
 from google.cloud.bigquery import schema
 from google.cloud.bigquery.schema import SchemaField
@@ -499,14 +500,15 @@ def null_markers(self, value: Optional[List[str]]):
         self._properties["nullMarkers"] = value
 
     @property
-    def source_column_match(self) -> Optional[str]:
-        """Optional[str]: Controls the strategy used to match loaded columns to the schema. If not
-        set, a sensible default is chosen based on how the schema is provided. If
-        autodetect is used, then columns are matched by name. Otherwise, columns
-        are matched by position. This is done to keep the behavior
-        backward-compatible.
+    def source_column_match(self) -> Optional[SourceColumnMatch]:
+        """Optional[SourceColumnMatch]: Controls the strategy used to match loaded
+        columns to the schema. If not set, a sensible default is chosen based on
+        how the schema is provided. If autodetect is used, then columns are matched
+        by name. Otherwise, columns are matched by position. This is done to keep
+        the behavior backward-compatible.
 
         Acceptable values are:
+            SOURCE_COLUMN_MATCH_UNSPECIFIED - Unspecified column name match option.
             POSITION - matches by position. This assumes that the columns are ordered
                 the same way as the schema.
             NAME - matches by name. This reads the header row as column names and
@@ -515,12 +517,19 @@ def source_column_match(self) -> Optional[str]:
         See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables#ExternalDataConfiguration.FIELDS.source_column_match
         """
-        result = self._properties.get("sourceColumnMatch")
-        return typing.cast(str, result)
+
+        value = self._properties.get("sourceColumnMatch")
+        if value is not None:
+            return SourceColumnMatch(value)
+        return None
 
     @source_column_match.setter
-    def source_column_match(self, value: Optional[str]):
-        self._properties["sourceColumnMatch"] = value
+    def source_column_match(self, value: Optional[SourceColumnMatch]):
+        if value is not None and not isinstance(value, SourceColumnMatch):
+            raise TypeError(
+                "value must be a google.cloud.bigquery.enums.SourceColumnMatch or None"
+            )
+        self._properties["sourceColumnMatch"] = value.value if value else None
 
     def to_api_repr(self) -> dict:
         """Build an API representation of this object.

google/cloud/bigquery/job/load.py

@@ -644,12 +644,14 @@ def null_markers(self, value: Optional[List[str]]):
 
     @property
     def source_column_match(self) -> Optional[SourceColumnMatch]:
-        """Optional[google.cloud.bigquery.enums.SourceColumnMatch]: Controls the strategy used to match
-        loaded columns to the schema. If not set, a sensible default is chosen based on how the schema
-        is provided. If autodetect is used, then columns are matched by name. Otherwise, columns
-        are matched by position. This is done to keep the behavior backward-compatible.
+        """Optional[google.cloud.bigquery.enums.SourceColumnMatch]: Controls the
+        strategy used to match loaded columns to the schema. If not set, a sensible
+        default is chosen based on how the schema is provided. If autodetect is
+        used, then columns are matched by name. Otherwise, columns are matched by
+        position. This is done to keep the behavior backward-compatible.
 
         Acceptable values are:
+            SOURCE_COLUMN_MATCH_UNSPECIFIED - Unspecified column name match option.
             POSITION - matches by position. This assumes that the columns are ordered
                 the same way as the schema.
             NAME - matches by name. This reads the header row as column names and

tests/unit/test_external_config.py

@@ -19,6 +19,7 @@
 
 from google.cloud.bigquery import external_config
 from google.cloud.bigquery import schema
+from google.cloud.bigquery.enums import SourceColumnMatch
 
 import pytest
 
@@ -30,6 +31,8 @@ class TestExternalConfig(unittest.TestCase):
     DATETIME_FORMAT = "MM/DD/YYYY HH24:MI:SS"
     TIME_FORMAT = "HH24:MI:SS"
     TIMESTAMP_FORMAT = "MM/DD/YYYY HH24:MI:SS.FF6 TZR"
+    NULL_MARKERS = ["", "N/A"]
+    SOURCE_COLUMN_MATCH = SourceColumnMatch.NAME
 
     BASE_RESOURCE = {
         "sourceFormat": "",
@@ -263,9 +266,6 @@ def test_to_api_repr_hive_partitioning(self):
         }
         self.assertEqual(got_resource, expected_resource)
 
-    NULL_MARKERS = ["", "N/A"]
-    SOURCE_COLUMN_MATCH = "NAME"
-
     def test_from_api_repr_csv(self):
         resource = _copy_and_update(
             self.BASE_RESOURCE,
@@ -891,6 +891,9 @@ def test_to_api_repr(self):
 
 
 class CSVOptions(unittest.TestCase):
+    NULL_MARKERS = ["", "N/A"]
+    SOURCE_COLUMN_MATCH = SourceColumnMatch.NAME
+
     def test_to_api_repr(self):
         options = external_config.CSVOptions()
         options.field_delimiter = "\t"
@@ -900,8 +903,8 @@ def test_to_api_repr(self):
         options.allow_jagged_rows = False
         options.encoding = "UTF-8"
         options.preserve_ascii_control_characters = False
-        options.null_markers = ["NA"]
-        options.source_column_match = "POSITION"
+        options.null_markers = self.NULL_MARKERS
+        options.source_column_match = self.SOURCE_COLUMN_MATCH
 
         resource = options.to_api_repr()
 
@@ -915,8 +918,8 @@ def test_to_api_repr(self):
                 "allowJaggedRows": False,
                 "encoding": "UTF-8",
                 "preserveAsciiControlCharacters": False,
-                "nullMarkers": ["NA"],
-                "sourceColumnMatch": "POSITION",
+                "nullMarkers": self.NULL_MARKERS,
+                "sourceColumnMatch": self.SOURCE_COLUMN_MATCH,
             },
         )