Fix error in commit e6feef5.

jeff-davis · jeff-davis · commit 812623b69eac · 2019-07-18T17:01:58.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
@@ -1338,13 +1338,15 @@ daterange_canonical(PG_FUNCTION_ARGS)
 	if (empty)
 		PG_RETURN_RANGE(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
`@@ -1338,13 +1338,15 @@ daterange_canonical(PG_FUNCTION_ARGS)`
`1338`	`1338`	`if (empty)`
`1339`	`1339`	`PG_RETURN_RANGE(r);`
`1340`	`1340`
`1341`		`- if (!lower.infinite && !DATE_NOT_FINITE(lower.val) && !lower.inclusive)`
	`1341`	`+ if (!lower.infinite && !DATE_NOT_FINITE(DatumGetDateADT(lower.val)) &&`
	`1342`	`+ !lower.inclusive)`
`1342`	`1343`	`{`
`1343`	`1344`	`lower.val = DirectFunctionCall2(date_pli, lower.val, Int32GetDatum(1));`
`1344`	`1345`	`lower.inclusive = true;`
`1345`	`1346`	`}`
`1346`	`1347`
`1347`		`- if (!upper.infinite && !DATE_NOT_FINITE(upper.val) && upper.inclusive)`
	`1348`	`+ if (!upper.infinite && !DATE_NOT_FINITE(DatumGetDateADT(upper.val)) &&`
	`1349`	`+ upper.inclusive)`
`1348`	`1350`	`{`
`1349`	`1351`	`upper.val = DirectFunctionCall2(date_pli, upper.val, Int32GetDatum(1));`
`1350`	`1352`	`upper.inclusive = false;`