mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-09 16:17:48 +02:00
Code Issues Releases Wiki Activity

PostgreSQL: Display shorter version (regression from 5.0.5)

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-19 06:12:51 +01:00
parent b4e41f5e4b
commit ca30d04575
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,8 +332,9 @@ if (isset($_GET["pgsql"])) {
if (min_version(9, 0, $connection)) { if (min_version(9, 0, $connection)) {
$connection->query("SET application_name = 'Adminer'"); $connection->query("SET application_name = 'Adminer'");
} }
$connection->server_info = $connection->result("SELECT version()"); $version = $connection->result("SELECT version()");
$connection->cockroach = preg_match('~CockroachDB~', $connection->server_info); $connection->cockroach = preg_match('~CockroachDB~', $version);
$connection->server_info = preg_replace('~^\D*([\d.]+[-\w]*).*~', '\1', $version);
if ($connection->cockroach) { // we don't use "PostgreSQL / CockroachDB" by default because it's too long if ($connection->cockroach) { // we don't use "PostgreSQL / CockroachDB" by default because it's too long
$drivers[DRIVER] = "CockroachDB"; $drivers[DRIVER] = "CockroachDB";
} }

2
adminer/include/functions.inc.php
View File

@@ -128,7 +128,7 @@ function min_version($version, $maria_db = "", $connection2 = null) {
$server_info = $match[1]; $server_info = $match[1];
$version = $maria_db; $version = $maria_db;
} }
return $version && version_compare(preg_replace('~^\D+~', '', $server_info), $version) >= 0; return $version && version_compare($server_info, $version) >= 0;
} }
/** Get connection charset /** Get connection charset