mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-05 22:27:24 +02:00
Code Issues Releases Wiki Activity

PostgreSQL: Fix login

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-30 14:22:41 +02:00
parent b64c80acc9
commit c64ee3d907
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
adminer/drivers/pgsql.inc.php
View File

@@ -8,7 +8,7 @@ if (isset($_GET["pgsql"])) {
if (extension_loaded("pgsql") && $_GET["ext"] != "pdo") { if (extension_loaded("pgsql") && $_GET["ext"] != "pdo") {
class Db extends SqlDb { class Db extends SqlDb {
public string $extension = "PgSQL"; public string $extension = "PgSQL";
public int $timeout; public int $timeout = 0;
private $link, $string, $database = true; private $link, $string, $database = true;
function _error($errno, $error) { function _error($errno, $error) {
@@ -125,7 +125,7 @@ if (isset($_GET["pgsql"])) {
} elseif (extension_loaded("pdo_pgsql")) { } elseif (extension_loaded("pdo_pgsql")) {
class Db extends PdoDb { class Db extends PdoDb {
public string $extension = "PDO_PgSQL"; public string $extension = "PDO_PgSQL";
public int $timeout; public int $timeout = 0;
function attach(?string $server, string $username, string $password): string { function attach(?string $server, string $username, string $password): string {
$db = adminer()->database(); $db = adminer()->database();
@@ -176,12 +176,12 @@ if (isset($_GET["pgsql"])) {
if (is_string($connection)) { if (is_string($connection)) {
return $connection; return $connection;
} }
if (min_version(9, 0, $connection)) {
$connection->query("SET application_name = 'Adminer'");
}
$version = get_val("SELECT version()", 0, $connection); $version = get_val("SELECT version()", 0, $connection);
$connection->flavor = (preg_match('~CockroachDB~', $version) ? 'cockroach' : ''); $connection->flavor = (preg_match('~CockroachDB~', $version) ? 'cockroach' : '');
$connection->server_info = preg_replace('~^\D*([\d.]+[-\w]*).*~', '\1', $version); $connection->server_info = preg_replace('~^\D*([\d.]+[-\w]*).*~', '\1', $version);
if (min_version(9, 0, $connection)) {
$connection->query("SET application_name = 'Adminer'");
}
if ($connection->flavor == 'cockroach') { // we don't use "PostgreSQL / CockroachDB" by default because it's too long if ($connection->flavor == 'cockroach') { // we don't use "PostgreSQL / CockroachDB" by default because it's too long
add_driver(DRIVER, "CockroachDB"); add_driver(DRIVER, "CockroachDB");
} }