mirror of
https://github.com/postgres/postgres.git
synced 2025-07-31 22:04:40 +03:00
Fix markTargetListOrigin() to not fail on a simple-Var reference to a
recursive CTE that we're still in progress of analyzing. Add a similar guard to the similar code in expandRecordVariable(), and tweak regression tests to cover this case. Per report from Dickson S. Guedes.
This commit is contained in:
@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.165 2008/10/04 21:56:54 tgl Exp $
|
* $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.166 2008/10/05 22:20:16 tgl Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -297,8 +297,16 @@ markTargetListOrigin(ParseState *pstate, TargetEntry *tle,
|
|||||||
/* not a simple relation, leave it unmarked */
|
/* not a simple relation, leave it unmarked */
|
||||||
break;
|
break;
|
||||||
case RTE_CTE:
|
case RTE_CTE:
|
||||||
/* CTE reference: copy up from the subquery */
|
/*
|
||||||
if (attnum != InvalidAttrNumber)
|
* CTE reference: copy up from the subquery, if possible.
|
||||||
|
* If the RTE is a recursive self-reference then we can't do
|
||||||
|
* anything because we haven't finished analyzing it yet.
|
||||||
|
* However, it's no big loss because we must be down inside
|
||||||
|
* the recursive term of a recursive CTE, and so any markings
|
||||||
|
* on the current targetlist are not going to affect the results
|
||||||
|
* anyway.
|
||||||
|
*/
|
||||||
|
if (attnum != InvalidAttrNumber && !rte->self_reference)
|
||||||
{
|
{
|
||||||
CommonTableExpr *cte = GetCTEForRTE(pstate, rte);
|
CommonTableExpr *cte = GetCTEForRTE(pstate, rte);
|
||||||
TargetEntry *ste;
|
TargetEntry *ste;
|
||||||
@ -1195,8 +1203,9 @@ expandRecordVariable(ParseState *pstate, Var *var, int levelsup)
|
|||||||
*/
|
*/
|
||||||
break;
|
break;
|
||||||
case RTE_CTE:
|
case RTE_CTE:
|
||||||
|
/* CTE reference: examine subquery's output expr */
|
||||||
|
if (!rte->self_reference)
|
||||||
{
|
{
|
||||||
/* CTE reference: examine subquery's output expr */
|
|
||||||
CommonTableExpr *cte = GetCTEForRTE(pstate, rte);
|
CommonTableExpr *cte = GetCTEForRTE(pstate, rte);
|
||||||
TargetEntry *ste;
|
TargetEntry *ste;
|
||||||
|
|
||||||
|
@ -96,20 +96,20 @@ INSERT INTO department VALUES (7, 5, 'G');
|
|||||||
WITH RECURSIVE subdepartment AS
|
WITH RECURSIVE subdepartment AS
|
||||||
(
|
(
|
||||||
-- non recursive term
|
-- non recursive term
|
||||||
SELECT * FROM department WHERE name = 'A'
|
SELECT name as root_name, * FROM department WHERE name = 'A'
|
||||||
UNION ALL
|
UNION ALL
|
||||||
-- recursive term
|
-- recursive term
|
||||||
SELECT d.* FROM department AS d, subdepartment AS sd
|
SELECT sd.root_name, d.* FROM department AS d, subdepartment AS sd
|
||||||
WHERE d.parent_department = sd.id
|
WHERE d.parent_department = sd.id
|
||||||
)
|
)
|
||||||
SELECT * FROM subdepartment ORDER BY name;
|
SELECT * FROM subdepartment ORDER BY name;
|
||||||
id | parent_department | name
|
root_name | id | parent_department | name
|
||||||
----+-------------------+------
|
-----------+----+-------------------+------
|
||||||
1 | 0 | A
|
A | 1 | 0 | A
|
||||||
2 | 1 | B
|
A | 2 | 1 | B
|
||||||
3 | 2 | C
|
A | 3 | 2 | C
|
||||||
4 | 2 | D
|
A | 4 | 2 | D
|
||||||
6 | 4 | F
|
A | 6 | 4 | F
|
||||||
(5 rows)
|
(5 rows)
|
||||||
|
|
||||||
-- extract all departments under 'A' with "level" number
|
-- extract all departments under 'A' with "level" number
|
||||||
|
@ -68,12 +68,12 @@ INSERT INTO department VALUES (7, 5, 'G');
|
|||||||
WITH RECURSIVE subdepartment AS
|
WITH RECURSIVE subdepartment AS
|
||||||
(
|
(
|
||||||
-- non recursive term
|
-- non recursive term
|
||||||
SELECT * FROM department WHERE name = 'A'
|
SELECT name as root_name, * FROM department WHERE name = 'A'
|
||||||
|
|
||||||
UNION ALL
|
UNION ALL
|
||||||
|
|
||||||
-- recursive term
|
-- recursive term
|
||||||
SELECT d.* FROM department AS d, subdepartment AS sd
|
SELECT sd.root_name, d.* FROM department AS d, subdepartment AS sd
|
||||||
WHERE d.parent_department = sd.id
|
WHERE d.parent_department = sd.id
|
||||||
)
|
)
|
||||||
SELECT * FROM subdepartment ORDER BY name;
|
SELECT * FROM subdepartment ORDER BY name;
|
||||||
|
Reference in New Issue
Block a user