mirror of
https://github.com/postgres/postgres.git
synced 2025-05-05 09:19:17 +03:00
Fix assignment to array of domain over composite, redux.
Commit 3e310d837 taught isAssignmentIndirectionExpr() to look through CoerceToDomain nodes. That's not sufficient, because since commit 04fe805a1 it's been possible for the planner to simplify CoerceToDomain to RelabelType when the domain has no constraints to enforce. So we need to look through RelabelType too. Per bug #17897 from Alexander Lakhin. Although 3e310d837 was back-patched to v11, it seems sufficient to apply this change to v12 and later, since 04fe805a1 came in in v12. Dmitry Dolgov Discussion: https://postgr.es/m/17897-4216c546c3874044@postgresql.org
This commit is contained in:
parent
e9884e9921
commit
9b104a27c7
@ -3132,8 +3132,8 @@ ExecInitSubscriptingRef(ExprEvalStep *scratch, SubscriptingRef *sbsref,
|
|||||||
* trees in which each level of assignment has its own CaseTestExpr, and the
|
* trees in which each level of assignment has its own CaseTestExpr, and the
|
||||||
* recursive structure appears within the newvals or refassgnexpr field.
|
* recursive structure appears within the newvals or refassgnexpr field.
|
||||||
* There is an exception, though: if the array is an array-of-domain, we will
|
* There is an exception, though: if the array is an array-of-domain, we will
|
||||||
* have a CoerceToDomain as the refassgnexpr, and we need to be able to look
|
* have a CoerceToDomain or RelabelType as the refassgnexpr, and we need to
|
||||||
* through that.
|
* be able to look through that.
|
||||||
*/
|
*/
|
||||||
static bool
|
static bool
|
||||||
isAssignmentIndirectionExpr(Expr *expr)
|
isAssignmentIndirectionExpr(Expr *expr)
|
||||||
@ -3160,6 +3160,12 @@ isAssignmentIndirectionExpr(Expr *expr)
|
|||||||
|
|
||||||
return isAssignmentIndirectionExpr(cd->arg);
|
return isAssignmentIndirectionExpr(cd->arg);
|
||||||
}
|
}
|
||||||
|
else if (IsA(expr, RelabelType))
|
||||||
|
{
|
||||||
|
RelabelType *r = (RelabelType *) expr;
|
||||||
|
|
||||||
|
return isAssignmentIndirectionExpr(r->arg);
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -556,6 +556,15 @@ table dcomptable;
|
|||||||
{"(1,5)"}
|
{"(1,5)"}
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
|
-- if there's no constraints, a different code path is taken:
|
||||||
|
alter domain dcomptype drop constraint dcomptype_check;
|
||||||
|
update dcomptable set f1[1].cf1 = -1; -- now ok
|
||||||
|
table dcomptable;
|
||||||
|
f1
|
||||||
|
------------
|
||||||
|
{"(-1,5)"}
|
||||||
|
(1 row)
|
||||||
|
|
||||||
drop table dcomptable;
|
drop table dcomptable;
|
||||||
drop type comptype cascade;
|
drop type comptype cascade;
|
||||||
NOTICE: drop cascades to type dcomptype
|
NOTICE: drop cascades to type dcomptype
|
||||||
|
@ -288,6 +288,10 @@ table dcomptable;
|
|||||||
update dcomptable set f1[1].cf1 = -1; -- fail
|
update dcomptable set f1[1].cf1 = -1; -- fail
|
||||||
update dcomptable set f1[1].cf1 = 1;
|
update dcomptable set f1[1].cf1 = 1;
|
||||||
table dcomptable;
|
table dcomptable;
|
||||||
|
-- if there's no constraints, a different code path is taken:
|
||||||
|
alter domain dcomptype drop constraint dcomptype_check;
|
||||||
|
update dcomptable set f1[1].cf1 = -1; -- now ok
|
||||||
|
table dcomptable;
|
||||||
|
|
||||||
drop table dcomptable;
|
drop table dcomptable;
|
||||||
drop type comptype cascade;
|
drop type comptype cascade;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user