pathman: minor fixes

zilder · zilder · commit b2af9ac332bb · 2016-02-16T15:27:26.000+03:00
diff --git a/contrib/pg_pathman/README.md b/contrib/pg_pathman/README.md
@@ -138,7 +138,7 @@ attach_range_partition(
     start_value ANYELEMENT,
     end_value ANYELEMENT)
 ```
-Attaches partition to existing RANGE partitioned relation.
+Attaches partition to existing RANGE partitioned relation. The table being attached must have exact same structure as the parent one.
 
 ```
 detach_range_partition(partition TEXT)
diff --git a/contrib/pg_pathman/README.rus.md b/contrib/pg_pathman/README.rus.md
@@ -140,7 +140,7 @@ attach_range_partition(
     start_value ANYELEMENT,
     end_value ANYELEMENT)
 ```
-Присоединяет существующую таблицу `partition` в качестве секции к ранее секционированной таблице `relation`.
+Присоединяет существующую таблицу `partition` в качестве секции к ранее секционированной таблице `relation`. Структура присоединяемой таблицы должна в точности повторять структуру родительской.
 
 ```
 detach_range_partition(partition TEXT)
diff --git a/contrib/pg_pathman/pl_funcs.c b/contrib/pg_pathman/pl_funcs.c
@@ -99,17 +99,17 @@ find_or_create_range_partition(PG_FUNCTION_ARGS)
 		TYPECACHE_CMP_PROC | TYPECACHE_CMP_PROC_FINFO);
 
 	prel = get_pathman_relation_info(relid, NULL);
+	rangerel = get_pathman_range_relation(relid, NULL);
+
+	if (!prel || !rangerel || rangerel->ranges.length == 0)
+		PG_RETURN_NULL();
+
 	cmp_proc_oid = get_opfamily_proc(tce->btree_opf,
 									 value_type,
 									 prel->atttype,
 									 BTORDER_PROC);
 	fmgr_info(cmp_proc_oid, &cmp_func);
 
-	rangerel = get_pathman_range_relation(relid, NULL);
-
-	if (!rangerel || rangerel->ranges.length == 0)
-		PG_RETURN_NULL();
-
 	ranges = dsm_array_get_pointer(&rangerel->ranges);
 	pos = range_binary_search(rangerel, &cmp_func, value, &found);
 
