Fix old oversight in const-simplification of COALESCE() expressions.
Once we have found a non-null constant argument, there is no need to examine additional arguments of the COALESCE. The previous coding got it right only if the constant was in the first argument position; otherwise it tried to simplify following arguments too, leading to unexpected behavior like this: regression=# select coalesce(f1, 42, 1/0) from int4_tbl; ERROR: division by zero It's a minor corner case, but a bug is a bug, so back-patch all the way.
This commit is contained in:
parent
d434e8f6ad
commit
5c85d1122b
@ -2733,7 +2733,9 @@ eval_const_expressions_mutator(Node *node,
|
|||||||
/*
|
/*
|
||||||
* We can remove null constants from the list. For a non-null
|
* We can remove null constants from the list. For a non-null
|
||||||
* constant, if it has not been preceded by any other
|
* constant, if it has not been preceded by any other
|
||||||
* non-null-constant expressions then that is the result.
|
* non-null-constant expressions then it is the result. Otherwise,
|
||||||
|
* it's the next argument, but we can drop following arguments
|
||||||
|
* since they will never be reached.
|
||||||
*/
|
*/
|
||||||
if (IsA(e, Const))
|
if (IsA(e, Const))
|
||||||
{
|
{
|
||||||
@ -2741,6 +2743,8 @@ eval_const_expressions_mutator(Node *node,
|
|||||||
continue; /* drop null constant */
|
continue; /* drop null constant */
|
||||||
if (newargs == NIL)
|
if (newargs == NIL)
|
||||||
return e; /* first expr */
|
return e; /* first expr */
|
||||||
|
newargs = lappend(newargs, e);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
newargs = lappend(newargs, e);
|
newargs = lappend(newargs, e);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user