mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-06 06:37:33 +02:00
Code Issues Releases Wiki Activity

Add helper for $connection2

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-29 22:21:18 +01:00
parent 291ae7f1ac
commit 9b6943d5af
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

4
adminer/drivers/sqlite.inc.php
View File

@@ -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)) {

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

@@ -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;