maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix drop database on mysql-5.6 as there is no 'if exists' for 'drop user' prior to mysql-5.7

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2019-07-30 07:34:42 +02:00
parent 169353c429
commit 70ac914a86
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Froxlor/Database/Manager/DbManagerMySQL.php
View File

@@ -146,7 +146,11 @@ class DbManagerMySQL
)); ));
// as of MySQL 5.0.2 this also revokes privileges. (requires MySQL 4.1.2+) // as of MySQL 5.0.2 this also revokes privileges. (requires MySQL 4.1.2+)
if (version_compare(Database::getAttribute(\PDO::ATTR_SERVER_VERSION), '5.7.0', '<')) {
$drop_stmt = Database::prepare("DROP USER IF EXISTS :dbname@:host"); $drop_stmt = Database::prepare("DROP USER IF EXISTS :dbname@:host");
} else {
$drop_stmt = Database::prepare("DROP USER :dbname@:host");
}
while ($host = $host_res_stmt->fetch(\PDO::FETCH_ASSOC)) { while ($host = $host_res_stmt->fetch(\PDO::FETCH_ASSOC)) {
Database::pexecute($drop_stmt, array( Database::pexecute($drop_stmt, array(
'dbname' => $dbname, 'dbname' => $dbname,
@@ -154,6 +158,7 @@ class DbManagerMySQL
), false); ), false);
} }
$drop_stmt = Database::prepare("DROP DATABASE IF EXISTS `" . $dbname . "`"); $drop_stmt = Database::prepare("DROP DATABASE IF EXISTS `" . $dbname . "`");
Database::pexecute($drop_stmt); Database::pexecute($drop_stmt);
} }
@@ -172,7 +177,11 @@ class DbManagerMySQL
Database::pexecute($stmt); Database::pexecute($stmt);
} }
// as of MySQL 5.0.2 this also revokes privileges. (requires MySQL 4.1.2+) // as of MySQL 5.0.2 this also revokes privileges. (requires MySQL 4.1.2+)
if (version_compare(Database::getAttribute(\PDO::ATTR_SERVER_VERSION), '5.7.0', '<')) {
$stmt = Database::prepare("DROP USER IF EXISTS :username@:host");
} else {
$stmt = Database::prepare("DROP USER :username@:host"); $stmt = Database::prepare("DROP USER :username@:host");
}
Database::pexecute($stmt, array( Database::pexecute($stmt, array(
"username" => $username, "username" => $username,
"host" => $host "host" => $host