Commitd8f4109

committed

pathman: schema-qualified names aren't mandatory anymore

1 parent62d14ce commitd8f4109Copy full SHA for d8f4109

File tree

+15

-13

lines changed

+15

-13

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,6 @@ NOTICE: function test.hash_rel_hash_update_trigger_func() does not exist, skipp`
`333`	`333`	`(1 row)`
`334`	`334`
`335`	`335`	`DROP TABLE test.hash_rel CASCADE;`
`336`		`-NOTICE: drop cascades to 3 other objects`
`337`	`336`	`SELECT pathman.drop_range_partitions('test.num_range_rel');`
`338`	`337`	`drop_range_partitions`
`339`	`338`	`-----------------------`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,11 +108,17 @@ DECLARE`
`108`	`108`	`rec RECORD;`
`109`	`109`	`numINTEGER :=0;`
`110`	`110`	`BEGIN`
	`111`	`+ relation := @extschema@.validate_relname(relation);`
	`112`	`+`
`111`	`113`	`/* Drop trigger first*/`
`112`	`114`	`PERFORM @extschema@.drop_hash_triggers(relation);`
`113`	`115`	`DELETEFROM @extschema@.pathman_configWHERE relname= relation;`
`114`		`--- EXECUTE format('DROP TABLE %s CASCADE', relation);`
`115`		`-`
	`116`	`+`
	`117`	`+ FOR recin (SELECT*FROM pg_inheritsWHERE inhparent= relation::regclass::oid)`
	`118`	`+ LOOP`
	`119`	`+ EXECUTE format('DROP TABLE %s',rec.inhrelid::regclass::text);`
	`120`	`+ END LOOP;`
	`121`	`+`
`116`	`122`	`-- FOR rec in (SELECT * FROM pg_inherits WHERE inhparent = relation::regclass::oid)`
`117`	`123`	`-- LOOP`
`118`	`124`	`-- EXECUTE format('DROP FUNCTION IF EXISTS %s_hash_update_trigger_func() CASCADE'`

Lines changed: 6 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,26 +110,23 @@ LANGUAGE plpgsql;`
`110`	`110`	`CREATEOR REPLACE FUNCTION @extschema@.validate_relname(relnameTEXT)`
`111`	`111`	`RETURNSTEXTAS`
`112`	`112`	`$$`
`113`		`-DECLARE`
`114`		`- retTEXT :=lower(relname);`
`115`	`113`	`BEGIN`
`116`		`- IF NOT ret ~'^([a-z_]+[a-z0-9_])\.([a-z_]+[a-z0-9_])$' THEN`
`117`		`- RAISE EXCEPTION'Incorrect relation name. It must be fully qualified: <schema>.<relname>';`
`118`		`- END IF;`
`119`		`- RETURN ret;`
	`114`	`+ RETURN @extschema@.get_schema_qualified_name(relname::regclass,'.');`
`120`	`115`	`END`
`121`	`116`	`$$`
`122`	`117`	`LANGUAGE plpgsql;`
`123`	`118`
`124`	`119`
`125`	`120`	`/*`
`126`		`- *`
	`121`	`+ * Returns schema-qualified name for table`
`127`	`122`	`*/`
`128`		`-CREATEOR REPLACE FUNCTION @extschema@.get_schema_qualified_name(cls regclass)`
	`123`	`+CREATEOR REPLACE FUNCTION @extschema@.get_schema_qualified_name(`
	`124`	`+ cls REGCLASS`
	`125`	`+ , delimiterTEXT DEFAULT'_')`
`129`	`126`	`RETURNSTEXTAS`
`130`	`127`	`$$`
`131`	`128`	`BEGIN`
`132`		`- RETURN relnamespace::regnamespace\|\|'_'\|\| relnameFROM pg_classWHEREoid= cls::oid;`
	`129`	`+ RETURN relnamespace::regnamespace\|\|delimiter\|\| relnameFROM pg_classWHEREoid= cls::oid;`
`133`	`130`	`END`
`134`	`131`	`$$`
`135`	`132`	`LANGUAGE plpgsql;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ DECLARE`
`477`	`477`	`EXECUTE format(''INSERT INTO %%s SELECT $1.*'', v_part_relid::regclass)`
`478`	`478`	`USING NEW;`
`479`	`479`	`ELSE`
`480`		`- RAISE EXCEPTION''ERROR: Cannotdetermine approprite partition'';`
	`480`	`+ RAISE EXCEPTION''ERROR: Cannotfind partition'';`
`481`	`481`	`END IF;`
`482`	`482`	`END IF;`
`483`	`483`	`RETURN NULL;`

Comments

(0)