pathman: schema-qualified names aren't mandatory anymore

zilder · zilder · commit d8f41095bdee · 2016-01-23T19:34:36.000+03:00
diff --git a/contrib/pathman/expected/pathman.out b/contrib/pathman/expected/pathman.out
@@ -333,7 +333,6 @@ NOTICE:  function test.hash_rel_hash_update_trigger_func() does not exist, skipp
 (1 row)
 
 DROP TABLE test.hash_rel CASCADE;
-NOTICE:  drop cascades to 3 other objects
 SELECT pathman.drop_range_partitions('test.num_range_rel');
  drop_range_partitions 
 -----------------------
diff --git a/contrib/pathman/sql/hash.sql b/contrib/pathman/sql/hash.sql
@@ -108,11 +108,17 @@ DECLARE
     rec RECORD;
     num INTEGER := 0;
 BEGIN
+    relation := @extschema@.validate_relname(relation);
+
     /* Drop trigger first */
     PERFORM @extschema@.drop_hash_triggers(relation);
     DELETE FROM @extschema@.pathman_config WHERE relname = relation;
-    -- EXECUTE format('DROP TABLE %s CASCADE', relation);
-    
+
+    FOR rec in (SELECT * FROM pg_inherits WHERE inhparent = relation::regclass::oid)
+    LOOP
+        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'
diff --git a/contrib/pathman/sql/init.sql b/contrib/pathman/sql/init.sql
@@ -110,26 +110,23 @@ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION @extschema@.validate_relname(relname TEXT)
 RETURNS TEXT AS
 $$
-DECLARE
-    ret TEXT := lower(relname);
 BEGIN
-    IF NOT ret ~ '^([a-z_]+[a-z0-9_]*)\.([a-z_]+[a-z0-9_]*)$' THEN
-        RAISE EXCEPTION 'Incorrect relation name. It must be fully qualified: <schema>.<relname>';
-    END IF;
-    RETURN ret;
+    RETURN @extschema@.get_schema_qualified_name(relname::regclass, '.');
 END
 $$
 LANGUAGE plpgsql;
 
 
 /*
- *
+ * Returns schema-qualified name for table
  */
-CREATE OR REPLACE FUNCTION @extschema@.get_schema_qualified_name(cls regclass)
+CREATE OR REPLACE FUNCTION @extschema@.get_schema_qualified_name(
+    cls REGCLASS
+    , delimiter TEXT DEFAULT '_')
 RETURNS TEXT AS
 $$
 BEGIN
-    RETURN relnamespace::regnamespace || '_' || relname FROM pg_class WHERE oid = cls::oid;
+    RETURN relnamespace::regnamespace || delimiter || relname FROM pg_class WHERE oid = cls::oid;
 END
 $$
 LANGUAGE plpgsql;
diff --git a/contrib/pathman/sql/range.sql b/contrib/pathman/sql/range.sql
@@ -477,7 +477,7 @@ DECLARE
                     EXECUTE format(''INSERT INTO %%s SELECT $1.*'', v_part_relid::regclass)
                     USING NEW;
                 ELSE
-                    RAISE EXCEPTION ''ERROR: Cannot determine approprite partition'';
+                    RAISE EXCEPTION ''ERROR: Cannot find partition'';
                 END IF;
             END IF;
             RETURN NULL;
