Merge branch 'rel_future_beta' of https://github.com/postgrespro/pg_pathman into rel_future_beta

zilder · zilder · commit cca1e8bf0d0d · 2017-02-10T17:16:44.000+03:00
diff --git a/expected/pathman_calamity.out b/expected/pathman_calamity.out
@@ -355,6 +355,15 @@ SELECT build_update_trigger_func_name(NULL) IS NULL;
 /* check function stop_concurrent_part_task() */
 SELECT stop_concurrent_part_task(1::regclass);
 ERROR:  cannot find worker for relation "1"
+/* check function drop_range_partition_expand_next() */
+SELECT drop_range_partition_expand_next('pg_class');
+ERROR:  relation "pg_class" is not a partition
+SELECT drop_range_partition_expand_next(NULL) IS NULL;
+ ?column? 
+----------
+ t
+(1 row)
+
 /* check invoke_on_partition_created_callback() for RANGE */
 SELECT invoke_on_partition_created_callback('calamity.part_test', 'calamity.part_test', 1, NULL, NULL::int);
 ERROR:  both bounds must be provided for RANGE partition
diff --git a/sql/pathman_calamity.sql b/sql/pathman_calamity.sql
@@ -124,6 +124,10 @@ SELECT build_update_trigger_func_name(NULL) IS NULL;
 /* check function stop_concurrent_part_task() */
 SELECT stop_concurrent_part_task(1::regclass);
 
+/* check function drop_range_partition_expand_next() */
+SELECT drop_range_partition_expand_next('pg_class');
+SELECT drop_range_partition_expand_next(NULL) IS NULL;
+
 /* check invoke_on_partition_created_callback() for RANGE */
 SELECT invoke_on_partition_created_callback('calamity.part_test', 'calamity.part_test', 1, NULL, NULL::int);
 SELECT invoke_on_partition_created_callback('calamity.part_test', 'calamity.part_test', 1, 1, NULL);
diff --git a/src/pl_range_funcs.c b/src/pl_range_funcs.c
@@ -940,12 +940,12 @@ drop_table_by_oid(Oid relid)
 	DropStmt	   *n = makeNode(DropStmt);
 	const char	   *relname = get_qualified_rel_name(relid);
 
-	n->removeType = OBJECT_TABLE;
-	n->missing_ok = false;
-	n->objects = list_make1(stringToQualifiedNameList(relname));
-	n->arguments = NIL;
-	n->behavior = DROP_RESTRICT;  /* default behavior */
-	n->concurrent = false;
+	n->removeType	= OBJECT_TABLE;
+	n->missing_ok	= false;
+	n->objects		= list_make1(stringToQualifiedNameList(relname));
+	n->arguments	= NIL;
+	n->behavior		= DROP_RESTRICT;  /* default behavior */
+	n->concurrent	= false;
 
 	RemoveRelations(n);
 }
