Merge commit '135c8528bd155dfa66eeb52a674511c48122a35c' into PGPRO9_6_pathman

dmpgpro · dmpgpro · commit 477a0dd8c0b0 · 2016-12-05T17:21:44.000+03:00
diff --git a/contrib/pg_pathman/src/init.h b/contrib/pg_pathman/src/init.h
@@ -97,7 +97,9 @@ extern PathmanInitState 	pg_pathman_init_state;
 
 /* Lowest version of Pl/PgSQL frontend compatible with internals (0xAA_BB_CC) */
 #define LOWEST_COMPATIBLE_FRONT		0x010200
-#define CURRENT_LIB_VERSION			0x010200
+
+/* Current version on native C library (0xAA_BB_CC) */
+#define CURRENT_LIB_VERSION			0x010201
 
 
 /*
diff --git a/contrib/pg_pathman/src/partition_creation.c b/contrib/pg_pathman/src/partition_creation.c
@@ -1,4 +1,4 @@
-﻿/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
  *
  * partition_creation.c
  *		Various functions for partition creation.
@@ -657,7 +657,9 @@ choose_range_partition_name(Oid parent_relid, Oid parent_nsp)
 	if (need_priv_escalation)
 		SetUserIdAndSecContext(save_userid, save_sec_context);
 
-	return psprintf("%s_%u", get_rel_name(parent_relid), DatumGetInt32(part_num));
+	return psprintf("%s_" UINT64_FORMAT,
+					get_rel_name(parent_relid),
+					(uint64) DatumGetInt64(part_num)); /* can't use UInt64 on 9.5 */
 }
 
 /* Choose a good name for a HASH partition */

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/*-------------------------------------------------------------------------`
	`1`	`+/*-------------------------------------------------------------------------`
`2`	`2`	`*`
`3`	`3`	`* partition_creation.c`
`4`	`4`	`* Various functions for partition creation.`
`@@ -657,7 +657,9 @@ choose_range_partition_name(Oid parent_relid, Oid parent_nsp)`
`657`	`657`	`if (need_priv_escalation)`
`658`	`658`	`SetUserIdAndSecContext(save_userid, save_sec_context);`
`659`	`659`
`660`		`- return psprintf("%s_%u", get_rel_name(parent_relid), DatumGetInt32(part_num));`
	`660`	`+ return psprintf("%s_" UINT64_FORMAT,`
	`661`	`+ get_rel_name(parent_relid),`
	`662`	`+ (uint64) DatumGetInt64(part_num)); /* can't use UInt64 on 9.5 */`
`661`	`663`	`}`
`662`	`664`
`663`	`665`	`/* Choose a good name for a HASH partition */`