From 7b35ebd82ed51e78d88b75befea987e6f6b0cc84 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 20 Feb 2018 22:31:49 +0100 Subject: [PATCH] PDO: Support binary fields download --- adminer/drivers/pgsql.inc.php | 8 -------- adminer/include/driver.inc.php | 5 ++++- changes.txt | 1 + 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index 709c67e1..9b4ce038 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -155,10 +155,6 @@ if (isset($_GET["pgsql"])) { return ($adminer->database() == $database); } - function value($val, $field) { - return $val; - } - function quoteBinary($s) { return q($s); } @@ -204,10 +200,6 @@ if (isset($_GET["pgsql"])) { ); } - function value($val, $field) { - return $this->_conn->value($val, $field); - } - function quoteBinary($s) { return $this->_conn->quoteBinary($s); } diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php index da332b26..5ca8f951 100644 --- a/adminer/include/driver.inc.php +++ b/adminer/include/driver.inc.php @@ -129,7 +129,10 @@ * @return string */ function value($val, $field) { - return $val; + return (method_exists($this->_conn, 'value') + ? $this->_conn->value($val, $field) + : (is_resource($val) ? stream_get_contents($val) : $val) + ); } /** Quote binary string diff --git a/changes.txt b/changes.txt index a2e812fa..d62c16e4 100644 --- a/changes.txt +++ b/changes.txt @@ -1,4 +1,5 @@ Adminer 4.6.3-dev: +PDO: Support binary fields download Adminer 4.6.2 (released 2018-02-20): Semi-transparent border on table actions