PDO: Support binary fields download

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 709c67e1cd1bec635c7e63383c9e153892c6dc25..9b4ce038b8ce935b6f130e7079a45518bb8255dc 100644 (file)
--- 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 da332b26987a068c0a78f7375ec6e52115ba9c6f..5ca8f951dca0d8f7a622a699562b7fcce3c3af92 100644 (file)
--- 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 a2e812fa30b1e78db68d1a3cb9992105fd4ace4c..d62c16e419af460930a4d637eb5d9e987826b867 100644 (file)
--- 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