pathman: append and prepend functions return value

zilder · zilder · commit fc069f54872a · 2016-02-01T02:10:24.000+03:00
diff --git a/contrib/pg_pathman/expected/pg_pathman.out b/contrib/pg_pathman/expected/pg_pathman.out
@@ -386,33 +386,33 @@ NOTICE:  Done!
 SELECT pathman.append_partition('test.num_range_rel');
 NOTICE:  Appending new partition...
 NOTICE:  Done!
- append_partition 
-------------------
- 
+   append_partition   
+----------------------
+ test.num_range_rel_6
 (1 row)
 
 SELECT pathman.prepend_partition('test.num_range_rel');
 NOTICE:  Prepending new partition...
 NOTICE:  Done!
- prepend_partition 
--------------------
- 
+  prepend_partition   
+----------------------
+ test.num_range_rel_7
 (1 row)
 
 SELECT pathman.append_partition('test.range_rel');
 NOTICE:  Appending new partition...
 NOTICE:  Done!
  append_partition 
 ------------------
- 
+ test.range_rel_6
 (1 row)
 
 SELECT pathman.prepend_partition('test.range_rel');
 NOTICE:  Prepending new partition...
 NOTICE:  Done!
  prepend_partition 
 -------------------
- 
+ test.range_rel_7
 (1 row)
 
 /*
@@ -590,17 +590,17 @@ NOTICE:  Done!
 SELECT append_partition('range_rel');
 NOTICE:  Appending new partition...
 NOTICE:  Done!
- append_partition 
-------------------
- 
+  append_partition   
+---------------------
+ public.range_rel_14
 (1 row)
 
 SELECT prepend_partition('range_rel');
 NOTICE:  Prepending new partition...
 NOTICE:  Done!
- prepend_partition 
--------------------
- 
+  prepend_partition  
+---------------------
+ public.range_rel_15
 (1 row)
 
 EXPLAIN (COSTS OFF) SELECT * FROM range_rel WHERE dt < '2010-03-01';
diff --git a/contrib/pg_pathman/sql/hash.sql b/contrib/pg_pathman/sql/hash.sql
@@ -7,13 +7,20 @@ CREATE OR REPLACE FUNCTION @extschema@.create_hash_partitions(
     , partitions_count INTEGER
 ) RETURNS INTEGER AS
 $$
+DECLARE
+    v_type TEXT;
 BEGIN
     relation := @extschema@.validate_relname(relation);
+    v_type := @extschema@.get_attribute_type_name(relation, attribute);
 
     IF EXISTS (SELECT * FROM @extschema@.pathman_config WHERE relname = relation) THEN
         RAISE EXCEPTION 'Relation "%" has already been partitioned', relation;
     END IF;
 
+    IF v_type::regtype != 'integer'::regtype THEN
+        RAISE EXCEPTION 'Attribute type must be INTEGER';
+    END IF;
+
     /* Create partitions and update pg_pathman configuration */
     FOR partnum IN 0..partitions_count-1
     LOOP
diff --git a/contrib/pg_pathman/sql/range.sql b/contrib/pg_pathman/sql/range.sql
@@ -469,40 +469,48 @@ $$ LANGUAGE plpgsql;
 /*
  * Append new partition
  */
-CREATE OR REPLACE FUNCTION @extschema@.append_partition(p_relation TEXT)
-RETURNS VOID AS
+CREATE OR REPLACE FUNCTION @extschema@.append_partition(
+    p_relation TEXT)
+RETURNS TEXT AS
 $$
 DECLARE
     v_attname TEXT;
     v_atttype TEXT;
+    v_part_name TEXT;
 BEGIN
     p_relation := @extschema@.validate_relname(p_relation);
 
     v_attname := attname FROM @extschema@.pathman_config WHERE relname = p_relation;
     v_atttype := @extschema@.get_attribute_type_name(p_relation, v_attname);
-    EXECUTE format('SELECT @extschema@.append_partition_internal($1, NULL::%s)', v_atttype)
+    EXECUTE format('SELECT @extschema@.append_partition_internal($1, ARRAY[]::%s[])'
+                   , v_atttype)
+    INTO v_part_name
     USING p_relation;
+
+    RETURN v_part_name;
 END
 $$
 LANGUAGE plpgsql;
 
 
 CREATE OR REPLACE FUNCTION @extschema@.append_partition_internal(
     p_relation TEXT
-    , dummy ANYELEMENT
-    , OUT p_range ANYARRAY)
-RETURNS ANYARRAY AS
+    , p_range ANYARRAY DEFAULT NULL)
+RETURNS TEXT AS
 $$
+DECLARE
+    v_part_name TEXT;
 BEGIN
     p_range := @extschema@.get_range_by_idx(p_relation::regclass::oid, -1, 0);
     RAISE NOTICE 'Appending new partition...';
-    PERFORM @extschema@.create_single_range_partition(p_relation
-                                                      , p_range[2]
-                                                      , p_range[2] + (p_range[2] - p_range[1]));
+    v_part_name := @extschema@.create_single_range_partition(p_relation
+                                                             , p_range[2]
+                                                             , p_range[2] + (p_range[2] - p_range[1]));
 
     /* Tell backend to reload configuration */
     PERFORM @extschema@.on_create_partitions(p_relation::regclass::oid);
     RAISE NOTICE 'Done!';
+    RETURN v_part_name;
 END
 $$
 LANGUAGE plpgsql;
@@ -512,39 +520,47 @@ LANGUAGE plpgsql;
  * Append new partition
  */
 CREATE OR REPLACE FUNCTION @extschema@.prepend_partition(p_relation TEXT)
-RETURNS VOID AS
+RETURNS TEXT AS
 $$
 DECLARE
     v_attname TEXT;
     v_atttype TEXT;
+    v_part_name TEXT;
 BEGIN
     p_relation := @extschema@.validate_relname(p_relation);
 
     v_attname := attname FROM @extschema@.pathman_config WHERE relname = p_relation;
     v_atttype := @extschema@.get_attribute_type_name(p_relation, v_attname);
-    EXECUTE format('SELECT @extschema@.prepend_partition_internal($1, NULL::%s)', v_atttype)
+    EXECUTE format('SELECT @extschema@.prepend_partition_internal($1, ARRAY[]::%s[])'
+                   , v_atttype)
+    INTO v_part_name
     USING p_relation;
+
+    RETURN v_part_name;
 END
 $$
 LANGUAGE plpgsql;
 
 
 CREATE OR REPLACE FUNCTION @extschema@.prepend_partition_internal(
     p_relation TEXT
-    , dummy ANYELEMENT
-    , OUT p_range ANYARRAY)
-RETURNS ANYARRAY AS
+    , p_range ANYARRAY DEFAULT NULL)
+RETURNS TEXT AS
 $$
+DECLARE
+    v_part_name TEXT;
 BEGIN
     p_range := @extschema@.get_range_by_idx(p_relation::regclass::oid, 0, 0);
     RAISE NOTICE 'Prepending new partition...';
-    PERFORM @extschema@.create_single_range_partition(p_relation
-                                                      , p_range[1] - (p_range[2] - p_range[1])
-                                                      , p_range[1]);
+    v_part_name := @extschema@.create_single_range_partition(p_relation
+                                                             , p_range[1] - (p_range[2] - p_range[1])
+                                                             , p_range[1]);
 
     /* Tell backend to reload configuration */
     PERFORM @extschema@.on_create_partitions(p_relation::regclass::oid);
     RAISE NOTICE 'Done!';
+
+    RETURN v_part_name;
 END
 $$
 LANGUAGE plpgsql;
