Add helper for $connection2

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 21ec1b35955060a2cb761642dd0e2ef7ad8cb513..a274d9665f7ebcacc61ca5c4eb25715776385586 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -451,9 +451,7 @@ ORDER BY a.attnum") as $row
        }
 
        function indexes($table, $connection2 = null) {
-               if (!is_object($connection2)) {
-                       $connection2 = connection();
-               }
+               $connection2 = connection($connection2);
                $return = array();
                $table_oid = get_val("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($table), 0, $connection2);
                $columns = get_key_vals("SELECT attnum, attname FROM pg_attribute WHERE attrelid = $table_oid AND attnum > 0", $connection2);

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 79e600d6c6a26e1b3492762a1505bb3a5c880ce4..dd8e57982e95d8638753ca2219ab23671698005a 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -270,9 +270,7 @@ if (isset($_GET["sqlite"])) {
        }
 
        function indexes($table, $connection2 = null) {
-               if (!is_object($connection2)) {
-                       $connection2 = connection();
-               }
+               $connection2 = connection($connection2);
                $return = array();
                $sql = get_val("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table), 0, $connection2);
                if (preg_match('~\bPRIMARY\s+KEY\s*\((([^)"]+|"[^"]*"|`[^`]*`)++)~i', $sql, $match)) {

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 1f4fcb16714799c611a0d59d2b82eb0a548334be..406b215c8579e620cbfaaf0f3fe9ad0b9740a801 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -4,11 +4,12 @@ namespace Adminer;
 // This file is used both in Adminer and Adminer Editor.
 
 /** Get database connection
+* @param Db|string $connection2 custom connection to use instead of the default
 * @return Db|string string means error
 */
-function connection($special = null) {
+function connection($connection2 = null) {
        // can be used in customization, Db::$instance is minified
-       return Db::$instance;
+       return (is_object($connection2) ? $connection2 : Db::$instance);
 }
 
 /** Get Adminer object
@@ -99,9 +100,7 @@ function bracket_escape(string $idf, bool $back = false): string {
 * @param Db|string $connection2 defaults to connection()
 */
 function min_version($version, $maria_db = "", $connection2 = null): bool {
-       if (!is_object($connection2)) {
-               $connection2 = connection();
-       }
+       $connection2 = connection($connection2);
        $server_info = $connection2->server_info;
        if ($maria_db && preg_match('~([\d.]+)-MariaDB~', $server_info, $match)) {
                $server_info = $match[1];
@@ -185,9 +184,7 @@ function get_vals(string $query, $column = 0): array {
 * @return string[]
 */
 function get_key_vals(string $query, $connection2 = null, bool $set_keys = true): array {
-       if (!is_object($connection2)) {
-               $connection2 = connection();
-       }
+       $connection2 = connection($connection2);
        $return = array();
        $result = $connection2->query($query);
        if (is_object($result)) {
@@ -207,14 +204,14 @@ function get_key_vals(string $query, $connection2 = null, bool $set_keys = true)
 * @return list<string[]> of associative arrays
 */
 function get_rows(string $query, $connection2 = null, string $error = "<p class='error'>"): array {
-       $conn = (is_object($connection2) ? $connection2 : connection());
+       $conn = connection($connection2);
        $return = array();
        $result = $conn->query($query);
        if (is_object($result)) { // can return true
                while ($row = $result->fetch_assoc()) {
                        $return[] = $row;
                }
-       } elseif (!$result && !is_object($connection2) && $error && (defined('Adminer\PAGE_HEADER') || $error == "-- ")) {
+       } elseif (!$result && $connection2 === null && $error && (defined('Adminer\PAGE_HEADER') || $error == "-- ")) {
                echo $error . error() . "\n";
        }
        return $return;