fix infinite bounds in view 'pathman_partition_list'

funbringer · funbringer · commit be231f06a2ed · 2017-02-20T17:54:35.000+03:00
diff --git a/expected/pathman_basic.out b/expected/pathman_basic.out
@@ -1376,14 +1376,14 @@ SELECT pathman.attach_range_partition('test.range_rel', 'test.range_rel_minus_in
 SELECT * FROM pathman.pathman_partition_list WHERE parent = 'test.range_rel'::REGCLASS;
      parent     |           partition           | parttype | partattr |        range_min         |        range_max         
 ----------------+-------------------------------+----------+----------+--------------------------+--------------------------
- test.range_rel | test.range_rel_minus_infinity |        2 | dt       | NULL                     | Mon Dec 01 00:00:00 2014
+ test.range_rel | test.range_rel_minus_infinity |        2 | dt       |                          | Mon Dec 01 00:00:00 2014
  test.range_rel | test.range_rel_8              |        2 | dt       | Mon Dec 01 00:00:00 2014 | Thu Jan 01 00:00:00 2015
  test.range_rel | test.range_rel_1              |        2 | dt       | Thu Jan 01 00:00:00 2015 | Sun Feb 01 00:00:00 2015
  test.range_rel | test.range_rel_2              |        2 | dt       | Sun Feb 01 00:00:00 2015 | Sun Mar 01 00:00:00 2015
  test.range_rel | test.range_rel_3              |        2 | dt       | Sun Mar 01 00:00:00 2015 | Wed Apr 01 00:00:00 2015
  test.range_rel | test.range_rel_4              |        2 | dt       | Wed Apr 01 00:00:00 2015 | Fri May 01 00:00:00 2015
  test.range_rel | test.range_rel_6              |        2 | dt       | Fri May 01 00:00:00 2015 | Mon Jun 01 00:00:00 2015
- test.range_rel | test.range_rel_plus_infinity  |        2 | dt       | Mon Jun 01 00:00:00 2015 | NULL
+ test.range_rel | test.range_rel_plus_infinity  |        2 | dt       | Mon Jun 01 00:00:00 2015 | 
 (8 rows)
 
 INSERT INTO test.range_rel (dt) VALUES ('2012-06-15');
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -398,28 +398,32 @@ show_partition_list_internal(PG_FUNCTION_ARGS)
 			case PT_RANGE:
 				{
 					RangeEntry *re;
-					Datum		rmin,
-								rmax;
 
 					re = &PrelGetRangesArray(prel)[usercxt->child_number];
 
+					values[Anum_pathman_pl_partition - 1] = re->child_oid;
+
 					/* Lower bound text */
-					rmin = !IsInfinite(&re->min) ?
-								CStringGetTextDatum(
+					if (!IsInfinite(&re->min))
+					{
+						Datum rmin = CStringGetTextDatum(
 										datum_to_cstring(BoundGetValue(&re->min),
-														 prel->atttype)) :
-								CStringGetTextDatum("NULL");
+														 prel->atttype));
+
+						values[Anum_pathman_pl_range_min - 1] = rmin;
+					}
+					else isnull[Anum_pathman_pl_range_min - 1] = true;
 
 					/* Upper bound text */
-					rmax = !IsInfinite(&re->max) ?
-								CStringGetTextDatum(
+					if (!IsInfinite(&re->max))
+					{
+						Datum rmax = CStringGetTextDatum(
 										datum_to_cstring(BoundGetValue(&re->max),
-														 prel->atttype)) :
-								CStringGetTextDatum("NULL");
+														 prel->atttype));
 
-					values[Anum_pathman_pl_partition - 1] = re->child_oid;
-					values[Anum_pathman_pl_range_min - 1] = rmin;
-					values[Anum_pathman_pl_range_max - 1] = rmax;
+						values[Anum_pathman_pl_range_max - 1] = rmax;
+					}
+					else isnull[Anum_pathman_pl_range_max - 1] = true;
 				}
 				break;
 
