introduce drop_range_triggers() function

funbringer · funbringer · commit 97c31cd225a4 · 2016-06-02T19:54:59.000+03:00
diff --git a/hash.sql b/hash.sql
@@ -83,7 +83,7 @@ BEGIN
 	v_relname := @extschema@.validate_relname(relation);
 
 	/* Drop trigger first */
-	PERFORM @extschema@.drop_hash_triggers(relation);
+	PERFORM @extschema@.drop_triggers(relation);
 	DELETE FROM @extschema@.pathman_config WHERE relname::regclass = relation;
 
 	FOR v_rec in (SELECT inhrelid::regclass::text AS tbl
@@ -108,27 +108,6 @@ BEGIN
 END
 $$ LANGUAGE plpgsql;
 
-/*
- * Drops hash trigger
- */
-CREATE OR REPLACE FUNCTION @extschema@.drop_hash_triggers(IN relation REGCLASS)
-RETURNS VOID AS
-$$
-DECLARE
-	relname TEXT;
-	schema  TEXT;
-	funcname      TEXT;
-BEGIN
-	SELECT * INTO schema, relname
-	FROM @extschema@.get_plain_schema_and_relname(relation);
-
-	funcname := schema || '.' || quote_ident(format('%s_insert_trigger_func', relname));
-	EXECUTE format('DROP FUNCTION IF EXISTS %s() CASCADE', funcname);
-	funcname := schema || '.' || quote_ident(format('%s_update_trigger_func', relname));
-	EXECUTE format('DROP FUNCTION IF EXISTS %s() CASCADE', funcname);
-END
-$$ LANGUAGE plpgsql;
-
 /*
  * Creates an update trigger
  */
diff --git a/init.sql b/init.sql
@@ -127,9 +127,9 @@ BEGIN
 
 	DELETE FROM @extschema@.pathman_config WHERE relname = relation;
 	IF parttype = 1 THEN
-		PERFORM @extschema@.drop_hash_triggers(relation);
+		PERFORM @extschema@.drop_triggers(relation);
 	ELSIF parttype = 2 THEN
-		PERFORM @extschema@.drop_range_triggers(relation);
+		PERFORM @extschema@.drop_triggers(relation);
 	END IF;
 
 	/* Notify backend about changes */
@@ -340,3 +340,22 @@ RETURNS VOID AS 'pg_pathman', 'acquire_partitions_lock' LANGUAGE C STRICT;
  */
 CREATE OR REPLACE FUNCTION @extschema@.release_partitions_lock()
 RETURNS VOID AS 'pg_pathman', 'release_partitions_lock' LANGUAGE C STRICT;
+
+/*
+ * Drop trigger
+ */
+CREATE OR REPLACE FUNCTION @extschema@.drop_triggers(IN relation REGCLASS)
+RETURNS VOID AS
+$$
+DECLARE
+	relname		TEXT;
+	schema		TEXT;
+	funcname	TEXT;
+BEGIN
+	SELECT * INTO schema, relname
+	FROM @extschema@.get_plain_schema_and_relname(relation);
+
+	funcname := schema || '.' || quote_ident(format('%s_update_trigger_func', relname));
+	EXECUTE format('DROP FUNCTION IF EXISTS %s() CASCADE', funcname);
+END
+$$ LANGUAGE plpgsql;
diff --git a/range.sql b/range.sql
@@ -1094,7 +1094,7 @@ BEGIN
 	v_relname := @extschema@.validate_relname(relation);
 
 	/* Drop trigger first */
-	PERFORM @extschema@.drop_range_triggers(relation);
+	PERFORM @extschema@.drop_triggers(relation);
 
 	FOR v_rec IN (SELECT inhrelid::regclass::text AS tbl
 				  FROM pg_inherits WHERE inhparent::regclass = relation)
@@ -1120,27 +1120,6 @@ BEGIN
 END
 $$ LANGUAGE plpgsql;
 
-
-/*
- * Drop trigger
- */
-CREATE OR REPLACE FUNCTION @extschema@.drop_range_triggers(IN relation REGCLASS)
-RETURNS VOID AS
-$$
-DECLARE
-	schema  TEXT;
-	relname TEXT;
-BEGIN
-	SELECT * INTO schema, relname
-	FROM @extschema@.get_plain_schema_and_relname(relation);
-
-	--EXECUTE format('DROP TRIGGER IF EXISTS %s ON %s CASCADE'
-	--			   , format('"%s_%s_insert_trigger"', schema, relname)
-	--			   , relation::TEXT);
-END
-$$ LANGUAGE plpgsql;
-
-
 /*
  * Internal function used to create new partitions on insert or update trigger.
  * Invoked from C-function find_or_create_range_partition().
