refactoring, add test for drop_triggers()

funbringer · funbringer · commit bf251027e903 · 2017-05-11T15:04:29.000+03:00
diff --git a/expected/pathman_calamity.out b/expected/pathman_calamity.out
@@ -777,6 +777,52 @@ SELECT merge_range_partitions('{calamity.merge_test_a_1,
 ERROR:  cannot merge partitions
 DROP TABLE calamity.merge_test_a,calamity.merge_test_b CASCADE;
 NOTICE:  drop cascades to 4 other objects
+/* check function drop_triggers() */
+CREATE TABLE calamity.trig_test_tbl(val INT4 NOT NULL);
+SELECT create_hash_partitions('calamity.trig_test_tbl', 'val', 2);
+ create_hash_partitions 
+------------------------
+                      2
+(1 row)
+
+SELECT create_update_triggers('calamity.trig_test_tbl');
+ create_update_triggers 
+------------------------
+ 
+(1 row)
+
+SELECT count(*) FROM pg_trigger WHERE tgrelid = 'calamity.trig_test_tbl'::REGCLASS;
+ count 
+-------
+     1
+(1 row)
+
+SELECT count(*) FROM pg_trigger WHERE tgrelid = 'calamity.trig_test_tbl_1'::REGCLASS;
+ count 
+-------
+     1
+(1 row)
+
+SELECT drop_triggers('calamity.trig_test_tbl');						/* OK */
+ drop_triggers 
+---------------
+ 
+(1 row)
+
+SELECT count(*) FROM pg_trigger WHERE tgrelid = 'calamity.trig_test_tbl'::REGCLASS;
+ count 
+-------
+     0
+(1 row)
+
+SELECT count(*) FROM pg_trigger WHERE tgrelid = 'calamity.trig_test_tbl_1'::REGCLASS;
+ count 
+-------
+     0
+(1 row)
+
+DROP TABLE calamity.trig_test_tbl CASCADE;
+NOTICE:  drop cascades to 2 other objects
 DROP SCHEMA calamity CASCADE;
 NOTICE:  drop cascades to 20 other objects
 DROP EXTENSION pg_pathman;
diff --git a/init.sql b/init.sql
@@ -447,7 +447,7 @@ CREATE OR REPLACE FUNCTION @extschema@.prepare_for_partitioning(
 RETURNS VOID AS
 $$
 DECLARE
-	constr_name	TEXT;
+	constr_name		TEXT;
 	is_referenced	BOOLEAN;
 	rel_persistence	CHAR;
 
@@ -516,9 +516,10 @@ CREATE OR REPLACE FUNCTION @extschema@.pathman_ddl_trigger_func()
 RETURNS event_trigger AS
 $$
 DECLARE
-	obj				record;
-	pg_class_oid	oid;
-	relids			regclass[];
+	obj				RECORD;
+	pg_class_oid	OID;
+	relids			REGCLASS[];
+
 BEGIN
 	pg_class_oid = 'pg_catalog.pg_class'::regclass;
 
@@ -545,20 +546,21 @@ CREATE OR REPLACE FUNCTION @extschema@.drop_triggers(
 RETURNS VOID AS
 $$
 DECLARE
-	triggername	TEXT;
-	rec			RECORD;
+	triggername		TEXT;
+	relation		OID;
 
 BEGIN
 	triggername := @extschema@.build_update_trigger_name(parent_relid);
 
 	/* Drop trigger for each partition if exists */
-	FOR rec IN (SELECT pg_catalog.pg_inherits.* FROM pg_catalog.pg_inherits
-				JOIN pg_catalog.pg_trigger ON inhrelid = tgrelid
-				WHERE inhparent = parent_relid AND tgname = triggername)
+	FOR relation IN (SELECT pg_catalog.pg_inherits.inhrelid
+					 FROM pg_catalog.pg_inherits
+					 JOIN pg_catalog.pg_trigger ON inhrelid = tgrelid
+					 WHERE inhparent = parent_relid AND tgname = triggername)
 	LOOP
 		EXECUTE format('DROP TRIGGER IF EXISTS %s ON %s',
 					   triggername,
-					   rec.inhrelid::REGCLASS::TEXT);
+					   relation::REGCLASS);
 	END LOOP;
 
 	/* Drop trigger on parent */
diff --git a/sql/pathman_calamity.sql b/sql/pathman_calamity.sql
@@ -333,6 +333,22 @@ SELECT merge_range_partitions('{calamity.merge_test_a_1,
 DROP TABLE calamity.merge_test_a,calamity.merge_test_b CASCADE;
 
 
+/* check function drop_triggers() */
+CREATE TABLE calamity.trig_test_tbl(val INT4 NOT NULL);
+SELECT create_hash_partitions('calamity.trig_test_tbl', 'val', 2);
+SELECT create_update_triggers('calamity.trig_test_tbl');
+
+SELECT count(*) FROM pg_trigger WHERE tgrelid = 'calamity.trig_test_tbl'::REGCLASS;
+SELECT count(*) FROM pg_trigger WHERE tgrelid = 'calamity.trig_test_tbl_1'::REGCLASS;
+
+SELECT drop_triggers('calamity.trig_test_tbl');						/* OK */
+
+SELECT count(*) FROM pg_trigger WHERE tgrelid = 'calamity.trig_test_tbl'::REGCLASS;
+SELECT count(*) FROM pg_trigger WHERE tgrelid = 'calamity.trig_test_tbl_1'::REGCLASS;
+
+DROP TABLE calamity.trig_test_tbl CASCADE;
+
+
 DROP SCHEMA calamity CASCADE;
 DROP EXTENSION pg_pathman;
 
