From f8bff198980fb033d52e5066dea801be06789a64 Mon Sep 17 00:00:00 2001 From: Peter Knut Date: Fri, 31 Jan 2025 17:05:58 +0100 Subject: [PATCH] PostgreSQL: Fix renaming database --- adminer/drivers/pgsql.inc.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index 6f835cba..e97a4071 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -71,6 +71,11 @@ if (isset($_GET["pgsql"])) { } function query($query, $unbuffered = false) { + if (!$this->_link) { + $this->error = "Invalid connection"; + return false; + } + $result = @pg_query($this->_link, $query); $this->error = ""; if (!$result) { @@ -497,12 +502,17 @@ ORDER BY connamespace, conname") as $row) { function drop_databases($databases) { global $connection; + $connection->close(); + return apply_queries("DROP DATABASE", $databases, 'idf_escape'); } function rename_database($name, $collation) { - //! current database cannot be renamed + global $connection; + + $connection->close(); + return queries("ALTER DATABASE " . idf_escape(DB) . " RENAME TO " . idf_escape($name)); }