Skip to content

fix(ConvertType): Read dbtype in createConnectionParams and remove safeguard #50530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 2 commits into from
Jan 30, 2025
Merged

fix(ConvertType): Read dbtype in createConnectionParams and remove safeguard #50530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf5d55e
fix(ConvertType): Read dbtype in createConnectionParams and remove sa…
Oct 11, 2024
d8cc8aa
fix(ConvertType): Read hostname from arguments and not options
provokateurin Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions core/Command/Db/ConvertType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,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);

Expand Down Expand Up @@ -229,7 +222,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->createConnectionParams(type: $type);
$connectionParams = array_merge($connectionParams, [
'host' => $input->getArgument('hostname'),
'user' => $input->getArgument('username'),
Expand All @@ -243,7 +236,7 @@ protected function getToDBConnection(InputInterface $input, OutputInterface $out
}

// parse hostname for unix socket
if (preg_match('/^(.+)(:(\d+|[^:]+))?$/', $input->getOption('hostname'), $matches)) {
if (preg_match('/^(.+)(:(\d+|[^:]+))?$/', $input->getArgument('hostname'), $matches)) {
$connectionParams['host'] = $matches[1];
if (isset($matches[3])) {
if (is_numeric($matches[3])) {
Expand Down
12 changes: 5 additions & 7 deletions lib/private/DB/ConnectionFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public function getConnection(string $type, array $additionalConnectionParams):
$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)
Expand Down Expand Up @@ -175,12 +175,10 @@ public function isValidType($type) {

/**
* 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', '')),
Expand Down Expand Up @@ -212,7 +210,7 @@ public function createConnectionParams(string $configPrefix = '', array $additio
'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',
Expand Down
Loading