NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4d02eb0

committed

Fix collation exposed for scalar function in FROM.

One code path in addRangeTableEntryForFunction() neglected to assigna collation to the tupdesc entry it constructs (which is a bit oddconsidering the other path did do so). This didn't matter before commit5815696, because nothing would look at the type data in this tupdesc;but now it does.While at it, make sure we assign the correct typmod as well. Mostfunction expressions don't have a determinate typmod, but some do.Per buildfarm, which showed failures in non-C collations, a caseI'd not thought to test for this patch :-(

1 parent5815696 commit4d02eb0Copy full SHA for 4d02eb0

File tree

1 file changed

-1

lines changed

src/backend/parser
- parse_relation.c

1 file changed

-1

lines changed

`‎src/backend/parser/parse_relation.c`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1781,8 +1781,11 @@ addRangeTableEntryForFunction(ParseState *pstate,`
`1781`	`1781`	`chooseScalarFunctionAlias(funcexpr,funcname,`
`1782`	`1782`	`alias,nfuncs),`
`1783`	`1783`	`funcrettype,`
`1784`		`--1,`
	`1784`	`+exprTypmod(funcexpr),`
`1785`	`1785`	`0);`
	`1786`	`+TupleDescInitEntryCollation(tupdesc,`
	`1787`	`+(AttrNumber)1,`
	`1788`	`+exprCollation(funcexpr));`
`1786`	`1789`	`}`
`1787`	`1790`	`elseif (functypclass==TYPEFUNC_RECORD)`
`1788`	`1791`	`{`
`@@ -1882,12 +1885,15 @@ addRangeTableEntryForFunction(ParseState *pstate,`
`1882`	`1885`
`1883`	`1886`	`/* Add the ordinality column if needed */`
`1884`	`1887`	`if (rangefunc->ordinality)`
	`1888`	`+{`
`1885`	`1889`	`TupleDescInitEntry(tupdesc,`
`1886`	`1890`	`(AttrNumber)++natts,`
`1887`	`1891`	`"ordinality",`
`1888`	`1892`	`INT8OID,`
`1889`	`1893`	`-1,`
`1890`	`1894`	`0);`
	`1895`	`+/* no need to set collation */`
	`1896`	`+}`
`1891`	`1897`
`1892`	`1898`	`Assert(natts==totalatts);`
`1893`	`1899`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4d02eb0

File tree

1 file changed

1 file changed

`‎src/backend/parser/parse_relation.c`

0 commit comments