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

Merge pull request #596 from nextcloud/adjust-mysql-install-error 

Fix misleading MySQL DB creation error (#25485)
This commit is contained in:
Björn Schießle 2016-07-27 14:34:07 +02:00 committed by GitHub
parent b8a088fabf aeb4011279
commit 10726dd00d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,12 +61,20 @@ class MySQL extends AbstractDatabase {
//we can't use OC_BD functions here because we need to connect as the administrative user. //we can't use OC_BD functions here because we need to connect as the administrative user.
$query = "CREATE DATABASE IF NOT EXISTS `$name` CHARACTER SET utf8 COLLATE utf8_bin;"; $query = "CREATE DATABASE IF NOT EXISTS `$name` CHARACTER SET utf8 COLLATE utf8_bin;";
$connection->executeUpdate($query); $connection->executeUpdate($query);
} catch (\Exception $ex) {
$this->logger->error('Database creation failed: {error}', [
'app' => 'mysql.setup',
'error' => $ex->getMessage()
]);
return;
}
try {
//this query will fail if there aren't the right permissions, ignore the error //this query will fail if there aren't the right permissions, ignore the error
$query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'"; $query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'";
$connection->executeUpdate($query); $connection->executeUpdate($query);
} catch (\Exception $ex) { } catch (\Exception $ex) {
$this->logger->error('Database creation failed: {error}', [ $this->logger->debug('Could not automatically grant privileges, this can be ignored if database user already had privileges: {error}', [
'app' => 'mysql.setup', 'app' => 'mysql.setup',
'error' => $ex->getMessage() 'error' => $ex->getMessage()
]); ]);