PostgreSQL PDO: Escape bytea values (bug #218)

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index aaba89d2d53a7ea24fd9e7a983ef7d68924ea5c4..7df77016d55f4d92cd58b9309f2a8e45b3c8bd6d 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -50,10 +50,6 @@ if (isset($_GET["pgsql"])) {
                                return ($field["type"] == "bytea" && $val !== null ? pg_unescape_bytea($val) : $val);
                        }
 
-                       function quoteBinary($string) {
-                               return "'" . pg_escape_bytea($this->link, $string) . "'";
-                       }
-
                        function select_db($database) {
                                global $adminer;
                                if ($database == $adminer->database()) {
@@ -173,10 +169,6 @@ if (isset($_GET["pgsql"])) {
                                return ($adminer->database() == $database);
                        }
 
-                       function quoteBinary($s) {
-                               return q($s);
-                       }
-
                        function query($query, $unbuffered = false) {
                                $return = parent::query($query, $unbuffered);
                                if ($this->timeout) {
@@ -283,7 +275,7 @@ if (isset($_GET["pgsql"])) {
                }
 
                function quoteBinary($s) {
-                       return $this->conn->quoteBinary($s);
+                       return "'\\x" . bin2hex($s) . "'"; // available since PostgreSQL 8.1
                }
 
                function warnings() {

diff --git a/changes.txt b/changes.txt
index f2f52eeaab460758bb60743fde2d4748866dffde..bbb347eff8441bda5d1abe94b7171440ca588381 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 Adminer dev:
 MySQL: Display default values of binary columns
+PostgreSQL PDO: Escape bytea values (bug #218)
 
 Adminer 5.0.4 (released 2025-03-11):
 Compile: Fix shortening in private methods (regression from 5.0.3)