Commit b538c90b authored by Jeff Davis's avatar Jeff Davis

Fix error in commit e6feef57.

I was careless passing a datum directly to DATE_NOT_FINITE without
calling DatumGetDateADT() first.

Backpatch-through: 9.4
parent 70a33b21
...@@ -1431,13 +1431,15 @@ daterange_canonical(PG_FUNCTION_ARGS) ...@@ -1431,13 +1431,15 @@ daterange_canonical(PG_FUNCTION_ARGS)
if (empty) if (empty)
PG_RETURN_RANGE_P(r); 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.val = DirectFunctionCall2(date_pli, lower.val, Int32GetDatum(1));
lower.inclusive = true; 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.val = DirectFunctionCall2(date_pli, upper.val, Int32GetDatum(1));
upper.inclusive = false; upper.inclusive = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment