From b4a6e068a9e125f81ece49b31470d76484a05959 Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Fri, 1 Mar 2019 12:01:28 +0100
Subject: [PATCH] WIP

---
 src/Database/DBA.php           |  7 +++----
 src/Database/IDatabase.php     |  2 +-
 src/Database/MysqlDatabase.php | 10 ++++++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index e275ba6671..8d4def4066 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -113,10 +113,9 @@ class DBA
 	 * @return string
 	 * @throws \Exception
 	 */
-	public static function databaseName() {
-		$ret = self::p("SELECT DATABASE() AS `db`");
-		$data = self::toArray($ret);
-		return $data[0]['db'];
+	public static function databaseName()
+	{
+		return self::$db->getDatabaseName();
 	}
 
 	/**
diff --git a/src/Database/IDatabase.php b/src/Database/IDatabase.php
index fd0722cf14..004582e974 100644
--- a/src/Database/IDatabase.php
+++ b/src/Database/IDatabase.php
@@ -38,7 +38,7 @@ interface IDatabase
 	 * Returns the selected database name
 	 * @return string
 	 */
-	function databaseName();
+	function getDatabaseName();
 
 	/**
 	 * Check if data exists
diff --git a/src/Database/MysqlDatabase.php b/src/Database/MysqlDatabase.php
index 609d88cac8..63a1bccf51 100644
--- a/src/Database/MysqlDatabase.php
+++ b/src/Database/MysqlDatabase.php
@@ -194,9 +194,15 @@ class MysqlDatabase implements IDatabase, IDatabaseLock
 		return $this->serverInfo;
 	}
 
-	public function databaseName()
+	/**
+	 * {@inheritdoc}
+	 * @throws \Exception
+	 */
+	public function getDatabaseName()
 	{
-		return DBA::databaseName();
+		$ret = $this->p("SELECT DATABASE() AS `db`");
+		$data = $this->toArray($ret);
+		return $data[0]['db'];
 	}
 
 	public function exists($table, array $condition)