Nemcio/adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-12-28 19:31:04 +01:00
Code Issues Packages Projects Releases Activity

Db: Unify connection error handling

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-28 22:00:53 +01:00
parent d5bba383ea
commit 29339c5223
13 changed files with 95 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/drivers/elastic.php
View File

@@ -61,14 +61,14 @@ if (isset($_GET["elastic"])) {
}
}
function connect(string $server, string $username, string $password): bool {
function attach(?string $server, string $username, string $password): string {
preg_match('~^(https?://)?(.*)~', $server, $match);
$this->url = ($match[1] ?: "http://") . urlencode($username) . ":" . urlencode($password) . "@$match[2]";
$return = $this->rootQuery('');
if ($return) {
$this->server_info = $return['version']['number'];
}
return (bool) $return;
return ($return ? '' : $this->error);
}
function select_db(string $database): bool {
@@ -290,15 +290,11 @@ if (isset($_GET["elastic"])) {
if (!preg_match('~^(https?://)?[-a-z\d.]+(:\d+)?$~', $server)) {
return lang('Invalid server.');
}
if ($password != "" && $connection->connect($server, $username, "")) {
if ($password != "" && $connection->attach($server, $username, "")) {
return lang('Database does not support password.');
}
if ($connection->connect($server, $username, $password)) {
return $connection;
}
return $connection->error;
return ($connection->attach($server, $username, $password) ?: $connection);
}
function support($feature) {