Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit048caf8

Browse files
committed
Fix assignment to array of domain over composite, redux.
Commit3e310d8 taught isAssignmentIndirectionExpr() to look throughCoerceToDomain nodes. That's not sufficient, because since commit04fe805 it's been possible for the planner to simplifyCoerceToDomain to RelabelType when the domain has no constraintsto enforce. So we need to look through RelabelType too.Per bug #17897 from Alexander Lakhin. Although3e310d8 wasback-patched to v11, it seems sufficient to apply this changeto v12 and later, since04fe805 came in in v12.Dmitry DolgovDiscussion:https://postgr.es/m/17897-4216c546c3874044@postgresql.org
1 parente76fbcf commit048caf8

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

‎src/backend/executor/execExpr.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2839,8 +2839,8 @@ ExecInitSubscriptingRef(ExprEvalStep *scratch, SubscriptingRef *sbsref,
28392839
* trees in which each level of assignment has its own CaseTestExpr, and the
28402840
* recursive structure appears within the newvals or refassgnexpr field.
28412841
* There is an exception, though: if the array is an array-of-domain, we will
2842-
* have a CoerceToDomain as the refassgnexpr, and we need to be able to look
2843-
* through that.
2842+
* have a CoerceToDomainor RelabelTypeas the refassgnexpr, and we need to
2843+
*be able to lookthrough that.
28442844
*/
28452845
staticbool
28462846
isAssignmentIndirectionExpr(Expr*expr)
@@ -2867,6 +2867,12 @@ isAssignmentIndirectionExpr(Expr *expr)
28672867

28682868
returnisAssignmentIndirectionExpr(cd->arg);
28692869
}
2870+
elseif (IsA(expr,RelabelType))
2871+
{
2872+
RelabelType*r= (RelabelType*)expr;
2873+
2874+
returnisAssignmentIndirectionExpr(r->arg);
2875+
}
28702876
return false;
28712877
}
28722878

‎src/test/regress/expected/domain.out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,15 @@ table dcomptable;
562562
{"(1,5)"}
563563
(1 row)
564564

565+
-- if there's no constraints, a different code path is taken:
566+
alter domain dcomptype drop constraint dcomptype_check;
567+
update dcomptable set f1[1].cf1 = -1; -- now ok
568+
table dcomptable;
569+
f1
570+
------------
571+
{"(-1,5)"}
572+
(1 row)
573+
565574
drop table dcomptable;
566575
drop type comptype cascade;
567576
NOTICE: drop cascades to type dcomptype

‎src/test/regress/sql/domain.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,10 @@ table dcomptable;
289289
update dcomptableset f1[1].cf1=-1;-- fail
290290
update dcomptableset f1[1].cf1=1;
291291
table dcomptable;
292+
-- if there's no constraints, a different code path is taken:
293+
alterdomain dcomptype dropconstraint dcomptype_check;
294+
update dcomptableset f1[1].cf1=-1;-- now ok
295+
table dcomptable;
292296

293297
droptable dcomptable;
294298
droptype comptype cascade;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp