diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index aaba89d2..7df77016 100644 --- 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 f2f52eea..bbb347ef 100644 --- 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)