Merge pull request #4514 from nextcloud/automatic-mysql-4byte-detection

Automatic mysql 4byte detection

1 files changed, 6 insertions, 6 deletions

diff --git a/core/Command/Db/ConvertMysqlToMB4.php b/core/Command/Db/ConvertMysqlToMB4.php
index 286274753ee..38aff8b09d8 100644
--- a/core/Command/Db/ConvertMysqlToMB4.php
+++ b/core/Command/Db/ConvertMysqlToMB4.php
@@ -22,6 +22,7 @@
 namespace OC\Core\Command\Db;
 
 use Doctrine\DBAL\Platforms\MySqlPlatform;
+use OC\DB\MySqlTools;
 use OC\Migration\ConsoleOutput;
 use OC\Repair\Collation;
 use OCP\IConfig;
@@ -71,18 +72,17 @@ class ConvertMysqlToMB4 extends Command {
 			return 1;
 		}
 
-		$oldValue = $this->config->getSystemValue('mysql.utf8mb4', false);
-		// enable charset
-		$this->config->setSystemValue('mysql.utf8mb4', true);
-
-		if (!$this->connection->supports4ByteText()) {
+		$tools = new MySqlTools();
+		if (!$tools->supports4ByteCharset($this->connection)) {
 			$url = $this->urlGenerator->linkToDocs('admin-mysql-utf8mb4');
 			$output->writeln("The database is not properly setup to use the charset utf8mb4.");
 			$output->writeln("For more information please read the documentation at $url");
-			$this->config->setSystemValue('mysql.utf8mb4', $oldValue);
 			return 1;
 		}
 
+		// enable charset
+		$this->config->setSystemValue('mysql.utf8mb4', true);
+
 		// run conversion
 		$coll = new Collation($this->config, $this->logger, $this->connection, false);
 		$coll->run(new ConsoleOutput($output));