mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-13 10:04:07 +02:00
Code Issues Releases Wiki Activity

- PostgreSQL: Avoid warning about crdb_version (fix #924, regression from 5.0.5)

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-18 16:20:44 +01:00
parent 3fb6cac361
commit 751405e006
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,8 +35,6 @@ if (isset($_GET["pgsql"])) {
}
restore_error_handler();
if ($this->link) {
$version = pg_version($this->link);
$this->server_info = $version["server"];
pg_set_client_encoding($this->link, "UTF8");
}
return (bool) $this->link;
@@ -334,8 +332,7 @@ if (isset($_GET["pgsql"])) {
if (min_version(9, 0, $connection)) {
$connection->query("SET application_name = 'Adminer'");
}
$crdb_version = $connection->result("SHOW crdb_version");
$connection->server_info .= ($crdb_version ? "-" . preg_replace('~ \(.*~', '', $crdb_version) : "");
$connection->server_info = $connection->result("SELECT version()");
$connection->cockroach = preg_match('~CockroachDB~', $connection->server_info);
if ($connection->cockroach) { // we don't use "PostgreSQL / CockroachDB" by default because it's too long
$drivers[DRIVER] = "CockroachDB";