fix triggers

Author: zilder

expected/pg_pathman.out

@@ -12,8 +12,8 @@ SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3);
 ERROR:  Partitioning key 'value' must be NOT NULL
 ALTER TABLE test.hash_rel ALTER COLUMN value SET NOT NULL;
 SELECT pathman.create_hash_partitions('test.hash_rel', 'Value', 3);
-NOTICE:  function test.hash_rel_hash_insert_trigger_func() does not exist, skipping
-NOTICE:  function test.hash_rel_hash_update_trigger_func() does not exist, skipping
+NOTICE:  function test.hash_rel_insert_trigger_func() does not exist, skipping
+NOTICE:  function test.hash_rel_update_trigger_func() does not exist, skipping
 NOTICE:  Copying data to partitions...
  create_hash_partitions 
 ------------------------
@@ -600,15 +600,26 @@ CREATE TABLE test.range_rel_test2 (
     dt  TIMESTAMP);
 SELECT pathman.attach_range_partition('test.range_rel', 'test.range_rel_test2', '2013-01-01'::DATE, '2014-01-01'::DATE);
 ERROR:  Partition must have the exact same structure as parent P0001
+/*
+ * Check that altering table columns doesn't break trigger
+ */
+ALTER TABLE test.hash_rel ADD COLUMN abc int;
+INSERT INTO test.hash_rel (id, value, abc) VALUES (123, 456, 789);
+SELECT * FROM test.hash_rel WHERE id = 123;
+ id  | value | abc 
+-----+-------+-----
+ 123 |   456 | 789
+(1 row)
+
 /*
  * Clean up
  */
 SELECT pathman.drop_hash_partitions('test.hash_rel');
 NOTICE:  drop cascades to trigger test_hash_rel_insert_trigger on table test.hash_rel
-NOTICE:  function test.hash_rel_hash_update_trigger_func() does not exist, skipping
+NOTICE:  drop cascades to 3 other objects
 NOTICE:  2 rows copied from test.hash_rel_2
 NOTICE:  3 rows copied from test.hash_rel_1
-NOTICE:  1 rows copied from test.hash_rel_0
+NOTICE:  2 rows copied from test.hash_rel_0
  drop_hash_partitions 
 ----------------------
                     3
@@ -617,12 +628,12 @@ NOTICE:  1 rows copied from test.hash_rel_0
 SELECT COUNT(*) FROM ONLY test.hash_rel;
  count 
 -------
-     6
+     7
 (1 row)
 
 SELECT pathman.create_hash_partitions('test.hash_rel', 'value', 3);
-NOTICE:  function test.hash_rel_hash_insert_trigger_func() does not exist, skipping
-NOTICE:  function test.hash_rel_hash_update_trigger_func() does not exist, skipping
+NOTICE:  function test.hash_rel_insert_trigger_func() does not exist, skipping
+NOTICE:  function test.hash_rel_update_trigger_func() does not exist, skipping
 NOTICE:  Copying data to partitions...
  create_hash_partitions 
 ------------------------
@@ -631,7 +642,7 @@ NOTICE:  Copying data to partitions...
 
 SELECT pathman.drop_hash_partitions('test.hash_rel', TRUE);
 NOTICE:  drop cascades to trigger test_hash_rel_insert_trigger on table test.hash_rel
-NOTICE:  function test.hash_rel_hash_update_trigger_func() does not exist, skipping
+NOTICE:  function test.hash_rel_update_trigger_func() does not exist, skipping
  drop_hash_partitions 
 ----------------------
                     3
@@ -770,8 +781,8 @@ CREATE TABLE hash_rel (
 	value	INTEGER NOT NULL);
 INSERT INTO hash_rel (value) SELECT g FROM generate_series(1, 10000) as g;
 SELECT create_hash_partitions('hash_rel', 'value', 3);
-NOTICE:  function hash_rel_hash_insert_trigger_func() does not exist, skipping
-NOTICE:  function hash_rel_hash_update_trigger_func() does not exist, skipping
+NOTICE:  function hash_rel_insert_trigger_func() does not exist, skipping
+NOTICE:  function hash_rel_update_trigger_func() does not exist, skipping
 NOTICE:  Copying data to partitions...
  create_hash_partitions 
 ------------------------

hash.sql

@@ -76,7 +76,7 @@ RETURNS VOID AS
 $$
 DECLARE
 	func TEXT := '
-		CREATE OR REPLACE FUNCTION %s_hash_insert_trigger_func()
+		CREATE OR REPLACE FUNCTION %s_insert_trigger_func()
 		RETURNS TRIGGER AS $body$
 		DECLARE
 			hash INTEGER;
@@ -88,7 +88,7 @@ DECLARE
 	trigger TEXT := '
 		CREATE TRIGGER %s_insert_trigger
 		BEFORE INSERT ON %s
-		FOR EACH ROW EXECUTE PROCEDURE %2$s_hash_insert_trigger_func();';
+		FOR EACH ROW EXECUTE PROCEDURE %2$s_insert_trigger_func();';
 	fields TEXT;
 	fields_format TEXT;
 	insert_stmt TEXT;
@@ -103,10 +103,8 @@ BEGIN
 	INTO fields, fields_format;
 
 	/* generate INSERT statement for trigger */
-	insert_stmt = format('EXECUTE format(''INSERT INTO %s_%%s VALUES (%s)'', hash) USING %s;'
-						 , relation
-						 , fields_format
-						 , fields);
+	insert_stmt = format('EXECUTE format(''INSERT INTO %s_%%s SELECT $1.*'', hash) USING NEW;'
+						 , relation);
 
 	/* format and create new trigger for relation */
 	func := format(func, relation, attr, partitions_count, insert_stmt);
@@ -164,9 +162,9 @@ CREATE OR REPLACE FUNCTION @extschema@.drop_hash_triggers(IN relation TEXT)
 RETURNS VOID AS
 $$
 BEGIN
-	EXECUTE format('DROP FUNCTION IF EXISTS %s_hash_insert_trigger_func() CASCADE'
+	EXECUTE format('DROP FUNCTION IF EXISTS %s_insert_trigger_func() CASCADE'
 				   , relation::regclass::text);
-	EXECUTE format('DROP FUNCTION IF EXISTS %s_hash_update_trigger_func() CASCADE'
+	EXECUTE format('DROP FUNCTION IF EXISTS %s_update_trigger_func() CASCADE'
 				   , relation::regclass::text);
 END
 $$ LANGUAGE plpgsql;

init.sql

@@ -119,11 +119,18 @@ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION @extschema@.disable_partitioning(IN relation TEXT)
 RETURNS VOID AS
 $$
+DECLARE
+	parttype INTEGER;
 BEGIN
 	relation := @extschema@.validate_relname(relation);
+	parttype := parttype FROM pathman_config WHERE relname = relation;
 
 	DELETE FROM @extschema@.pathman_config WHERE relname = relation;
-	EXECUTE format('DROP FUNCTION IF EXISTS %s_insert_trigger_func() CASCADE', relation);
+	IF parttype = 1 THEN
+		PERFORM @extschema@.drop_hash_triggers(relation);
+	ELSIF parttype = 2 THEN
+		PERFORM @extschema@.drop_range_triggers(relation);
+	END IF;
 
 	/* Notify backend about changes */
 	PERFORM on_remove_partitions(relation::regclass::integer);

range.sql

@@ -406,9 +406,6 @@ BEGIN
                                   LIMIT 1;
         EXIT WHEN v_child_relname_exists = 0;
     END LOOP;
-    -- v_child_relname := format('%s_%s'
-    --                           , p_parent_relname
-    --                           , regexp_replace(p_start_value::text, '[ :-]*', '', 'g'));
 
     /* Skip existing partitions */
     IF EXISTS (SELECT * FROM pg_tables WHERE tablename = v_child_relname) THEN
@@ -431,7 +428,6 @@ BEGIN
                     , v_cond);
 
     EXECUTE v_sql;
-    -- RAISE NOTICE 'partition % created', v_child_relname;
     RETURN v_child_relname;
 END
 $$ LANGUAGE plpgsql;
@@ -763,9 +759,6 @@ DECLARE
 BEGIN
 	p_range := @extschema@.get_range_by_idx(p_relation::regclass::oid, 0, 0);
 	RAISE NOTICE 'Prepending new partition...';
-	-- v_part_name := @extschema@.create_single_range_partition(p_relation
-	--                                                          , p_range[1] - (p_range[2] - p_range[1])
-	--                                                          , p_range[1]);
 
 	IF @extschema@.is_date(p_atttype::regtype) THEN
 		v_part_name := @extschema@.create_single_range_partition(p_relation
@@ -1117,7 +1110,6 @@ BEGIN
 	END LOOP;
 
 	DELETE FROM @extschema@.pathman_config WHERE relname = relation;
-	-- DELETE FROM pg_pathman_range_rels WHERE parent = relation;
 
 	/* Notify backend about changes */
 	PERFORM @extschema@.on_remove_partitions(relation::regclass::oid);

sql/pg_pathman.sql

@@ -149,6 +149,13 @@ CREATE TABLE test.range_rel_test2 (
     dt  TIMESTAMP);
 SELECT pathman.attach_range_partition('test.range_rel', 'test.range_rel_test2', '2013-01-01'::DATE, '2014-01-01'::DATE);
 
+/*
+ * Check that altering table columns doesn't break trigger
+ */
+ALTER TABLE test.hash_rel ADD COLUMN abc int;
+INSERT INTO test.hash_rel (id, value, abc) VALUES (123, 456, 789);
+SELECT * FROM test.hash_rel WHERE id = 123;
+
 /*
  * Clean up
  */