on_partitions_removed fix

zilder · zilder · commit a1580d56fd3e · 2016-02-01T16:42:12.000+03:00
diff --git a/init.c b/init.c
@@ -488,9 +488,8 @@ remove_relation_info(Oid relid)
 			free_dsm_array(&rangerel->ranges);
 			free_dsm_array(&prel->children);
 			hash_search(range_restrictions, (const void *) &key, HASH_REMOVE, NULL);
-			hash_search(relations, (const void *) &key, HASH_REMOVE, NULL);
 			break;
 	}
 	prel->children_count = 0;
-	hash_search(relations, (const void *) &relid, HASH_REMOVE, 0);
+	hash_search(relations, (const void *) &key, HASH_REMOVE, 0);
 }
diff --git a/init.sql b/init.sql
@@ -82,6 +82,8 @@ CREATE OR REPLACE FUNCTION @extschema@.disable_partitioning(IN relation TEXT)
 RETURNS VOID AS
 $$
 BEGIN
+    relation := @extschema@.validate_relname(relation);
+
     DELETE FROM @extschema@.pathman_config WHERE relname = relation;
     EXECUTE format('DROP FUNCTION IF EXISTS %s_insert_trigger_func() CASCADE', relation);
 

Original file line number	Diff line number	Diff line change
`@@ -488,9 +488,8 @@ remove_relation_info(Oid relid)`
`488`	`488`	`free_dsm_array(&rangerel->ranges);`
`489`	`489`	`free_dsm_array(&prel->children);`
`490`	`490`	`hash_search(range_restrictions, (const void *) &key, HASH_REMOVE, NULL);`
`491`		`- hash_search(relations, (const void *) &key, HASH_REMOVE, NULL);`
`492`	`491`	`break;`
`493`	`492`	`}`
`494`	`493`	`prel->children_count = 0;`
`495`		`- hash_search(relations, (const void *) &relid, HASH_REMOVE, 0);`
	`494`	`+ hash_search(relations, (const void *) &key, HASH_REMOVE, 0);`
`496`	`495`	`}`