Commit4262926

committed

Fix problem with whole-row Vars referencing sub-select outputs, per

example from Jim Dew. Add some simple regression tests, since this isan area we seem to break regularly :-(

1 parentf82e2ba commit4262926Copy full SHA for 4262926

File tree

+29

-2

lines changed

+29

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.185 2005/11/22 18:17:10 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.186 2005/12/14 16:28:32 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -523,7 +523,7 @@ ExecEvalWholeRowVar(ExprState exprstate, ExprContext econtext,`
`523`	`523`	`Assert(variable->varno!=OUTER);`
`524`	`524`	`slot=econtext->ecxt_scantuple;`
`525`	`525`
`526`		`-tuple=slot->tts_tuple;`
	`526`	`+tuple=ExecFetchSlotTuple(slot);`
`527`	`527`	`tupleDesc=slot->tts_tupleDescriptor;`
`528`	`528`
`529`	`529`	`/*`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -431,3 +431,24 @@ SELECT p.name, p.age FROM person* p ORDER BY age using >, name;`
`431`	`431`	`mary \| 8`
`432`	`432`	`(58 rows)`
`433`	`433`
	`434`	`+--`
	`435`	`+-- Test some cases involving whole-row Var referencing a subquery`
	`436`	`+--`
	`437`	`+select foo from (select 1) as foo;`
	`438`	`+ foo`
	`439`	`+-----`
	`440`	`+ (1)`
	`441`	`+(1 row)`
	`442`	`+`
	`443`	`+select foo from (select null) as foo;`
	`444`	`+ foo`
	`445`	`+-----`
	`446`	`+ ()`
	`447`	`+(1 row)`
	`448`	`+`
	`449`	`+select foo from (select 'xyzzy',1,null) as foo;`
	`450`	`+ foo`
	`451`	`+------------`
	`452`	`+ (xyzzy,1,)`
	`453`	`+(1 row)`
	`454`	`+`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,3 +104,9 @@ SELECT p.name, p.age FROM person* p;`
`104`	`104`	`--`
`105`	`105`	`SELECTp.name,p.ageFROM person* pORDER BY age using>, name;`
`106`	`106`
	`107`	`+--`
	`108`	`+-- Test some cases involving whole-row Var referencing a subquery`
	`109`	`+--`
	`110`	`+select foofrom (select1)as foo;`
	`111`	`+select foofrom (selectnull)as foo;`
	`112`	`+select foofrom (select'xyzzy',1,null)as foo;`

Comments

(0)