Commitfcb0bc6

Jim Fulton

authored

fix: underscores weren't allowed in struct field names when passing parameters to the DB API (#930)

1 parentbd417d3 commitfcb0bc6Copy full SHA for fcb0bc6

File tree

+10

-6

lines changed

+10

-6

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ def _extract_types(`
`494`	`494`	`([^:)]*) # name`
`495`	`495`	`(?:: # ':' introduces type`
`496`	`496`	`( # start of type group`
`497`		`- [a-zA-Z0-9<>, ]+ # First part, no parens`
	`497`	`+ [a-zA-Z0-9_<>, ]+ # First part, no parens`
`498`	`498`
`499`	`499`	`(?: # start sets of parens + non-paren text`
`500`	`500`	`$[0-9 ,]+$ # comma-separated groups of digits in parens`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -612,8 +612,8 @@ def test_complex_query_parameter_type_errors(type_, value, expect):`
`612`	`612`	`"parameters,parameter_types,expect",`
`613`	`613`	`[`
`614`	`614`	`(`
`615`		`- [[],dict(name="ch1",bdate=datetime.date(2021,1,1))],`
`616`		`- ["ARRAY<INT64>","struct<name string,bdate date>"],`
	`615`	`+ [[],dict(name="ch1",b_date=datetime.date(2021,1,1))],`
	`616`	`+ ["ARRAY<INT64>","struct<name string,b_date date>"],`
`617`	`617`	`[`
`618`	`618`	`{`
`619`	`619`	`"parameterType": {"arrayType": {"type":"INT64"},"type":"ARRAY"},`
`@@ -623,13 +623,13 @@ def test_complex_query_parameter_type_errors(type_, value, expect):`
`623`	`623`	`"parameterType": {`
`624`	`624`	`"structTypes": [`
`625`	`625`	`{"name":"name","type": {"type":"STRING"}},`
`626`		`- {"name":"bdate","type": {"type":"DATE"}},`
	`626`	`+ {"name":"b_date","type": {"type":"DATE"}},`
`627`	`627`	`],`
`628`	`628`	`"type":"STRUCT",`
`629`	`629`	`},`
`630`	`630`	`"parameterValue": {`
`631`	`631`	`"structValues": {`
`632`		`-"bdate": {"value":"2021-01-01"},`
	`632`	`+"b_date": {"value":"2021-01-01"},`
`633`	`633`	`"name": {"value":"ch1"},`
`634`	`634`	`}`
`635`	`635`	`},`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -809,6 +809,10 @@ def test__format_operation_no_placeholders(self):`
`809`	`809`	`"values(%%%%%(foo:INT64)s, %(bar)s)",`
`810`	`810`	`("values(%%%%%(foo)s, %(bar)s)",dict(foo="INT64")),`
`811`	`811`	`),`
	`812`	`+ (`
	`813`	`+"values(%%%%%(foo:struct<x_1 string, y_ int64>)s, %(bar)s)",`
	`814`	`+ ("values(%%%%%(foo)s, %(bar)s)",dict(foo="struct<x_1 string, y_ int64>")),`
	`815`	`+ ),`
`812`	`816`	`(`
`813`	`817`	`"values(%%%%%(foo:struct<x string, y int64>)s, %(bar)s)",`
`814`	`818`	`("values(%%%%%(foo)s, %(bar)s)",dict(foo="struct<x string, y int64>")),`

Comments

(0)