diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/float.c | 11 | ||||
| -rw-r--r-- | src/backend/utils/adt/numeric.c | 16 |
2 files changed, 17 insertions, 10 deletions
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index 3df08cc6a34..d19f9edb827 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.156 2008/05/09 15:36:06 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.157 2008/05/09 21:31:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1334,11 +1334,14 @@ dpow(PG_FUNCTION_ARGS) * certain error conditions. Specifically, we don't return a divide-by-zero * error code for 0 ^ -1. */ - if ((arg1 == 0 && arg2 < 0) || - (arg1 < 0 && floor(arg2) != arg2)) + if (arg1 == 0 && arg2 < 0) ereport(ERROR, (errcode(ERRCODE_INVALID_ARGUMENT_FOR_POWER_FUNCTION), - errmsg("invalid argument for power function"))); + errmsg("zero raised to a negative power is undefined"))); + if (arg1 < 0 && floor(arg2) != arg2) + ereport(ERROR, + (errcode(ERRCODE_INVALID_ARGUMENT_FOR_POWER_FUNCTION), + errmsg("a negative number raised to a non-integer power yields a complex result"))); /* * pow() sets errno only on some platforms, depending on whether it diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index b4022a7ccf1..c88469fdece 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -14,7 +14,7 @@ * Copyright (c) 1998-2008, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/numeric.c,v 1.113 2008/05/09 15:36:06 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/numeric.c,v 1.114 2008/05/09 21:31:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1897,13 +1897,17 @@ numeric_power(PG_FUNCTION_ARGS) * certain error conditions. Specifically, we don't return a divide-by-zero * error code for 0 ^ -1. */ - if ((cmp_var(&arg1, &const_zero) == 0 && - cmp_var(&arg2, &const_zero) < 0) || - (cmp_var(&arg1, &const_zero) < 0 && - cmp_var(&arg2, &arg2_trunc) != 0)) + if (cmp_var(&arg1, &const_zero) == 0 && + cmp_var(&arg2, &const_zero) < 0) ereport(ERROR, (errcode(ERRCODE_INVALID_ARGUMENT_FOR_POWER_FUNCTION), - errmsg("invalid argument for power function"))); + errmsg("zero raised to a negative power is undefined"))); + + if (cmp_var(&arg1, &const_zero) < 0 && + cmp_var(&arg2, &arg2_trunc) != 0) + ereport(ERROR, + (errcode(ERRCODE_INVALID_ARGUMENT_FOR_POWER_FUNCTION), + errmsg("a negative number raised to a non-integer power yields a complex result"))); /* * Call power_var() to compute and return the result; note it handles |