From c504513f83a9ee8dce4a719746ca73102cae9f13 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Sun, 23 Dec 2012 18:25:03 -0500 Subject: Adjust many backend functions to return OID rather than void. Extracted from a larger patch by Dimitri Fontaine. It is hoped that this will provide infrastructure for enriching the new event trigger functionality, but it seems possibly useful for other purposes as well. --- src/backend/commands/dbcommands.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/backend/commands/dbcommands.c') diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 3c13c470fdc..c390575f422 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -900,7 +900,7 @@ dropdb(const char *dbname, bool missing_ok) /* * Rename database */ -void +Oid RenameDatabase(const char *oldname, const char *newname) { Oid db_id; @@ -977,6 +977,8 @@ RenameDatabase(const char *oldname, const char *newname) * Close pg_database, but keep lock till commit. */ heap_close(rel, NoLock); + + return db_id; } @@ -1436,9 +1438,10 @@ AlterDatabaseSet(AlterDatabaseSetStmt *stmt) /* * ALTER DATABASE name OWNER TO newowner */ -void +Oid AlterDatabaseOwner(const char *dbname, Oid newOwnerId) { + Oid db_id; HeapTuple tuple; Relation rel; ScanKeyData scankey; @@ -1463,6 +1466,7 @@ AlterDatabaseOwner(const char *dbname, Oid newOwnerId) (errcode(ERRCODE_UNDEFINED_DATABASE), errmsg("database \"%s\" does not exist", dbname))); + db_id = HeapTupleGetOid(tuple); datForm = (Form_pg_database) GETSTRUCT(tuple); /* @@ -1539,6 +1543,8 @@ AlterDatabaseOwner(const char *dbname, Oid newOwnerId) /* Close pg_database, but keep lock till commit */ heap_close(rel, NoLock); + + return db_id; } -- cgit v1.2.3