Commit02a7d12

and

authored

feat: support JSON type ininsert_rows and as a scalar query parameter (#1757)

Co-authored-by: Kira <kirnendra@google.com>

1 parentb9c8be0 commit02a7d12Copy full SHA for 02a7d12

File tree

+42

-2

lines changed

+42

-2

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -374,6 +374,13 @@ def _bytes_to_json(value):`
`374`	`374`	`returnvalue`
`375`	`375`
`376`	`376`
	`377`	`+def_json_to_json(value):`
	`378`	`+"""Coerce 'value' to a BigQuery REST API representation."""`
	`379`	`+ifvalueisNone:`
	`380`	`+returnNone`
	`381`	`+returnjson.dumps(value)`
	`382`	`+`
	`383`	`+`
`377`	`384`	`def_timestamp_to_json_parameter(value):`
`378`	`385`	`"""Coerce 'value' to an JSON-compatible representation.`
`379`	`386`
`@@ -439,7 +446,7 @@ def _time_to_json(value):`
`439`	`446`	`"DATETIME":_datetime_to_json,`
`440`	`447`	`"DATE":_date_to_json,`
`441`	`448`	`"TIME":_time_to_json,`
`442`		`-"JSON":_json_from_json,`
	`449`	`+"JSON":_json_to_json,`
`443`	`450`	`# Make sure DECIMAL and BIGDECIMAL are handled, even though`
`444`	`451`	`# requests for them should be converted to NUMERIC. Better safe`
`445`	`452`	`# than sorry.`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2049,13 +2049,18 @@ def test_insert_rows_nested_nested(self):`
`2049`	`2049`	`),`
`2050`	`2050`	`],`
`2051`	`2051`	`),`
	`2052`	`+SF("json_col","JSON"),`
`2052`	`2053`	`]`
`2053`	`2054`	`record= {`
`2054`	`2055`	`"nested_string":"another string value",`
`2055`	`2056`	`"nested_repeated": [0,1,2],`
`2056`	`2057`	`"nested_record": {"nested_nested_string":"some deep insight"},`
`2057`	`2058`	`}`
`2058`		`-to_insert= [("Some value",record)]`
	`2059`	`+json_record= {`
	`2060`	`+"json_array": [1,2,3],`
	`2061`	`+"json_object": {"alpha":"abc","num":123},`
	`2062`	`+ }`
	`2063`	`+to_insert= [("Some value",record,json_record)]`
`2059`	`2064`	`table_id="test_table"`
`2060`	`2065`	`dataset=self.temp_dataset(_make_dataset_id("issue_2951"))`
`2061`	`2066`	`table_arg=Table(dataset.table(table_id),schema=schema)`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,18 @@ def test_query_statistics(bigquery_client, query_api_method):`
`256`	`256`	`)`
`257`	`257`	`],`
`258`	`258`	`),`
	`259`	`+pytest.param(`
	`260`	`+"SELECT @json",`
	`261`	`+ {"alpha":"abc","num": [1,2,3]},`
	`262`	`+ [`
	`263`	`+ScalarQueryParameter(`
	`264`	`+name="json",`
	`265`	`+type_="JSON",`
	`266`	`+value={"alpha":"abc","num": [1,2,3]},`
	`267`	`+ )`
	`268`	`+ ],`
	`269`	`+id="scalar-json",`
	`270`	`+ ),`
`259`	`271`	`(`
`260`	`272`	`"SELECT @naive_time",`
`261`	`273`	`datetime.time(12,41,9,62500),`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -886,6 +886,16 @@ def test_w_known_field_type(self):`
`886`	`886`	`converted=self._call_fut(field,original)`
`887`	`887`	`self.assertEqual(converted,str(original))`
`888`	`888`
	`889`	`+deftest_w_scalar_none(self):`
	`890`	`+importgoogle.cloud.bigquery._helpersasmodule_under_test`
	`891`	`+`
	`892`	`+scalar_types=module_under_test._SCALAR_VALUE_TO_JSON_ROW.keys()`
	`893`	`+fortype_inscalar_types:`
	`894`	`+field=_make_field(type_)`
	`895`	`+original=None`
	`896`	`+converted=self._call_fut(field,original)`
	`897`	`+self.assertIsNone(converted,msg=f"{type_} did not return None")`
	`898`	`+`
`889`	`899`
`890`	`900`	`classTest_single_field_to_json(unittest.TestCase):`
`891`	`901`	`def_call_fut(self,field,value):`
`@@ -921,6 +931,12 @@ def test_w_scalar_ignores_mode(self):`
`921`	`931`	`converted=self._call_fut(field,original)`
`922`	`932`	`self.assertEqual(converted,original)`
`923`	`933`
	`934`	`+deftest_w_scalar_json(self):`
	`935`	`+field=_make_field("JSON")`
	`936`	`+original= {"alpha":"abc","num": [1,2,3]}`
	`937`	`+converted=self._call_fut(field,original)`
	`938`	`+self.assertEqual(converted,json.dumps(original))`
	`939`	`+`
`924`	`940`
`925`	`941`	`classTest_repeated_field_to_json(unittest.TestCase):`
`926`	`942`	`def_call_fut(self,field,value):`

Comments

(0)