Skip to content

Commit c5e3c64

Browse files
committed
Fix BigQuery schema update options formatting
1 parent 6846d69 commit c5e3c64

2 files changed

Lines changed: 20 additions & 23 deletions

File tree

sdks/python/apache_beam/io/gcp/bigquery.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,8 @@ def chain_after(result):
487487
_SCHEMA_UPDATE_OPTIONS = 'schemaUpdateOptions'
488488

489489

490-
def _merge_schema_update_options(additional_bq_parameters,
491-
schema_update_options):
490+
def _merge_schema_update_options(
491+
additional_bq_parameters, schema_update_options):
492492
additional_bq_parameters = dict(additional_bq_parameters or {})
493493
if _SCHEMA_UPDATE_OPTIONS in additional_bq_parameters:
494494
raise ValueError(

sdks/python/apache_beam/io/gcp/bigquery_test.py

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,14 +1038,13 @@ def test_schema_update_options_added_to_file_load_parameters(self):
10381038
additional_bq_parameters=additional_bq_parameters,
10391039
schema_update_options=schema_update_options)
10401040

1041-
self.assertEqual(
1042-
{
1043-
'timePartitioning': {
1044-
'type': 'DAY'
1045-
},
1046-
'schemaUpdateOptions': schema_update_options,
1041+
self.assertEqual({
1042+
'timePartitioning': {
1043+
'type': 'DAY'
10471044
},
1048-
transform._additional_bq_parameters_for_file_loads())
1045+
'schemaUpdateOptions': schema_update_options,
1046+
},
1047+
transform._additional_bq_parameters_for_file_loads())
10491048
self.assertNotIn('schemaUpdateOptions', additional_bq_parameters)
10501049

10511050
def test_schema_update_options_keeps_additional_bq_parameters_path(self):
@@ -1095,14 +1094,13 @@ def additional_bq_parameters(destination):
10951094
schema_update_options=schema_update_options)
10961095

10971096
additional_parameters = transform._additional_bq_parameters_for_file_loads()
1098-
self.assertEqual(
1099-
{
1100-
'clustering': {
1101-
'fields': ['columnA']
1102-
},
1103-
'schemaUpdateOptions': schema_update_options,
1097+
self.assertEqual({
1098+
'clustering': {
1099+
'fields': ['columnA']
11041100
},
1105-
additional_parameters('project:dataset.table'))
1101+
'schemaUpdateOptions': schema_update_options,
1102+
},
1103+
additional_parameters('project:dataset.table'))
11061104

11071105
def test_schema_update_options_with_value_provider_parameters(self):
11081106
schema_update_options = [
@@ -1118,14 +1116,13 @@ def test_schema_update_options_with_value_provider_parameters(self):
11181116
schema_update_options=schema_update_options)
11191117

11201118
additional_parameters = transform._additional_bq_parameters_for_file_loads()
1121-
self.assertEqual(
1122-
{
1123-
'timePartitioning': {
1124-
'type': 'DAY'
1125-
},
1126-
'schemaUpdateOptions': schema_update_options,
1119+
self.assertEqual({
1120+
'timePartitioning': {
1121+
'type': 'DAY'
11271122
},
1128-
additional_parameters('project:dataset.table'))
1123+
'schemaUpdateOptions': schema_update_options,
1124+
},
1125+
additional_parameters('project:dataset.table'))
11291126

11301127
def test_schema_update_options_only_supported_for_file_loads(self):
11311128
p = TestPipeline()

0 commit comments

Comments
 (0)