Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 94131cd

Browse files
committed
Avoid assertion failure if a setop leaf query contains setops.
Ordinarily transformSetOperationTree will collect all UNION/ INTERSECT/EXCEPT steps into the setOperations tree of the topmost Query, so that leaf queries do not contain any setOperations. However, it cannot thus flatten a subquery that also contains WITH, ORDER BY, FOR UPDATE, or LIMIT. I (tgl) forgot that in commit 07b4c48 and wrote an assertion in rule deparsing that a leaf's setOperations would always be empty. If it were nonempty then we would want to parenthesize the subquery to ensure that the output represents the setop nesting correctly (e.g. UNION below INTERSECT had better get parenthesized). So rather than just removing the faulty Assert, let's change it into an additional case to check to decide whether to add parens. We don't expect that the additional case will ever fire, but it's cheap insurance. Man Zeng and Tom Lane Discussion: https://postgr.es/m/tencent_7ABF9B1F23B0C77606FC5FE3@qq.com
1 parent 6c8f670 commit 94131cd

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/backend/utils/adt/ruleutils.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6353,13 +6353,19 @@ get_setop_query(Node *setOp, Query *query, deparse_context *context)
63536353
Query *subquery = rte->subquery;
63546354

63556355
Assert(subquery != NULL);
6356-
Assert(subquery->setOperations == NULL);
6357-
/* Need parens if WITH, ORDER BY, FOR UPDATE, or LIMIT; see gram.y */
6356+
6357+
/*
6358+
* We need parens if WITH, ORDER BY, FOR UPDATE, or LIMIT; see gram.y.
6359+
* Also add parens if the leaf query contains its own set operations.
6360+
* (That shouldn't happen unless one of the other clauses is also
6361+
* present, see transformSetOperationTree; but let's be safe.)
6362+
*/
63586363
need_paren = (subquery->cteList ||
63596364
subquery->sortClause ||
63606365
subquery->rowMarks ||
63616366
subquery->limitOffset ||
6362-
subquery->limitCount);
6367+
subquery->limitCount ||
6368+
subquery->setOperations);
63636369
if (need_paren)
63646370
appendStringInfoChar(buf, '(');
63656371
get_query_def(subquery, buf, context->namespaces,

0 commit comments

Comments
 (0)