]> granicus.if.org Git - postgresql/blobdiff - src/backend/commands/dbcommands.c
This patch implement the TODO [ALTER DATABASE foo OWNER TO bar].
[postgresql] / src / backend / commands / dbcommands.c
index 802e68670153a870d49be0acd97d278704789d4f..02c1bf8e2042a9441486593ba0229765eab049fc 100644 (file)
 /*-------------------------------------------------------------------------
  *
  * dbcommands.c
+ *             Database management commands (create/drop database).
  *
  *
- * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
+ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.63 2000/10/28 16:20:54 vadim Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.134 2004/05/26 13:56:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "commands/dbcommands.h"
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
+#include "access/genam.h"
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/catalog.h"
 #include "catalog/pg_database.h"
 #include "catalog/pg_shadow.h"
+#include "catalog/indexing.h"
 #include "commands/comment.h"
+#include "commands/dbcommands.h"
 #include "miscadmin.h"
-#include "storage/sinval.h"            /* for DatabaseHasActiveBackends */
+#include "storage/fd.h"
+#include "storage/freespace.h"
+#include "storage/sinval.h"
+#include "utils/acl.h"
+#include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
+#include "utils/guc.h"
+#include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
+#include "mb/pg_wchar.h"               /* encoding check */
 
-/* non-export function prototypes */
-static bool
-                       get_user_info(Oid use_sysid, bool *use_super, bool *use_createdb);
-
-static bool
-                       get_db_info(const char *name, char *dbpath, Oid *dbIdP, int4 *ownerIdP);
 
+/* non-export function prototypes */
+static bool get_db_info(const char *name, Oid *dbIdP, int4 *ownerIdP,
+                       int *encodingP, bool *dbIsTemplateP, Oid *dbLastSysOidP,
+                       TransactionId *dbVacuumXidP, TransactionId *dbFrozenXidP,
+                       char *dbpath);
+static bool have_createdb_privilege(void);
+static char *resolve_alt_dbpath(const char *dbpath, Oid dboid);
+static bool remove_dbdirs(const char *real_loc, const char *altloc);
 
 /*
  * CREATE DATABASE
  */
 
 void
-createdb(const char *dbname, const char *dbpath, int encoding)
+createdb(const CreatedbStmt *stmt)
 {
+       char       *nominal_loc;
+       char       *alt_loc;
+       char       *target_dir;
+       char            src_loc[MAXPGPATH];
+#ifndef WIN32
        char            buf[2 * MAXPGPATH + 100];
-       char       *loc;
-       char            locbuf[512];
-       int                     ret;
-       bool            use_super,
-                               use_createdb;
+#endif
+       Oid                     src_dboid;
+       AclId           src_owner;
+       int                     src_encoding;
+       bool            src_istemplate;
+       Oid                     src_lastsysoid;
+       TransactionId src_vacuumxid;
+       TransactionId src_frozenxid;
+       char            src_dbpath[MAXPGPATH];
        Relation        pg_database_rel;
        HeapTuple       tuple;
        TupleDesc       pg_database_dsc;
        Datum           new_record[Natts_pg_database];
-       char            new_record_nulls[Natts_pg_database] = {' ', ' ', ' ', ' ', ' '};
+       char            new_record_nulls[Natts_pg_database];
        Oid                     dboid;
+       AclId           datdba;
+       ListCell   *option;
+       DefElem    *downer = NULL;
+       DefElem    *dpath = NULL;
+       DefElem    *dtemplate = NULL;
+       DefElem    *dencoding = NULL;
+       char       *dbname = stmt->dbname;
+       char       *dbowner = NULL;
+       char       *dbpath = NULL;
+       char       *dbtemplate = NULL;
+       int                     encoding = -1;
+
+       /* Extract options from the statement node tree */
+       foreach(option, stmt->options)
+       {
+               DefElem    *defel = (DefElem *) lfirst(option);
 
-       if (!get_user_info(GetUserId(), &use_super, &use_createdb))
-               elog(ERROR, "current user name is invalid");
-
-       if (!use_createdb && !use_super)
-               elog(ERROR, "CREATE DATABASE: permission denied");
+               if (strcmp(defel->defname, "owner") == 0)
+               {
+                       if (downer)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_SYNTAX_ERROR),
+                                                errmsg("conflicting or redundant options")));
+                       downer = defel;
+               }
+               else if (strcmp(defel->defname, "location") == 0)
+               {
+                       if (dpath)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_SYNTAX_ERROR),
+                                                errmsg("conflicting or redundant options")));
+                       dpath = defel;
+               }
+               else if (strcmp(defel->defname, "template") == 0)
+               {
+                       if (dtemplate)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_SYNTAX_ERROR),
+                                                errmsg("conflicting or redundant options")));
+                       dtemplate = defel;
+               }
+               else if (strcmp(defel->defname, "encoding") == 0)
+               {
+                       if (dencoding)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_SYNTAX_ERROR),
+                                                errmsg("conflicting or redundant options")));
+                       dencoding = defel;
+               }
+               else
+                       elog(ERROR, "option \"%s\" not recognized",
+                                defel->defname);
+       }
 
-       if (get_db_info(dbname, NULL, NULL, NULL))
-               elog(ERROR, "CREATE DATABASE: database \"%s\" already exists", dbname);
+       if (downer && downer->arg)
+               dbowner = strVal(downer->arg);
+       if (dpath && dpath->arg)
+               dbpath = strVal(dpath->arg);
+       if (dtemplate && dtemplate->arg)
+               dbtemplate = strVal(dtemplate->arg);
+       if (dencoding && dencoding->arg)
+       {
+               const char *encoding_name;
 
-       /* don't call this in a transaction block */
-       if (IsTransactionBlock())
-               elog(ERROR, "CREATE DATABASE: may not be called in a transaction block");
+               if (IsA(dencoding->arg, Integer))
+               {
+                       encoding = intVal(dencoding->arg);
+                       encoding_name = pg_encoding_to_char(encoding);
+                       if (strcmp(encoding_name, "") == 0 ||
+                               pg_valid_server_encoding(encoding_name) < 0)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_UNDEFINED_OBJECT),
+                                                errmsg("%d is not a valid encoding code",
+                                                               encoding)));
+               }
+               else if (IsA(dencoding->arg, String))
+               {
+                       encoding_name = strVal(dencoding->arg);
+                       if (pg_valid_server_encoding(encoding_name) < 0)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_UNDEFINED_OBJECT),
+                                                errmsg("%s is not a valid encoding name",
+                                                               encoding_name)));
+                       encoding = pg_char_to_encoding(encoding_name);
+               }
+               else
+                       elog(ERROR, "unrecognized node type: %d",
+                                nodeTag(dencoding->arg));
+       }
 
-#ifdef OLD_FILE_NAMING
-       /* Generate directory name for the new database */
-       if (dbpath == NULL || strcmp(dbpath, dbname) == 0)
-               strcpy(locbuf, dbname);
+       /* obtain sysid of proposed owner */
+       if (dbowner)
+               datdba = get_usesysid(dbowner); /* will ereport if no such user */
        else
-               snprintf(locbuf, sizeof(locbuf), "%s/%s", dbpath, dbname);
+               datdba = GetUserId();
 
-       loc = ExpandDatabasePath(locbuf);
+       if (datdba == GetUserId())
+       {
+               /* creating database for self: can be superuser or createdb */
+               if (!superuser() && !have_createdb_privilege())
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+                                        errmsg("permission denied to create database")));
+       }
+       else
+       {
+               /* creating database for someone else: must be superuser */
+               /* note that the someone else need not have any permissions */
+               if (!superuser())
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+                                        errmsg("must be superuser to create database for another user")));
+       }
 
-       if (loc == NULL)
-               elog(ERROR,
-                        "The database path '%s' is invalid. "
-                        "This may be due to a character that is not allowed or because the chosen "
-                        "path isn't permitted for databases", dbpath);
-#else
-       locbuf[0] = 0; /* Avoid junk in strings */
+       /* don't call this in a transaction block */
+       PreventTransactionChain((void *) stmt, "CREATE DATABASE");
+
+       /* alternate location requires symlinks */
+#ifndef HAVE_SYMLINK
+       if (dbpath != NULL)
+               ereport(ERROR,
+                               (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+                  errmsg("cannot use an alternative location on this platform")));
 #endif
 
        /*
-        * Insert a new tuple into pg_database
+        * Check for db name conflict.  There is a race condition here, since
+        * another backend could create the same DB name before we commit.
+        * However, holding an exclusive lock on pg_database for the whole
+        * time we are copying the source database doesn't seem like a good
+        * idea, so accept possibility of race to create.  We will check again
+        * after we grab the exclusive lock.
         */
-       pg_database_rel = heap_openr(DatabaseRelationName, AccessExclusiveLock);
-       pg_database_dsc = RelationGetDescr(pg_database_rel);
+       if (get_db_info(dbname, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL))
+               ereport(ERROR,
+                               (errcode(ERRCODE_DUPLICATE_DATABASE),
+                                errmsg("database \"%s\" already exists", dbname)));
 
-       /* 
-        * Preassign OID for pg_database tuple, so that we know current
-        * OID counter value
+       /*
+        * Lookup database (template) to be cloned.
         */
-       dboid = newoid();
-
-       /* Form tuple */
-       new_record[Anum_pg_database_datname - 1] = DirectFunctionCall1(namein,
-                                                                                                       CStringGetDatum(dbname));
-       new_record[Anum_pg_database_datdba - 1] = Int32GetDatum(GetUserId());
-       new_record[Anum_pg_database_encoding - 1] = Int32GetDatum(encoding);
-       new_record[Anum_pg_database_datlastsysoid - 1] = ObjectIdGetDatum(dboid); /* Save current OID val */
-       new_record[Anum_pg_database_datpath - 1] = DirectFunctionCall1(textin,
-                                                                                                       CStringGetDatum(locbuf));
+       if (!dbtemplate)
+               dbtemplate = "template1";               /* Default template database name */
 
-       tuple = heap_formtuple(pg_database_dsc, new_record, new_record_nulls);
+       if (!get_db_info(dbtemplate, &src_dboid, &src_owner, &src_encoding,
+                                        &src_istemplate, &src_lastsysoid,
+                                        &src_vacuumxid, &src_frozenxid,
+                                        src_dbpath))
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_DATABASE),
+                                errmsg("template database \"%s\" does not exist", dbtemplate)));
 
-       tuple->t_data->t_oid = dboid;   /* override heap_insert */
+       /*
+        * Permission check: to copy a DB that's not marked datistemplate, you
+        * must be superuser or the owner thereof.
+        */
+       if (!src_istemplate)
+       {
+               if (!superuser() && GetUserId() != src_owner)
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+                                        errmsg("permission denied to copy database \"%s\"",
+                                                       dbtemplate)));
+       }
 
+       /*
+        * Determine physical path of source database
+        */
+       alt_loc = resolve_alt_dbpath(src_dbpath, src_dboid);
+       if (!alt_loc)
+               alt_loc = GetDatabasePath(src_dboid);
+       strcpy(src_loc, alt_loc);
 
        /*
-        * Update table
+        * The source DB can't have any active backends, except this one
+        * (exception is to allow CREATE DB while connected to template1).
+        * Otherwise we might copy inconsistent data.  This check is not
+        * bulletproof, since someone might connect while we are copying...
         */
-       heap_insert(pg_database_rel, tuple);
+       if (DatabaseHasActiveBackends(src_dboid, true))
+               ereport(ERROR,
+                               (errcode(ERRCODE_OBJECT_IN_USE),
+               errmsg("source database \"%s\" is being accessed by other users",
+                          dbtemplate)));
+
+       /* If encoding is defaulted, use source's encoding */
+       if (encoding < 0)
+               encoding = src_encoding;
+
+       /* Some encodings are client only */
+       if (!PG_VALID_BE_ENCODING(encoding))
+               ereport(ERROR,
+                               (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                errmsg("invalid server encoding %d", encoding)));
 
-#ifndef OLD_FILE_NAMING
-       loc = GetDatabasePath(tuple->t_data->t_oid);
-#endif
+       /*
+        * Preassign OID for pg_database tuple, so that we can compute db
+        * path.
+        */
+       dboid = newoid();
 
        /*
-        * Update indexes (there aren't any currently)
+        * Compute nominal location (where we will try to access the
+        * database), and resolve alternate physical location if one is
+        * specified.
+        *
+        * If an alternate location is specified but is the same as the normal
+        * path, just drop the alternate-location spec (this seems friendlier
+        * than erroring out).  We must test this case to avoid creating a
+        * circular symlink below.
         */
-#ifdef Num_pg_database_indices
-       if (RelationGetForm(pg_database_rel)->relhasindex)
-       {
-               Relation        idescs[Num_pg_database_indices];
+       nominal_loc = GetDatabasePath(dboid);
+       alt_loc = resolve_alt_dbpath(dbpath, dboid);
 
-               CatalogOpenIndices(Num_pg_database_indices,
-                                                  Name_pg_database_indices, idescs);
-               CatalogIndexInsert(idescs, Num_pg_database_indices, pg_database_rel,
-                                                  tuple);
-               CatalogCloseIndices(Num_pg_database_indices, idescs);
+       if (alt_loc && strcmp(alt_loc, nominal_loc) == 0)
+       {
+               alt_loc = NULL;
+               dbpath = NULL;
        }
-#endif
 
-       heap_close(pg_database_rel, NoLock);
+       if (strchr(nominal_loc, '\''))
+               ereport(ERROR,
+                               (errcode(ERRCODE_INVALID_NAME),
+                                errmsg("database path may not contain single quotes")));
+       if (alt_loc && strchr(alt_loc, '\''))
+               ereport(ERROR,
+                               (errcode(ERRCODE_INVALID_NAME),
+                                errmsg("database path may not contain single quotes")));
+       if (strchr(src_loc, '\''))
+               ereport(ERROR,
+                               (errcode(ERRCODE_INVALID_NAME),
+                                errmsg("database path may not contain single quotes")));
+       /* ... otherwise we'd be open to shell exploits below */
+
+       /*
+        * Force dirty buffers out to disk, to ensure source database is
+        * up-to-date for the copy.  (We really only need to flush buffers for
+        * the source database...)
+        */
+       BufferSync(-1, -1);
 
        /*
         * Close virtual file descriptors so the kernel has more available for
@@ -154,100 +328,165 @@ createdb(const char *dbname, const char *dbpath, int encoding)
         */
        closeAllVfds();
 
-       /* Copy the template database to the new location */
-
-       if (mkdir(loc, S_IRWXU) != 0)
-               elog(ERROR, "CREATE DATABASE: unable to create database directory '%s': %s", loc, strerror(errno));
-
-#ifdef OLD_FILE_NAMING
-       snprintf(buf, sizeof(buf), "cp %s%cbase%ctemplate1%c* '%s'",
-                        DataDir, SEP_CHAR, SEP_CHAR, SEP_CHAR, loc);
-#else
+       /*
+        * Check we can create the target directory --- but then remove it
+        * because we rely on cp(1) to create it for real.
+        */
+       target_dir = alt_loc ? alt_loc : nominal_loc;
+
+       if (mkdir(target_dir, S_IRWXU) != 0)
+               ereport(ERROR,
+                               (errcode_for_file_access(),
+                                errmsg("could not create database directory \"%s\": %m",
+                                               target_dir)));
+       if (rmdir(target_dir) != 0)
+               ereport(ERROR,
+                               (errcode_for_file_access(),
+                                errmsg("could not remove temporary directory \"%s\": %m",
+                                               target_dir)));
+
+       /* Make the symlink, if needed */
+       if (alt_loc)
        {
-               char   *tmpl = GetDatabasePath(TemplateDbOid);
-
-               snprintf(buf, sizeof(buf), "cp %s%c* '%s'",
-                       tmpl, SEP_CHAR, loc);
-               pfree(tmpl);
-       }
+#ifdef HAVE_SYMLINK                            /* already throws error above */
+               if (symlink(alt_loc, nominal_loc) != 0)
 #endif
+                       ereport(ERROR,
+                                       (errcode_for_file_access(),
+                                        errmsg("could not link file \"%s\" to \"%s\": %m",
+                                                       nominal_loc, alt_loc)));
+       }
 
-       ret = system(buf);
-       /* Some versions of SunOS seem to return ECHILD after a system() call */
-#if defined(sun)
-       if (ret != 0 && errno != ECHILD)
-#else
-       if (ret != 0)
-#endif
+       /*
+        * Copy the template database to the new location
+        *
+        * XXX use of cp really makes this code pretty grotty, particularly
+        * with respect to lack of ability to report errors well.  Someday
+        * rewrite to do it for ourselves.
+        */
+#ifndef WIN32
+       /* We might need to use cp -R one day for portability */
+       snprintf(buf, sizeof(buf), "cp -r '%s' '%s'", src_loc, target_dir);
+       if (system(buf) != 0)
        {
-               /* Failed, so try to clean up the created directory ... */
-               snprintf(buf, sizeof(buf), "rm -rf '%s'", loc);
-               ret = system(buf);
-#if defined(sun)
-               if (ret == 0 || errno == ECHILD)
-#else
-               if (ret == 0)
-#endif
-                       elog(ERROR, "CREATE DATABASE: could not initialize database directory");
+               if (remove_dbdirs(nominal_loc, alt_loc))
+                       ereport(ERROR,
+                                       (errmsg("could not initialize database directory"),
+                                        errdetail("Failing system command was: %s", buf),
+                                        errhint("Look in the postmaster's stderr log for more information.")));
+               else
+                       ereport(ERROR,
+                                       (errmsg("could not initialize database directory; delete failed as well"),
+                                        errdetail("Failing system command was: %s", buf),
+                                        errhint("Look in the postmaster's stderr log for more information.")));
+       }
+#else  /* WIN32 */
+       if (copydir(src_loc, target_dir) != 0)
+       {
+               /* copydir should already have given details of its troubles */
+               if (remove_dbdirs(nominal_loc, alt_loc))
+                       ereport(ERROR,
+                                       (errmsg("could not initialize database directory")));
                else
-                       elog(ERROR, "CREATE DATABASE: Could not initialize database directory. Delete failed as well");
+                       ereport(ERROR,
+                                       (errmsg("could not initialize database directory; delete failed as well")));
        }
+#endif /* WIN32 */
 
-#ifdef XLOG
-       BufferSync();
-#endif
-}
+       /*
+        * Now OK to grab exclusive lock on pg_database.
+        */
+       pg_database_rel = heap_openr(DatabaseRelationName, AccessExclusiveLock);
+
+       /* Check to see if someone else created same DB name meanwhile. */
+       if (get_db_info(dbname, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL))
+       {
+               /* Don't hold lock while doing recursive remove */
+               heap_close(pg_database_rel, AccessExclusiveLock);
+               remove_dbdirs(nominal_loc, alt_loc);
+               ereport(ERROR,
+                               (errcode(ERRCODE_DUPLICATE_DATABASE),
+                                errmsg("database \"%s\" already exists", dbname)));
+       }
+
+       /*
+        * Insert a new tuple into pg_database
+        */
+       pg_database_dsc = RelationGetDescr(pg_database_rel);
+
+       /* Form tuple */
+       MemSet(new_record, 0, sizeof(new_record));
+       MemSet(new_record_nulls, ' ', sizeof(new_record_nulls));
 
+       new_record[Anum_pg_database_datname - 1] =
+               DirectFunctionCall1(namein, CStringGetDatum(dbname));
+       new_record[Anum_pg_database_datdba - 1] = Int32GetDatum(datdba);
+       new_record[Anum_pg_database_encoding - 1] = Int32GetDatum(encoding);
+       new_record[Anum_pg_database_datistemplate - 1] = BoolGetDatum(false);
+       new_record[Anum_pg_database_datallowconn - 1] = BoolGetDatum(true);
+       new_record[Anum_pg_database_datlastsysoid - 1] = ObjectIdGetDatum(src_lastsysoid);
+       new_record[Anum_pg_database_datvacuumxid - 1] = TransactionIdGetDatum(src_vacuumxid);
+       new_record[Anum_pg_database_datfrozenxid - 1] = TransactionIdGetDatum(src_frozenxid);
+       /* do not set datpath to null, GetRawDatabaseInfo won't cope */
+       new_record[Anum_pg_database_datpath - 1] =
+               DirectFunctionCall1(textin, CStringGetDatum(dbpath ? dbpath : ""));
+
+       /*
+        * We deliberately set datconfig and datacl to defaults (NULL), rather
+        * than copying them from the template database.  Copying datacl would
+        * be a bad idea when the owner is not the same as the template's
+        * owner. It's more debatable whether datconfig should be copied.
+        */
+       new_record_nulls[Anum_pg_database_datconfig - 1] = 'n';
+       new_record_nulls[Anum_pg_database_datacl - 1] = 'n';
+
+       tuple = heap_formtuple(pg_database_dsc, new_record, new_record_nulls);
+
+       HeapTupleSetOid(tuple, dboid);          /* override heap_insert's OID
+                                                                                * selection */
+
+       simple_heap_insert(pg_database_rel, tuple);
+
+       /* Update indexes */
+       CatalogUpdateIndexes(pg_database_rel, tuple);
+
+       /* Close pg_database, but keep lock till commit */
+       heap_close(pg_database_rel, NoLock);
+
+       /*
+        * Force dirty buffers out to disk, so that newly-connecting backends
+        * will see the new database in pg_database right away.  (They'll see
+        * an uncommitted tuple, but they don't care; see GetRawDatabaseInfo.)
+        */
+       BufferSync(-1, -1);
+}
 
 
 /*
  * DROP DATABASE
  */
-
 void
 dropdb(const char *dbname)
 {
        int4            db_owner;
-       bool            use_super;
+       bool            db_istemplate;
        Oid                     db_id;
-       char       *path,
-                               dbpath[MAXPGPATH],
-                               buf[MAXPGPATH + 100];
+       char       *alt_loc;
+       char       *nominal_loc;
+       char            dbpath[MAXPGPATH];
        Relation        pgdbrel;
-       HeapScanDesc pgdbscan;
+       SysScanDesc pgdbscan;
        ScanKeyData key;
        HeapTuple       tup;
 
        AssertArg(dbname);
 
-       if (strcmp(dbname, "template1") == 0)
-               elog(ERROR, "DROP DATABASE: May not be executed on the template1 database");
-
-       if (strcmp(dbname, DatabaseName) == 0)
-               elog(ERROR, "DROP DATABASE: Cannot be executed on the currently open database");
-
-       if (IsTransactionBlock())
-               elog(ERROR, "DROP DATABASE: May not be called in a transaction block");
-
-       if (!get_user_info(GetUserId(), &use_super, NULL))
-               elog(ERROR, "Current user name is invalid");
-
-       if (!get_db_info(dbname, dbpath, &db_id, &db_owner))
-               elog(ERROR, "DROP DATABASE: Database \"%s\" does not exist", dbname);
+       if (strcmp(dbname, get_database_name(MyDatabaseId)) == 0)
+               ereport(ERROR,
+                               (errcode(ERRCODE_OBJECT_IN_USE),
+                                errmsg("cannot drop the currently open database")));
 
-       if (GetUserId() != db_owner && !use_super)
-               elog(ERROR, "DROP DATABASE: Permission denied");
-
-#ifdef OLD_FILE_NAMING
-       path = ExpandDatabasePath(dbpath);
-       if (path == NULL)
-               elog(ERROR,
-                        "The database path '%s' is invalid. "
-                        "This may be due to a character that is not allowed or because the chosen "
-                        "path isn't permitted for databases", path);
-#else
-       path = GetDatabasePath(db_id);
-#endif
+       PreventTransactionChain((void *) dbname, "DROP DATABASE");
 
        /*
         * Obtain exclusive lock on pg_database.  We need this to ensure that
@@ -260,43 +499,72 @@ dropdb(const char *dbname)
         */
        pgdbrel = heap_openr(DatabaseRelationName, AccessExclusiveLock);
 
+       if (!get_db_info(dbname, &db_id, &db_owner, NULL,
+                                        &db_istemplate, NULL, NULL, NULL, dbpath))
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_DATABASE),
+                                errmsg("database \"%s\" does not exist", dbname)));
+
+       if (GetUserId() != db_owner && !superuser())
+               aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+                                          dbname);
+
+       /*
+        * Disallow dropping a DB that is marked istemplate.  This is just to
+        * prevent people from accidentally dropping template0 or template1;
+        * they can do so if they're really determined ...
+        */
+       if (db_istemplate)
+               ereport(ERROR,
+                               (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                errmsg("cannot drop a template database")));
+
+       nominal_loc = GetDatabasePath(db_id);
+       alt_loc = resolve_alt_dbpath(dbpath, db_id);
+
        /*
         * Check for active backends in the target database.
         */
-       if (DatabaseHasActiveBackends(db_id))
-       {
-               heap_close(pgdbrel, AccessExclusiveLock);
-               elog(ERROR, "DROP DATABASE: Database \"%s\" is being accessed by other users", dbname);
-       }
+       if (DatabaseHasActiveBackends(db_id, false))
+               ereport(ERROR,
+                               (errcode(ERRCODE_OBJECT_IN_USE),
+                          errmsg("database \"%s\" is being accessed by other users",
+                                         dbname)));
 
        /*
-        * Find the database's tuple by OID (should be unique, we trust).
+        * Find the database's tuple by OID (should be unique).
         */
-       ScanKeyEntryInitialize(&key, 0, ObjectIdAttributeNumber,
-                                                  F_OIDEQ, ObjectIdGetDatum(db_id));
+       ScanKeyInit(&key,
+                               ObjectIdAttributeNumber,
+                               BTEqualStrategyNumber, F_OIDEQ,
+                               ObjectIdGetDatum(db_id));
 
-       pgdbscan = heap_beginscan(pgdbrel, 0, SnapshotNow, 1, &key);
+       pgdbscan = systable_beginscan(pgdbrel, DatabaseOidIndex, true,
+                                                                 SnapshotNow, 1, &key);
 
-       tup = heap_getnext(pgdbscan, 0);
+       tup = systable_getnext(pgdbscan);
        if (!HeapTupleIsValid(tup))
        {
-               heap_close(pgdbrel, AccessExclusiveLock);
-
                /*
                 * This error should never come up since the existence of the
                 * database is checked earlier
                 */
-               elog(ERROR, "DROP DATABASE: Database \"%s\" doesn't exist despite earlier reports to the contrary",
+               elog(ERROR, "database \"%s\" doesn't exist despite earlier reports to the contrary",
                         dbname);
        }
 
-       /* Delete any comments associated with the database */
-       DeleteComments(db_id);
-
        /* Remove the database's tuple from pg_database */
-       heap_delete(pgdbrel, &tup->t_self, NULL);
+       simple_heap_delete(pgdbrel, &tup->t_self);
+
+       systable_endscan(pgdbscan);
 
-       heap_endscan(pgdbscan);
+       /*
+        * Delete any comments associated with the database
+        *
+        * NOTE: this is probably dead code since any such comments should have
+        * been in that database, not mine.
+        */
+       DeleteComments(db_id, RelationGetRelid(pgdbrel), 0);
 
        /*
         * Close pg_database, but keep exclusive lock till commit to ensure
@@ -312,117 +580,533 @@ dropdb(const char *dbname)
        DropBuffers(db_id);
 
        /*
-        * Close virtual file descriptors so the kernel has more available for
-        * the system() call below.
+        * Also, clean out any entries in the shared free space map.
         */
-       closeAllVfds();
+       FreeSpaceMapForgetDatabase(db_id);
 
        /*
         * Remove the database's subdirectory and everything in it.
         */
-       snprintf(buf, sizeof(buf), "rm -rf '%s'", path);
-#if defined(sun)
-       if (system(buf) != 0 && errno != ECHILD)
-#else
-       if (system(buf) != 0)
-#endif
-               elog(NOTICE, "DROP DATABASE: The database directory '%s' could not be removed", path);
+       remove_dbdirs(nominal_loc, alt_loc);
+
+       /*
+        * Force dirty buffers out to disk, so that newly-connecting backends
+        * will see the database tuple marked dead in pg_database right away.
+        * (They'll see an uncommitted deletion, but they don't care; see
+        * GetRawDatabaseInfo.)
+        */
+       BufferSync(-1, -1);
 }
 
 
+/*
+ * Rename database
+ */
+void
+RenameDatabase(const char *oldname, const char *newname)
+{
+       HeapTuple       tup,
+                               newtup;
+       Relation        rel;
+       SysScanDesc scan,
+                               scan2;
+       ScanKeyData key,
+                               key2;
+
+       /*
+        * Obtain AccessExclusiveLock so that no new session gets started
+        * while the rename is in progress.
+        */
+       rel = heap_openr(DatabaseRelationName, AccessExclusiveLock);
+
+       ScanKeyInit(&key,
+                               Anum_pg_database_datname,
+                               BTEqualStrategyNumber, F_NAMEEQ,
+                               NameGetDatum(oldname));
+       scan = systable_beginscan(rel, DatabaseNameIndex, true,
+                                                         SnapshotNow, 1, &key);
+
+       tup = systable_getnext(scan);
+       if (!HeapTupleIsValid(tup))
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_DATABASE),
+                                errmsg("database \"%s\" does not exist", oldname)));
+
+       /*
+        * XXX Client applications probably store the current database
+        * somewhere, so renaming it could cause confusion.  On the other
+        * hand, there may not be an actual problem besides a little
+        * confusion, so think about this and decide.
+        */
+       if (HeapTupleGetOid(tup) == MyDatabaseId)
+               ereport(ERROR,
+                               (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+                                errmsg("current database may not be renamed")));
+
+       /*
+        * Make sure the database does not have active sessions.  Might not be
+        * necessary, but it's consistent with other database operations.
+        */
+       if (DatabaseHasActiveBackends(HeapTupleGetOid(tup), false))
+               ereport(ERROR,
+                               (errcode(ERRCODE_OBJECT_IN_USE),
+                          errmsg("database \"%s\" is being accessed by other users",
+                                         oldname)));
+
+       /* make sure the new name doesn't exist */
+       ScanKeyInit(&key2,
+                               Anum_pg_database_datname,
+                               BTEqualStrategyNumber, F_NAMEEQ,
+                               NameGetDatum(newname));
+       scan2 = systable_beginscan(rel, DatabaseNameIndex, true,
+                                                          SnapshotNow, 1, &key2);
+       if (HeapTupleIsValid(systable_getnext(scan2)))
+               ereport(ERROR,
+                               (errcode(ERRCODE_DUPLICATE_DATABASE),
+                                errmsg("database \"%s\" already exists", newname)));
+       systable_endscan(scan2);
+
+       /* must be owner */
+       if (!pg_database_ownercheck(HeapTupleGetOid(tup), GetUserId()))
+               aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+                                          oldname);
+
+       /* must have createdb */
+       if (!have_createdb_privilege())
+               ereport(ERROR,
+                               (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+                                errmsg("permission denied to rename database")));
+
+       /* rename */
+       newtup = heap_copytuple(tup);
+       namestrcpy(&(((Form_pg_database) GETSTRUCT(newtup))->datname), newname);
+       simple_heap_update(rel, &tup->t_self, newtup);
+       CatalogUpdateIndexes(rel, newtup);
+
+       systable_endscan(scan);
+       heap_close(rel, NoLock);
+
+       /*
+        * Force dirty buffers out to disk, so that newly-connecting backends
+        * will see the renamed database in pg_database right away.  (They'll
+        * see an uncommitted tuple, but they don't care; see
+        * GetRawDatabaseInfo.)
+        */
+       BufferSync(-1, -1);
+}
+
+
+/*
+ * ALTER DATABASE name SET ...
+ */
+void
+AlterDatabaseSet(AlterDatabaseSetStmt *stmt)
+{
+       char       *valuestr;
+       HeapTuple       tuple,
+                               newtuple;
+       Relation        rel;
+       ScanKeyData scankey;
+       SysScanDesc scan;
+       Datum           repl_val[Natts_pg_database];
+       char            repl_null[Natts_pg_database];
+       char            repl_repl[Natts_pg_database];
+
+       valuestr = flatten_set_variable_args(stmt->variable, stmt->value);
+
+       rel = heap_openr(DatabaseRelationName, RowExclusiveLock);
+       ScanKeyInit(&scankey,
+                               Anum_pg_database_datname,
+                               BTEqualStrategyNumber, F_NAMEEQ,
+                               NameGetDatum(stmt->dbname));
+       scan = systable_beginscan(rel, DatabaseNameIndex, true,
+                                                         SnapshotNow, 1, &scankey);
+       tuple = systable_getnext(scan);
+       if (!HeapTupleIsValid(tuple))
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_DATABASE),
+                                errmsg("database \"%s\" does not exist", stmt->dbname)));
+
+       if (!(superuser()
+               || ((Form_pg_database) GETSTRUCT(tuple))->datdba == GetUserId()))
+               aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+                                          stmt->dbname);
+
+       MemSet(repl_repl, ' ', sizeof(repl_repl));
+       repl_repl[Anum_pg_database_datconfig - 1] = 'r';
+
+       if (strcmp(stmt->variable, "all") == 0 && valuestr == NULL)
+       {
+               /* RESET ALL */
+               repl_null[Anum_pg_database_datconfig - 1] = 'n';
+               repl_val[Anum_pg_database_datconfig - 1] = (Datum) 0;
+       }
+       else
+       {
+               Datum           datum;
+               bool            isnull;
+               ArrayType  *a;
+
+               repl_null[Anum_pg_database_datconfig - 1] = ' ';
+
+               datum = heap_getattr(tuple, Anum_pg_database_datconfig,
+                                                        RelationGetDescr(rel), &isnull);
+
+               a = isnull ? NULL : DatumGetArrayTypeP(datum);
+
+               if (valuestr)
+                       a = GUCArrayAdd(a, stmt->variable, valuestr);
+               else
+                       a = GUCArrayDelete(a, stmt->variable);
+
+               if (a)
+                       repl_val[Anum_pg_database_datconfig - 1] = PointerGetDatum(a);
+               else
+                       repl_null[Anum_pg_database_datconfig - 1] = 'n';
+       }
+
+       newtuple = heap_modifytuple(tuple, rel, repl_val, repl_null, repl_repl);
+       simple_heap_update(rel, &tuple->t_self, newtuple);
+
+       /* Update indexes */
+       CatalogUpdateIndexes(rel, newtuple);
+
+       systable_endscan(scan);
+       heap_close(rel, RowExclusiveLock);
+}
+
+
+/*
+ * ALTER DATABASE name OWNER TO newowner
+ */
+void
+AlterDatabaseOwner(const char *dbname, const char *newowner)
+{
+       AclId           newdatdba;
+       HeapTuple       tuple,
+                               newtuple;
+       Relation        rel;
+       ScanKeyData scankey;
+       SysScanDesc scan;
+
+       rel = heap_openr(DatabaseRelationName, RowExclusiveLock);
+       ScanKeyInit(&scankey,
+                               Anum_pg_database_datname,
+                               BTEqualStrategyNumber, F_NAMEEQ,
+                               NameGetDatum(dbname));
+       scan = systable_beginscan(rel, DatabaseNameIndex, true,
+                                                         SnapshotNow, 1, &scankey);
+       tuple = systable_getnext(scan);
+       if (!HeapTupleIsValid(tuple))
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_DATABASE),
+                                errmsg("database \"%s\" does not exist", dbname)));
+
+       /* obtain sysid of proposed owner */
+       newdatdba = get_usesysid(newowner); /* will ereport if no such user */
+
+       /* changing owner's database for someone else: must be superuser */
+       /* note that the someone else need not have any permissions */
+       if (!superuser())
+               ereport(ERROR,
+                               (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+                                errmsg("must be superuser to change owner's database for another user")));
+
+       /* change owner */
+       newtuple = heap_copytuple(tuple);
+       ((Form_pg_database) GETSTRUCT(newtuple))->datdba = newdatdba;
+       simple_heap_update(rel, &tuple->t_self, newtuple);
+       CatalogUpdateIndexes(rel, newtuple);
+
+       systable_endscan(scan);
+       heap_close(rel, NoLock);
+}
+
 
 /*
  * Helper functions
  */
 
 static bool
-get_db_info(const char *name, char *dbpath, Oid *dbIdP, int4 *ownerIdP)
+get_db_info(const char *name, Oid *dbIdP, int4 *ownerIdP,
+                       int *encodingP, bool *dbIsTemplateP, Oid *dbLastSysOidP,
+                       TransactionId *dbVacuumXidP, TransactionId *dbFrozenXidP,
+                       char *dbpath)
 {
        Relation        relation;
-       HeapTuple       tuple;
        ScanKeyData scanKey;
-       HeapScanDesc scan;
+       SysScanDesc scan;
+       HeapTuple       tuple;
+       bool            gottuple;
 
        AssertArg(name);
 
-       relation = heap_openr(DatabaseRelationName, AccessExclusiveLock /* ??? */ );
+       /* Caller may wish to grab a better lock on pg_database beforehand... */
+       relation = heap_openr(DatabaseRelationName, AccessShareLock);
 
-       ScanKeyEntryInitialize(&scanKey, 0, Anum_pg_database_datname,
-                                                  F_NAMEEQ, NameGetDatum(name));
+       ScanKeyInit(&scanKey,
+                               Anum_pg_database_datname,
+                               BTEqualStrategyNumber, F_NAMEEQ,
+                               NameGetDatum(name));
 
-       scan = heap_beginscan(relation, 0, SnapshotNow, 1, &scanKey);
-       if (!HeapScanIsValid(scan))
-               elog(ERROR, "Cannot begin scan of %s.", DatabaseRelationName);
+       scan = systable_beginscan(relation, DatabaseNameIndex, true,
+                                                         SnapshotNow, 1, &scanKey);
 
-       tuple = heap_getnext(scan, 0);
+       tuple = systable_getnext(scan);
 
-       if (HeapTupleIsValid(tuple))
+       gottuple = HeapTupleIsValid(tuple);
+       if (gottuple)
        {
-               text       *tmptext;
-               bool            isnull;
+               Form_pg_database dbform = (Form_pg_database) GETSTRUCT(tuple);
 
                /* oid of the database */
                if (dbIdP)
-                       *dbIdP = tuple->t_data->t_oid;
-               /* uid of the owner */
+                       *dbIdP = HeapTupleGetOid(tuple);
+               /* sysid of the owner */
                if (ownerIdP)
-               {
-                       *ownerIdP = (int4) heap_getattr(tuple,
-                                                                                       Anum_pg_database_datdba,
-                                                                                       RelationGetDescr(relation),
-                                                                                       &isnull);
-                       if (isnull)
-                               *ownerIdP = -1; /* hopefully no one has that id already ;) */
-               }
+                       *ownerIdP = dbform->datdba;
+               /* character encoding */
+               if (encodingP)
+                       *encodingP = dbform->encoding;
+               /* allowed as template? */
+               if (dbIsTemplateP)
+                       *dbIsTemplateP = dbform->datistemplate;
+               /* last system OID used in database */
+               if (dbLastSysOidP)
+                       *dbLastSysOidP = dbform->datlastsysoid;
+               /* limit of vacuumed XIDs */
+               if (dbVacuumXidP)
+                       *dbVacuumXidP = dbform->datvacuumxid;
+               /* limit of frozen XIDs */
+               if (dbFrozenXidP)
+                       *dbFrozenXidP = dbform->datfrozenxid;
                /* database path (as registered in pg_database) */
                if (dbpath)
                {
-                       tmptext = (text *) heap_getattr(tuple,
-                                                                                       Anum_pg_database_datpath,
-                                                                                       RelationGetDescr(relation),
-                                                                                       &isnull);
+                       Datum           datum;
+                       bool            isnull;
 
+                       datum = heap_getattr(tuple,
+                                                                Anum_pg_database_datpath,
+                                                                RelationGetDescr(relation),
+                                                                &isnull);
                        if (!isnull)
                        {
-                               Assert(VARSIZE(tmptext) - VARHDRSZ < MAXPGPATH);
+                               text       *pathtext = DatumGetTextP(datum);
+                               int                     pathlen = VARSIZE(pathtext) - VARHDRSZ;
 
-                               strncpy(dbpath, VARDATA(tmptext), VARSIZE(tmptext) - VARHDRSZ);
-                               *(dbpath + VARSIZE(tmptext) - VARHDRSZ) = '\0';
+                               Assert(pathlen >= 0 && pathlen < MAXPGPATH);
+                               strncpy(dbpath, VARDATA(pathtext), pathlen);
+                               *(dbpath + pathlen) = '\0';
                        }
                        else
                                strcpy(dbpath, "");
                }
        }
+
+       systable_endscan(scan);
+       heap_close(relation, AccessShareLock);
+
+       return gottuple;
+}
+
+static bool
+have_createdb_privilege(void)
+{
+       HeapTuple       utup;
+       bool            retval;
+
+       utup = SearchSysCache(SHADOWSYSID,
+                                                 Int32GetDatum(GetUserId()),
+                                                 0, 0, 0);
+
+       if (!HeapTupleIsValid(utup))
+               retval = false;
+       else
+               retval = ((Form_pg_shadow) GETSTRUCT(utup))->usecreatedb;
+
+       ReleaseSysCache(utup);
+
+       return retval;
+}
+
+
+static char *
+resolve_alt_dbpath(const char *dbpath, Oid dboid)
+{
+       const char *prefix;
+       char       *ret;
+       size_t          len;
+
+       if (dbpath == NULL || dbpath[0] == '\0')
+               return NULL;
+
+       if (first_path_separator(dbpath))
+       {
+               if (!is_absolute_path(dbpath))
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+                                        errmsg("relative paths are not allowed as database locations")));
+#ifndef ALLOW_ABSOLUTE_DBPATHS
+               ereport(ERROR,
+                               (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+               errmsg("absolute paths are not allowed as database locations")));
+#endif
+               prefix = dbpath;
+       }
        else
        {
-               if (dbIdP)
-                       *dbIdP = InvalidOid;
+               /* must be environment variable */
+               char       *var = getenv(dbpath);
+
+               if (!var)
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_UNDEFINED_OBJECT),
+                          errmsg("postmaster environment variable \"%s\" not found",
+                                         dbpath)));
+               if (!is_absolute_path(var))
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_INVALID_NAME),
+                                        errmsg("postmaster environment variable \"%s\" must be absolute path",
+                                                       dbpath)));
+               prefix = var;
        }
 
-       heap_endscan(scan);
+       len = strlen(prefix) + 6 + sizeof(Oid) * 8 + 1;
+       if (len >= MAXPGPATH - 100)
+               ereport(ERROR,
+                               (errcode(ERRCODE_INVALID_NAME),
+                                errmsg("alternative path is too long")));
 
-       /* We will keep the lock on the relation until end of transaction. */
-       heap_close(relation, NoLock);
+       ret = palloc(len);
+       snprintf(ret, len, "%s/base/%u", prefix, dboid);
 
-       return HeapTupleIsValid(tuple);
+       return ret;
 }
 
+
 static bool
-get_user_info(Oid use_sysid, bool *use_super, bool *use_createdb)
+remove_dbdirs(const char *nominal_loc, const char *alt_loc)
 {
-       HeapTuple       utup;
+       const char *target_dir;
+       char            buf[MAXPGPATH + 100];
+       bool            success = true;
 
-       utup = SearchSysCacheTuple(SHADOWSYSID,
-                                                          ObjectIdGetDatum(use_sysid),
-                                                          0, 0, 0);
+       target_dir = alt_loc ? alt_loc : nominal_loc;
 
-       if (!HeapTupleIsValid(utup))
-               return false;
+       /*
+        * Close virtual file descriptors so the kernel has more available for
+        * the system() call below.
+        */
+       closeAllVfds();
+
+       if (alt_loc)
+       {
+               /* remove symlink */
+               if (unlink(nominal_loc) != 0)
+               {
+                       ereport(WARNING,
+                                       (errcode_for_file_access(),
+                                        errmsg("could not remove file \"%s\": %m", nominal_loc)));
+                       success = false;
+               }
+       }
+
+#ifndef WIN32
+       snprintf(buf, sizeof(buf), "rm -rf '%s'", target_dir);
+#else
+       snprintf(buf, sizeof(buf), "rmdir /s /q \"%s\"", target_dir);
+#endif
+
+       if (system(buf) != 0)
+       {
+               ereport(WARNING,
+                               (errmsg("could not remove database directory \"%s\"",
+                                               target_dir),
+                                errdetail("Failing system command was: %s", buf),
+                                errhint("Look in the postmaster's stderr log for more information.")));
+               success = false;
+       }
+
+       return success;
+}
+
+
+/*
+ * get_database_oid - given a database name, look up the OID
+ *
+ * Returns InvalidOid if database name not found.
+ *
+ * This is not actually used in this file, but is exported for use elsewhere.
+ */
+Oid
+get_database_oid(const char *dbname)
+{
+       Relation        pg_database;
+       ScanKeyData entry[1];
+       SysScanDesc scan;
+       HeapTuple       dbtuple;
+       Oid                     oid;
+
+       /* There's no syscache for pg_database, so must look the hard way */
+       pg_database = heap_openr(DatabaseRelationName, AccessShareLock);
+       ScanKeyInit(&entry[0],
+                               Anum_pg_database_datname,
+                               BTEqualStrategyNumber, F_NAMEEQ,
+                               CStringGetDatum(dbname));
+       scan = systable_beginscan(pg_database, DatabaseNameIndex, true,
+                                                         SnapshotNow, 1, entry);
+
+       dbtuple = systable_getnext(scan);
+
+       /* We assume that there can be at most one matching tuple */
+       if (HeapTupleIsValid(dbtuple))
+               oid = HeapTupleGetOid(dbtuple);
+       else
+               oid = InvalidOid;
+
+       systable_endscan(scan);
+       heap_close(pg_database, AccessShareLock);
+
+       return oid;
+}
+
+
+/*
+ * get_database_name - given a database OID, look up the name
+ *
+ * Returns InvalidOid if database name not found.
+ *
+ * This is not actually used in this file, but is exported for use elsewhere.
+ */
+char *
+get_database_name(Oid dbid)
+{
+       Relation        pg_database;
+       ScanKeyData entry[1];
+       SysScanDesc scan;
+       HeapTuple       dbtuple;
+       char       *result;
+
+       /* There's no syscache for pg_database, so must look the hard way */
+       pg_database = heap_openr(DatabaseRelationName, AccessShareLock);
+       ScanKeyInit(&entry[0],
+                               ObjectIdAttributeNumber,
+                               BTEqualStrategyNumber, F_OIDEQ,
+                               ObjectIdGetDatum(dbid));
+       scan = systable_beginscan(pg_database, DatabaseOidIndex, true,
+                                                         SnapshotNow, 1, entry);
+
+       dbtuple = systable_getnext(scan);
+
+       /* We assume that there can be at most one matching tuple */
+       if (HeapTupleIsValid(dbtuple))
+               result = pstrdup(NameStr(((Form_pg_database) GETSTRUCT(dbtuple))->datname));
+       else
+               result = NULL;
 
-       if (use_super)
-               *use_super = ((Form_pg_shadow) GETSTRUCT(utup))->usesuper;
-       if (use_createdb)
-               *use_createdb = ((Form_pg_shadow) GETSTRUCT(utup))->usecreatedb;
+       systable_endscan(scan);
+       heap_close(pg_database, AccessShareLock);
 
-       return true;
+       return result;
 }