From ac89b6abe71b7cea07413aa796f468c4df7eb16c Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 5 Feb 2020 11:08:18 +0100
Subject: [PATCH] Check the new connection on setup like with PostgreSQL and
Oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
lib/private/Setup/MySQL.php | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
index 1ee650fecc6..7371c7aeab2 100644
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -58,6 +58,16 @@ class MySQL extends AbstractDatabase {
//fill the database if needed
$query='select count(*) from information_schema.tables where table_schema=? AND table_name = ?';
$connection->executeQuery($query, [$this->dbName, $this->tablePrefix.'users']);
+
+ $connection->close();
+ $connection = $this->connect();
+ try {
+ $connection->connect();
+ } catch (\Exception $e) {
+ $this->logger->logException($e);
+ throw new \OC\DatabaseSetupException($this->trans->t('MySQL username and/or password not valid'),
+ $this->trans->t('You need to enter details of an existing account.'));
+ }
}
/**
--
GitLab