Skip to content

Commit 7cd37de

Browse files
committed
fixup! fixup! fixup! fix: add handling for MD5 on new MySQL and deprecate MD5 SQL function
1 parent 3c4056d commit 7cd37de

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

lib/private/Setup/MySQL.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@ public function setupDatabase(): void {
2929
$connection = $this->connect(['dbname' => null]);
3030
}
3131

32-
if ($this->tryCreateDbUser) {
33-
$this->createSpecificUser('oc_admin', new ConnectionAdapter($connection));
34-
}
35-
36-
$this->config->setValues([
37-
'dbuser' => $this->dbUser,
38-
'dbpassword' => $this->dbPassword,
39-
]);
40-
4132
// for MD5 support
4233
// In MySQL 9+ MD5 has been deprecated and is only available as a component.
4334
// Until we dropped the support for it on the function builder, we need to load the component.
@@ -57,6 +48,15 @@ public function setupDatabase(): void {
5748
}
5849
}
5950

51+
if ($this->tryCreateDbUser) {
52+
$this->createSpecificUser('oc_admin', new ConnectionAdapter($connection));
53+
}
54+
55+
$this->config->setValues([
56+
'dbuser' => $this->dbUser,
57+
'dbpassword' => $this->dbPassword,
58+
]);
59+
6060
//create the database
6161
$this->createDatabase($connection);
6262

0 commit comments

Comments
 (0)