mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only provide the auth method for MySQL 8.0+ to not break MariaDB 

Provide the auth method for MySQL 8.0+

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2020-02-05 10:05:11 +01:00
parent 23fc654fc4
commit 0aa216fc48
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/Setup/MySQL.php
View File

@ -34,6 +34,7 @@ namespace OC\Setup;
use OC\DB\MySqlTools; use OC\DB\MySqlTools;
use OCP\IDBConnection; use OCP\IDBConnection;
use OCP\ILogger; use OCP\ILogger;
use Doctrine\DBAL\Platforms\MySQL80Platform;
class MySQL extends AbstractDatabase { class MySQL extends AbstractDatabase {
public $dbprettyname = 'MySQL/MariaDB'; public $dbprettyname = 'MySQL/MariaDB';
@ -102,10 +103,18 @@ class MySQL extends AbstractDatabase {
$password = $this->dbPassword; $password = $this->dbPassword;
// we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one, // we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
// the anonymous user would take precedence when there is one. // the anonymous user would take precedence when there is one.
$query = "CREATE USER '$name'@'localhost' IDENTIFIED WITH mysql_native_password BY '$password'";
$connection->executeUpdate($query); if ($connection->getDatabasePlatform() instanceof Mysql80Platform) {
$query = "CREATE USER '$name'@'%' IDENTIFIED WITH mysql_native_password BY '$password'"; $query = "CREATE USER '$name'@'localhost' IDENTIFIED WITH mysql_native_password BY '$password'";
$connection->executeUpdate($query); $connection->executeUpdate($query);
$query = "CREATE USER '$name'@'%' IDENTIFIED WITH mysql_native_password BY '$password'";
$connection->executeUpdate($query);
} else {
$query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
$connection->executeUpdate($query);
$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
$connection->executeUpdate($query);
}
} }
catch (\Exception $ex){ catch (\Exception $ex){
$this->logger->logException($ex, [ $this->logger->logException($ex, [