upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-25 19:04:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #50563 from nextcloud/backport/50530/stable29

Browse source
This commit is contained in:
Kate 2025-01-31 08:51:10 +01:00 committed by GitHub
commit 2053455b56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/Command/Db/ConvertType.php
View file

@ -177,13 +177,6 @@ class ConvertType extends Command implements CompletionAwareInterface {
}
protected function execute(InputInterface $input, OutputInterface $output): int {
// WARNING:
// Leave in place until #45257 is addressed to prevent data loss (hopefully in time for the next maintenance release)
//
throw new \InvalidArgumentException(
'This command is temporarily disabled (until the next maintenance release).'
);
$this->validateInput($input, $output);
$this->readPassword($input, $output);
@ -251,7 +244,7 @@ class ConvertType extends Command implements CompletionAwareInterface {
protected function getToDBConnection(InputInterface $input, OutputInterface $output) {
$type = $input->getArgument('type');
$connectionParams = $this->connectionFactory->createConnectionParams();
$connectionParams = $this->connectionFactory->createConnectionParams(type: $type);
$connectionParams = array_merge($connectionParams, [
'host' => $input->getArgument('hostname'),
'user' => $input->getArgument('username'),

12
lib/private/DB/ConnectionFactory.php
View file

@ -120,7 +120,7 @@ class ConnectionFactory {
$normalizedType = $this->normalizeType($type);
$eventManager = new EventManager();
$eventManager->addEventSubscriber(new SetTransactionIsolationLevel());
$connectionParams = $this->createConnectionParams('', $additionalConnectionParams);
$connectionParams = $this->createConnectionParams('', $additionalConnectionParams, $type);
switch ($normalizedType) {
case 'pgsql':
// pg_connect used by Doctrine DBAL does not support URI notation (enclosed in brackets)
@ -187,12 +187,10 @@ class ConnectionFactory {
/**
* Create the connection parameters for the config
*
* @param string $configPrefix
* @return array
*/
public function createConnectionParams(string $configPrefix = '', array $additionalConnectionParams = []) {
$type = $this->config->getValue('dbtype', 'sqlite');
public function createConnectionParams(string $configPrefix = '', array $additionalConnectionParams = [], ?string $type = null) {
// use provided type or if null use type from config
$type = $type ?? $this->config->getValue('dbtype', 'sqlite');
$connectionParams = array_merge($this->getDefaultConnectionParams($type), [
'user' => $this->config->getValue($configPrefix . 'dbuser', $this->config->getValue('dbuser', '')),
@ -224,7 +222,7 @@ class ConnectionFactory {
'tablePrefix' => $connectionParams['tablePrefix']
];
if ($this->config->getValue('mysql.utf8mb4', false)) {
if ($type === 'mysql' && $this->config->getValue('mysql.utf8mb4', false)) {
$connectionParams['defaultTableOptions'] = [
'collate' => 'utf8mb4_bin',
'charset' => 'utf8mb4',