NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit888b565

committed

Fix *-qualification of named parameters in SQL-language functions.

Given a composite-type parameter named x, "$1.*" worked fine, but "x.*"not so much. This has been broken since named parameter references wereadded in commit9bff078, so patch backto 9.2. Per bug #9085 from Hardy Falk.

1 parentc077029 commit888b565Copy full SHA for 888b565

File tree

3 files changed

+83

-0

lines changed

src
- backend/executor
  - functions.c
- test/regress
  - expected
    - rowtypes.out
  - sql
    - rowtypes.sql

3 files changed

+83

-0

lines changed

`‎src/backend/executor/functions.c‎`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -309,13 +309,21 @@ sql_fn_post_column_ref(ParseState pstate, ColumnRef cref, Node *var)`
`309`	`309`	`*(the first possibility takes precedence)`
`310`	`310`	`* A.B.CA = function name, B = record-typed parameter name,`
`311`	`311`	`*C = field name`
	`312`	`+ * A.*Whole-row reference to composite parameter A.`
	`313`	`+ * A.B.*Same, with A = function name, B = parameter name`
	`314`	`+ *`
	`315`	`+ * Here, it's sufficient to ignore the "*" in the last two cases --- the`
	`316`	`+ * main parser will take care of expanding the whole-row reference.`
`312`	`317`	`*----------`
`313`	`318`	`*/`
`314`	`319`	`nnames=list_length(cref->fields);`
`315`	`320`
`316`	`321`	`if (nnames>3)`
`317`	`322`	`returnNULL;`
`318`	`323`
	`324`	`+if (IsA(llast(cref->fields),A_Star))`
	`325`	`+nnames--;`
	`326`	`+`
`319`	`327`	`field1= (Node*)linitial(cref->fields);`
`320`	`328`	`Assert(IsA(field1,String));`
`321`	`329`	`name1=strVal(field1);`

`‎src/test/regress/expected/rowtypes.out‎`

Lines changed: 47 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -383,6 +383,53 @@ select * from price;`
`383`	`383`	`(3 rows)`
`384`	`384`
`385`	`385`	`rollback;`
	`386`	`+--`
	`387`	`+-- Test case derived from bug #9085: check * qualification of composite`
	`388`	`+-- parameters for SQL functions`
	`389`	`+--`
	`390`	`+create temp table compos (f1 int, f2 text);`
	`391`	`+create function fcompos1(v compos) returns void as $$`
	`392`	`+insert into compos values (v); -- fail`
	`393`	`+$$ language sql;`
	`394`	`+ERROR: column "f1" is of type integer but expression is of type compos`
	`395`	`+LINE 2: insert into compos values (v); -- fail`
	`396`	`+ ^`
	`397`	`+HINT: You will need to rewrite or cast the expression.`
	`398`	`+create function fcompos1(v compos) returns void as $$`
	`399`	`+insert into compos values (v.*);`
	`400`	`+$$ language sql;`
	`401`	`+create function fcompos2(v compos) returns void as $$`
	`402`	`+select fcompos1(v);`
	`403`	`+$$ language sql;`
	`404`	`+create function fcompos3(v compos) returns void as $$`
	`405`	`+select fcompos1(fcompos3.v.*);`
	`406`	`+$$ language sql;`
	`407`	`+select fcompos1(row(1,'one'));`
	`408`	`+ fcompos1`
	`409`	`+----------`
	`410`	`+`
	`411`	`+(1 row)`
	`412`	`+`
	`413`	`+select fcompos2(row(2,'two'));`
	`414`	`+ fcompos2`
	`415`	`+----------`
	`416`	`+`
	`417`	`+(1 row)`
	`418`	`+`
	`419`	`+select fcompos3(row(3,'three'));`
	`420`	`+ fcompos3`
	`421`	`+----------`
	`422`	`+`
	`423`	`+(1 row)`
	`424`	`+`
	`425`	`+select * from compos;`
	`426`	`+ f1 \| f2`
	`427`	`+----+-------`
	`428`	`+ 1 \| one`
	`429`	`+ 2 \| two`
	`430`	`+ 3 \| three`
	`431`	`+(3 rows)`
	`432`	`+`
`386`	`433`	`--`
`387`	`434`	`-- We allow I/O conversion casts from composite types to strings to be`
`388`	`435`	`-- invoked via cast syntax, but not functional syntax. This is because`

`‎src/test/regress/sql/rowtypes.sql‎`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,34 @@ select * from price;`
`185`	`185`
`186`	`186`	`rollback;`
`187`	`187`
	`188`	`+--`
	`189`	`+-- Test case derived from bug #9085: check * qualification of composite`
	`190`	`+-- parameters for SQL functions`
	`191`	`+--`
	`192`	`+`
	`193`	`+create temp table compos (f1int, f2text);`
	`194`	`+`
	`195`	`+createfunctionfcompos1(v compos) returns voidas $$`
	`196`	`+insert into composvalues (v);-- fail`
	`197`	`+$$ language sql;`
	`198`	`+`
	`199`	`+createfunctionfcompos1(v compos) returns voidas $$`
	`200`	`+insert into composvalues (v.*);`
	`201`	`+$$ language sql;`
	`202`	`+`
	`203`	`+createfunctionfcompos2(v compos) returns voidas $$`
	`204`	`+select fcompos1(v);`
	`205`	`+$$ language sql;`
	`206`	`+`
	`207`	`+createfunctionfcompos3(v compos) returns voidas $$`
	`208`	`+select fcompos1(fcompos3.v.*);`
	`209`	`+$$ language sql;`
	`210`	`+`
	`211`	`+select fcompos1(row(1,'one'));`
	`212`	`+select fcompos2(row(2,'two'));`
	`213`	`+select fcompos3(row(3,'three'));`
	`214`	`+select*from compos;`
	`215`	`+`
`188`	`216`	`--`
`189`	`217`	`-- We allow I/O conversion casts from composite types to strings to be`
`190`	`218`	`-- invoked via cast syntax, but not functional syntax. This is because`

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!

Commit888b565

File tree

3 files changed

3 files changed

`‎src/backend/executor/functions.c‎`

`‎src/test/regress/expected/rowtypes.out‎`

`‎src/test/regress/sql/rowtypes.sql‎`

0 commit comments