pathman: minor fixes

zilder · zilder · commit 4fe43aac729f · 2016-01-24T16:04:40.000+03:00
diff --git a/contrib/pg_pathman/expected/pg_pathman.out b/contrib/pg_pathman/expected/pg_pathman.out
@@ -424,4 +424,16 @@ SELECT pathman.drop_range_partitions('test.num_range_rel');
 (1 row)
 
 DROP TABLE test.num_range_rel CASCADE;
+SELECT pathman.drop_range_partitions('test.range_rel');
+ drop_range_partitions 
+-----------------------
+ 
+(1 row)
+
+DROP TABLE test.range_rel CASCADE;
+SELECT * FROM pathman.pathman_config;
+ id | relname | attname | parttype 
+----+---------+---------+----------
+(0 rows)
+
 DROP EXTENSION pg_pathman;
diff --git a/contrib/pg_pathman/pathman.h b/contrib/pg_pathman/pathman.h
@@ -10,7 +10,7 @@
 
 
 #define ALL NIL
-#define BLOCKS_COUNT 10240
+#define BLOCKS_COUNT 20480
 
 /*
  * Partitioning type
diff --git a/contrib/pg_pathman/sql/hash.sql b/contrib/pg_pathman/sql/hash.sql
@@ -119,14 +119,6 @@ BEGIN
         EXECUTE format('DROP TABLE %s', rec.inhrelid::regclass::text);
     END LOOP;
 
-    -- FOR rec in (SELECT * FROM pg_inherits WHERE inhparent = relation::regclass::oid)
-    -- LOOP
-    --     EXECUTE format('DROP FUNCTION IF EXISTS %s_hash_update_trigger_func() CASCADE'
-    --                    , @extschema@.get_schema_qualified_name(relation::regclass)
-    --                    , num);
-    --     num := num + 1;
-    -- END LOOP;
-
     /* Notify backend about changes */
     PERFORM @extschema@.on_remove_partitions(relation::regclass::oid);
 END
diff --git a/contrib/pg_pathman/sql/pg_pathman.sql b/contrib/pg_pathman/sql/pg_pathman.sql
@@ -112,4 +112,9 @@ DROP TABLE test.hash_rel CASCADE;
 SELECT pathman.drop_range_partitions('test.num_range_rel');
 DROP TABLE test.num_range_rel CASCADE;
 
+SELECT pathman.drop_range_partitions('test.range_rel');
+DROP TABLE test.range_rel CASCADE;
+
+SELECT * FROM pathman.pathman_config;
+
 DROP EXTENSION pg_pathman;
diff --git a/contrib/pg_pathman/sql/range.sql b/contrib/pg_pathman/sql/range.sql
@@ -576,6 +576,8 @@ $$
 DECLARE
     v_rec   RECORD;
 BEGIN
+    relation := @extschema@.validate_relname(relation);
+
     /* Drop trigger first */
     PERFORM @extschema@.drop_range_triggers(relation);
 
