diff options
author | Jeff Davis <jdavis@postgresql.org> | 2019-07-18 16:38:39 -0700 |
---|---|---|
committer | Jeff Davis <jdavis@postgresql.org> | 2019-07-18 17:04:50 -0700 |
commit | b538c90b1bded5464787e2b8e4431302d24eb601 (patch) | |
tree | 68eb9040a912d2e84c4efdb0f84e651a9a259cd0 /src/backend | |
parent | 70a33b21099c046dc38f07ffb02b1e0cf2aff91d (diff) | |
download | postgresql-b538c90b1bded5464787e2b8e4431302d24eb601.tar.gz postgresql-b538c90b1bded5464787e2b8e4431302d24eb601.zip |
Fix error in commit e6feef57.
I was careless passing a datum directly to DATE_NOT_FINITE without
calling DatumGetDateADT() first.
Backpatch-through: 9.4
Diffstat (limited to 'src/backend')
-rw-r--r-- | src/backend/utils/adt/rangetypes.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c index 5fb347eacd8..e5c7e5c7eea 100644 --- a/src/backend/utils/adt/rangetypes.c +++ b/src/backend/utils/adt/rangetypes.c @@ -1431,13 +1431,15 @@ daterange_canonical(PG_FUNCTION_ARGS) if (empty) PG_RETURN_RANGE_P(r); - if (!lower.infinite && !DATE_NOT_FINITE(lower.val) && !lower.inclusive) + if (!lower.infinite && !DATE_NOT_FINITE(DatumGetDateADT(lower.val)) && + !lower.inclusive) { lower.val = DirectFunctionCall2(date_pli, lower.val, Int32GetDatum(1)); lower.inclusive = true; } - if (!upper.infinite && !DATE_NOT_FINITE(upper.val) && upper.inclusive) + if (!upper.infinite && !DATE_NOT_FINITE(DatumGetDateADT(upper.val)) && + upper.inclusive) { upper.val = DirectFunctionCall2(date_pli, upper.val, Int32GetDatum(1)); upper.inclusive = false; |