From 443cd2990e2daebca55da49157a98234986bf609 Mon Sep 17 00:00:00 2001 From: lwenderoth Date: Wed, 31 Jul 2024 11:52:41 +0200 Subject: [PATCH 1/2] Fix: Update ConvertType.php to read correct DB params, might fix #45257 Signed-off-by: lwenderoth --- core/Command/Db/ConvertType.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php index 592285a8309d4..ef27456000c05 100644 --- a/core/Command/Db/ConvertType.php +++ b/core/Command/Db/ConvertType.php @@ -152,13 +152,6 @@ protected function readPassword(InputInterface $input, OutputInterface $output) } 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); @@ -226,7 +219,7 @@ protected function createSchema(Connection $fromDB, Connection $toDB, InputInter protected function getToDBConnection(InputInterface $input, OutputInterface $output) { $type = $input->getArgument('type'); - $connectionParams = $this->connectionFactory->createConnectionParams(); + $connectionParams = $this->connectionFactory->createDefaultConnectionParams($type); $connectionParams = array_merge($connectionParams, [ 'host' => $input->getArgument('hostname'), 'user' => $input->getArgument('username'), From 76a3bb1f51aa76afa1e61ae54bfa3c2199a0f950 Mon Sep 17 00:00:00 2001 From: lwenderoth Date: Thu, 1 Aug 2024 08:14:36 +0200 Subject: [PATCH 2/2] Update ConvertType.php again So embarrasing, sorry.. Creating new account, trying to get everything right - and commiting the wrong file.. Sorry! This is the correction. Signed-off-by: lwenderoth --- core/Command/Db/ConvertType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php index ef27456000c05..69f80aab05b05 100644 --- a/core/Command/Db/ConvertType.php +++ b/core/Command/Db/ConvertType.php @@ -219,7 +219,7 @@ protected function createSchema(Connection $fromDB, Connection $toDB, InputInter protected function getToDBConnection(InputInterface $input, OutputInterface $output) { $type = $input->getArgument('type'); - $connectionParams = $this->connectionFactory->createDefaultConnectionParams($type); + $connectionParams = $this->connectionFactory->getDefaultConnectionParams($type); $connectionParams = array_merge($connectionParams, [ 'host' => $input->getArgument('hostname'), 'user' => $input->getArgument('username'),