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

argh, mixed up the If statement for mysql-version check

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

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

@@ -147,9 +147,9 @@ 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', '<')) { if (version_compare(Database::getAttribute(\PDO::ATTR_SERVER_VERSION), '5.7.0', '<')) {
$drop_stmt = Database::prepare("DROP USER IF EXISTS :dbname@:host");
} else {
$drop_stmt = Database::prepare("DROP USER :dbname@:host"); $drop_stmt = Database::prepare("DROP USER :dbname@:host");
} else {
$drop_stmt = Database::prepare("DROP USER IF EXISTS :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(
@@ -178,9 +178,9 @@ 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', '<')) { 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");
} else {
$stmt = Database::prepare("DROP USER IF EXISTS :username@:host");
} }
Database::pexecute($stmt, array( Database::pexecute($stmt, array(
"username" => $username, "username" => $username,