aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2010-11-12 15:14:51 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2010-11-12 15:17:30 -0500
commitd7304244e26b92d533f7e44f0afbcf1ff2f46286 (patch)
treed9fae8de48d93d2fd1664226e5358047d5adf2f5
parent19e231bbdaef792dce22100012b504e2fb72f971 (diff)
downloadpostgresql-d7304244e26b92d533f7e44f0afbcf1ff2f46286.tar.gz
postgresql-d7304244e26b92d533f7e44f0afbcf1ff2f46286.zip
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.
-rw-r--r--src/backend/optimizer/util/clauses.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index e948bccc1a2..de2e66b0f16 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -2746,7 +2746,9 @@ eval_const_expressions_mutator(Node *node,
/*
* We can remove null constants from the list. For a non-null
* 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))
{
@@ -2754,6 +2756,8 @@ eval_const_expressions_mutator(Node *node,
continue; /* drop null constant */
if (newargs == NIL)
return e; /* first expr */
+ newargs = lappend(newargs, e);
+ break;
}
newargs = lappend(newargs, e);
}