Commitd1d2979

committed

Revert "Propagate CTE property flags when copying a CTE list into a rule."

This reverts commited29089 andequivalent back-branch commits. The issue is subtler than I thought,and it's far from new, so just before a release deadline is no timeto be fooling with it. We'll consider what to do at a bit moreleisure.Discussion:https://postgr.es/m/CAJcOf-fAdj=nDKMsRhQzndm-O13NY4dL6xGcEvdX5Xvbbi0V7g@mail.gmail.com

1 parent04fd3ee commitd1d2979Copy full SHA for d1d2979

File tree

-49

lines changed

-49

lines changed

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -536,9 +536,6 @@ rewriteRuleAction(Query *parsetree,`
`536`	`536`	`*`
`537`	`537`	`* This could possibly be fixed by using some sort of internally`
`538`	`538`	`* generated ID, instead of names, to link CTE RTEs to their CTEs.`
`539`		`- * However, decompiling the results would be quite confusing; note the`
`540`		`- * merge of hasRecursive flags below, which could change the apparent`
`541`		`- * semantics of such redundantly-named CTEs.`
`542`	`539`	`*/`
`543`	`540`	`foreach(lc,parsetree->cteList)`
`544`	`541`	`{`
`@@ -560,9 +557,6 @@ rewriteRuleAction(Query *parsetree,`
`560`	`557`	`/* OK, it's safe to combine the CTE lists */`
`561`	`558`	`sub_action->cteList=list_concat(sub_action->cteList,`
`562`	`559`	`copyObject(parsetree->cteList));`
`563`		`-/* ... and don't forget about the associated flags */`
`564`		`-sub_action->hasRecursive \|=parsetree->hasRecursive;`
`565`		`-sub_action->hasModifyingCTE \|=parsetree->hasModifyingCTE;`
`566`	`560`	`}`
`567`	`561`
`568`	`562`	`/*`

Lines changed: 0 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -2277,33 +2277,6 @@ SELECT * FROM bug6051_2;`
`2277`	`2277`	`3`
`2278`	`2278`	`(3 rows)`
`2279`	`2279`
`2280`		`--- silly example to verify that hasModifyingCTE flag is propagated`
`2281`		`-CREATE TEMP TABLE bug6051_3 AS`
`2282`		`- select a from generate_series(11,13) as a;`
`2283`		`-CREATE RULE bug6051_3_ins AS ON INSERT TO bug6051_3 DO INSTEAD`
`2284`		`- SELECT i FROM bug6051_2;`
`2285`		`-BEGIN; SET LOCAL force_parallel_mode = on;`
`2286`		`-WITH t1 AS ( DELETE FROM bug6051_3 RETURNING * )`
`2287`		`- INSERT INTO bug6051_3 SELECT * FROM t1;`
`2288`		`- i`
`2289`		`----`
`2290`		`- 1`
`2291`		`- 2`
`2292`		`- 3`
`2293`		`- 1`
`2294`		`- 2`
`2295`		`- 3`
`2296`		`- 1`
`2297`		`- 2`
`2298`		`- 3`
`2299`		`-(9 rows)`
`2300`		`-`
`2301`		`-COMMIT;`
`2302`		`-SELECT * FROM bug6051_3;`
`2303`		`- a`
`2304`		`----`
`2305`		`-(0 rows)`
`2306`		`-`
`2307`	`2280`	`-- a truly recursive CTE in the same list`
`2308`	`2281`	`WITH RECURSIVE t(a) AS (`
`2309`	`2282`	`SELECT 0`

Lines changed: 0 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -1070,22 +1070,6 @@ INSERT INTO bug6051 SELECT * FROM t1;`
`1070`	`1070`	`SELECT*FROM bug6051;`
`1071`	`1071`	`SELECT*FROM bug6051_2;`
`1072`	`1072`
`1073`		`--- silly example to verify that hasModifyingCTE flag is propagated`
`1074`		`-CREATE TEMP TABLE bug6051_3AS`
`1075`		`-select afrom generate_series(11,13)as a;`
`1076`		`-`
`1077`		`-CREATERULEbug6051_3_insASON INSERT TO bug6051_3 DO INSTEAD`
`1078`		`-SELECT iFROM bug6051_2;`
`1079`		`-`
`1080`		`-BEGIN;SET LOCAL force_parallel_mode=on;`
`1081`		`-`
`1082`		`-WITH t1AS (DELETEFROM bug6051_3 RETURNING* )`
`1083`		`-INSERT INTO bug6051_3SELECT*FROM t1;`
`1084`		`-`
`1085`		`-COMMIT;`
`1086`		`-`
`1087`		`-SELECT*FROM bug6051_3;`
`1088`		`-`
`1089`	`1073`	`-- a truly recursive CTE in the same list`
`1090`	`1074`	`WITH RECURSIVE t(a)AS (`
`1091`	`1075`	`SELECT0`

Comments

(0)