wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix misleading MySQL DB creation error (#25485)

Browse source 
Whenever the GRANT ALL failed, it used to display "Database creation
failed" which is incorrect. It's only the privleges setting that failed.

This moves the privilege setting message to DEBUG and makes it more
precise.
This commit is contained in:
Vincent Petry 2016-07-26 12:38:14 +02:00 committed by Bjoern Schiessle
parent 318d68a9a9
commit aeb4011279
No known key found for this signature in database
GPG key ID: 2378A753E2BF04F6
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.
$query = "CREATE DATABASE IF NOT EXISTS `$name` CHARACTER SET utf8 COLLATE utf8_bin;";
$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
$query="GRANT ALL PRIVILEGES ON `$name` . * TO '$user'";
$connection->executeUpdate($query);
} 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',
'error' => $ex->getMessage()
]);