Fix error in commit e6feef5.

jeff-davis · jeff-davis · commit 5245552ddbc4 · 2019-07-18T17:26:56.000-07:00
I was careless passing a datum directly to DATE_NOT_FINITE without
calling DatumGetDateADT() first.

Backpatch-through: 9.4
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -1431,13 +1431,15 @@ daterange_canonical(PG_FUNCTION_ARGS)`
`1431`	`1431`	`if (empty)`
`1432`	`1432`	`PG_RETURN_RANGE_P(r);`
`1433`	`1433`
`1434`		`- if (!lower.infinite && !DATE_NOT_FINITE(lower.val) && !lower.inclusive)`
	`1434`	`+ if (!lower.infinite && !DATE_NOT_FINITE(DatumGetDateADT(lower.val)) &&`
	`1435`	`+ !lower.inclusive)`
`1435`	`1436`	`{`
`1436`	`1437`	`lower.val = DirectFunctionCall2(date_pli, lower.val, Int32GetDatum(1));`
`1437`	`1438`	`lower.inclusive = true;`
`1438`	`1439`	`}`
`1439`	`1440`
`1440`		`- if (!upper.infinite && !DATE_NOT_FINITE(upper.val) && upper.inclusive)`
	`1441`	`+ if (!upper.infinite && !DATE_NOT_FINITE(DatumGetDateADT(upper.val)) &&`
	`1442`	`+ upper.inclusive)`
`1441`	`1443`	`{`
`1442`	`1444`	`upper.val = DirectFunctionCall2(date_pli, upper.val, Int32GetDatum(1));`
`1443`	`1445`	`upper.inclusive = false;`