Commit2172455

committed

Fix collation of JSON_TABLE output columns

The output columns of JSON_TABLE should have the collations of theirdata type. The existing implementation sets the default collation ifthe type is collatable.Reviewed-by: Andrew Dunstan <andrew@dunslane.net>Discussion:https://www.postgresql.org/message-id/flat/9d75ce67-0121-5050-5bec-bf5009db55ce%40enterprisedb.com

1 parent4a8a5dd commit2172455Copy full SHA for 2172455

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -514,10 +514,7 @@ appendJsonTableColumns(JsonTableContext cxt, List columns)`
`514`	`514`
`515`	`515`	`tf->coltypes=lappend_oid(tf->coltypes,typid);`
`516`	`516`	`tf->coltypmods=lappend_int(tf->coltypmods,typmod);`
`517`		`-tf->colcollations=lappend_oid(tf->colcollations,`
`518`		`-type_is_collatable(typid)`
`519`		`-?DEFAULT_COLLATION_OID`
`520`		`-:InvalidOid);`
	`517`	`+tf->colcollations=lappend_oid(tf->colcollations,get_typcollation(typid));`
`521`	`518`	`tf->colvalexprs=lappend(tf->colvalexprs,colexpr);`
`522`	`519`	`}`
`523`	`520`	`}`

Comments

(0)