renames some attributes and adds some typehinting

Author: chalmerlowe

google/cloud/bigquery/enums.py

@@ -467,9 +467,9 @@ class JobCreationMode(object):
 class SourceColumnMatch(str, enum.Enum):
     """Uses sensible defaults 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-compati
-ble.
+        If autodetect is used, then columns are matched by name. Otherwise, columns
+        are matched by position. This is done to keep the behavior backward-compati
+    ble.
     """
 
     SOURCE_COLUMN_MATCH_UNSPECIFIED = "SOURCE_COLUMN_MATCH_UNSPECIFIED"

google/cloud/bigquery/external_config.py

@@ -514,7 +514,8 @@ def source_column_match(self) -> Optional[str]:
         See
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables#ExternalDataConfiguration.FIELDS.source_column_match
         """
-        return self._properties.get("sourceColumnMatch")
+        result = self._properties.get("sourceColumnMatch")
+        return typing.cast(str, result)
 
     @source_column_match.setter
     def source_column_match(self, value: Optional[str]):
@@ -904,7 +905,9 @@ def time_zone(self) -> Optional[str]:
         See:
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables#ExternalDataConfiguration.FIELDS.time_zone
         """
-        return self._properties.get("timeZone")
+
+        result = self._properties.get("timeZone")
+        return typing.cast(str, result)
 
     @time_zone.setter
     def time_zone(self, value: Optional[str]):
@@ -919,7 +922,8 @@ def date_format(self) -> Optional[str]:
         See:
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables#ExternalDataConfiguration.FIELDS.date_format
         """
-        return self._properties.get("dateFormat")
+        result = self._properties.get("dateFormat")
+        return typing.cast(str, result)
 
     @date_format.setter
     def date_format(self, value: Optional[str]):
@@ -934,7 +938,8 @@ def datetime_format(self) -> Optional[str]:
         See:
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables#ExternalDataConfiguration.FIELDS.datetime_format
         """
-        return self._properties.get("datetimeFormat")
+        result = self._properties.get("datetimeFormat")
+        return typing.cast(str, result)
 
     @datetime_format.setter
     def datetime_format(self, value: Optional[str]):
@@ -949,7 +954,8 @@ def time_format(self) -> Optional[str]:
         See:
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables#ExternalDataConfiguration.FIELDS.time_format
         """
-        return self._properties.get("timeFormat")
+        result = self._properties.get("timeFormat")
+        return typing.cast(str, result)
 
     @time_format.setter
     def time_format(self, value: Optional[str]):
@@ -964,7 +970,8 @@ def timestamp_format(self) -> Optional[str]:
         See:
         https://cloud.google.com/bigquery/docs/reference/rest/v2/tables#ExternalDataConfiguration.FIELDS.timestamp_format
         """
-        return self._properties.get("timestampFormat")
+        result = self._properties.get("timestampFormat")
+        return typing.cast(str, result)
 
     @timestamp_format.setter
     def timestamp_format(self, value: Optional[str]):

google/cloud/bigquery/job/load.py

@@ -655,9 +655,9 @@ def source_column_match(self) -> Optional[SourceColumnMatch]:
               reorders columns to match the field names in the schema.
 
         See:
-        https://cloud.google.com/bigquery/docs/reference/rest/v2/Job#JobConfigurationLoad.FIELDS.source_column_match_strategy
+        https://cloud.google.com/bigquery/docs/reference/rest/v2/Job#JobConfigurationLoad.FIELDS.source_column_match
         """
-        value = self._get_sub_prop("sourceColumnMatchStrategy")
+        value = self._get_sub_prop("sourceColumnMatch")
         if value is not None:
             return SourceColumnMatch(value)
         return None
@@ -668,7 +668,7 @@ def source_column_match(self, value: Optional[SourceColumnMatch]):
             raise TypeError(
                 "value must be a google.cloud.bigquery.enums.SourceColumnMatch or None"
             )
-        self._set_sub_prop("sourceColumnMatchStrategy", value.value if value else None)
+        self._set_sub_prop("sourceColumnMatch", value.value if value else None)
 
     @property
     def time_partitioning(self):
@@ -1054,11 +1054,11 @@ def null_markers(self):
         return self.configuration.null_markers
 
     @property
-    def source_column_match_strategy(self):
+    def source_column_match(self):
         """See
-        :attr:`google.cloud.bigquery.job.LoadJobConfig.source_column_match_strategy`.
+        :attr:`google.cloud.bigquery.job.LoadJobConfig.source_column_match`.
         """
-        return self.configuration.source_column_match_strategy
+        return self.configuration.source_column_match
 
     @property
     def schema_update_options(self):

tests/unit/job/test_load.py

@@ -815,6 +815,7 @@ def test_reload_w_bound_client(self):
             query_params={"projection": "full"},
             timeout=DEFAULT_GET_JOB_TIMEOUT,
         )
+        print(f"DINOSAUR:\n{job}\n{RESOURCE}")
         self._verifyResourceProperties(job, RESOURCE)
 
     def test_reload_w_alternate_client(self):

tests/unit/test_external_config.py

@@ -264,7 +264,7 @@ def test_to_api_repr_hive_partitioning(self):
         self.assertEqual(got_resource, expected_resource)
 
     NULL_MARKERS = ["", "N/A"]
-    SOURCE_COLUMN_NAME_MATCH_OPTION = "NAME"
+    SOURCE_COLUMN_MATCH = "NAME"
 
     def test_from_api_repr_csv(self):
         resource = _copy_and_update(
@@ -280,7 +280,7 @@ def test_from_api_repr_csv(self):
                     "encoding": "encoding",
                     "preserveAsciiControlCharacters": False,
                     "nullMarkers": self.NULL_MARKERS,
-                    "sourceColumnMatch": self.SOURCE_COLUMN_NAME_MATCH_OPTION,
+                    "sourceColumnMatch": self.SOURCE_COLUMN_MATCH,
                 },
             },
         )
@@ -299,8 +299,8 @@ def test_from_api_repr_csv(self):
         self.assertEqual(ec.options.preserve_ascii_control_characters, False)
         self.assertEqual(ec.options.null_markers, self.NULL_MARKERS)
         self.assertEqual(
-            ec.options.source_column_name_match_option,
-            self.SOURCE_COLUMN_NAME_MATCH_OPTION,
+            ec.options.source_column_match,
+            self.SOURCE_COLUMN_MATCH,
         )
 
         got_resource = ec.to_api_repr()
@@ -324,9 +324,7 @@ def test_to_api_repr_csv(self):
         options.allow_jagged_rows = False
         options.preserve_ascii_control_characters = False
         options.null_markers = self.NULL_MARKERS
-        options.source_column_name_match_option = (
-            self.SOURCE_COLUMN_NAME_MATCH_OPTION
-        )
+        options.source_column_match = self.SOURCE_COLUMN_MATCH
         ec.csv_options = options
 
         exp_resource = {
@@ -340,7 +338,7 @@ def test_to_api_repr_csv(self):
                 "encoding": "encoding",
                 "preserveAsciiControlCharacters": False,
                 "nullMarkers": self.NULL_MARKERS,
-                "sourceColumnMatch": self.SOURCE_COLUMN_NAME_MATCH_OPTION,
+                "sourceColumnMatch": self.SOURCE_COLUMN_MATCH,
             },
         }
 
@@ -903,7 +901,7 @@ def test_to_api_repr(self):
         options.encoding = "UTF-8"
         options.preserve_ascii_control_characters = False
         options.null_markers = ["NA"]
-        options.source_column_name_match_option = "POSITION"
+        options.source_column_match = "POSITION"
 
         resource = options.to_api_repr()