Fix collation of JSON_TABLE output columns

petere · petere · commit 21724558650a · 2022-06-10T06:05:08.000+02:00
The output columns of JSON_TABLE should have the collations of their data type. The existing implementation sets the default collation if the 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
diff --git a/src/backend/parser/parse_jsontable.c b/src/backend/parser/parse_jsontable.c
@@ -514,10 +514,7 @@ appendJsonTableColumns(JsonTableContext *cxt, List *columns)
 
 		tf->coltypes = lappend_oid(tf->coltypes, typid);
 		tf->coltypmods = lappend_int(tf->coltypmods, typmod);
-		tf->colcollations = lappend_oid(tf->colcollations,
-										type_is_collatable(typid)
-										? DEFAULT_COLLATION_OID
-										: InvalidOid);
+		tf->colcollations = lappend_oid(tf->colcollations, get_typcollation(typid));
 		tf->colvalexprs = lappend(tf->colvalexprs, colexpr);
 	}
 }

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`	`}`