Skip to content

Commit abe4a2a

Browse files
committed
fixup! fixup! fixup! fixup! fixup! fix: add handling for MD5 on new MySQL and deprecate MD5 SQL function
1 parent ae147c9 commit abe4a2a

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,6 +29,15 @@ 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+
3241
// for MD5 support
3342
// In MySQL 9+ MD5 has been deprecated and is only available as a component.
3443
// Until we dropped the support for it on the function builder, we need to load the component.
@@ -47,15 +56,6 @@ public function setupDatabase(): void {
4756
}
4857
}
4958

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

0 commit comments

Comments
 (0)