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

PostgreSQL PDO: Escape bytea values (bug #218)

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-11 19:26:21 +01:00
parent c2d29a6937
commit a94a727af7
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,10 +50,6 @@ if (isset($_GET["pgsql"])) {
return ($field["type"] == "bytea" && $val !== null ? pg_unescape_bytea($val) : $val); 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) { function select_db($database) {
global $adminer; global $adminer;
if ($database == $adminer->database()) { if ($database == $adminer->database()) {
@@ -173,10 +169,6 @@ if (isset($_GET["pgsql"])) {
return ($adminer->database() == $database); return ($adminer->database() == $database);
} }
function quoteBinary($s) {
return q($s);
}
function query($query, $unbuffered = false) { function query($query, $unbuffered = false) {
$return = parent::query($query, $unbuffered); $return = parent::query($query, $unbuffered);
if ($this->timeout) { if ($this->timeout) {
@@ -283,7 +275,7 @@ if (isset($_GET["pgsql"])) {
} }
function quoteBinary($s) { function quoteBinary($s) {
return $this->conn->quoteBinary($s); return "'\\x" . bin2hex($s) . "'"; // available since PostgreSQL 8.1
} }
function warnings() { function warnings() {

1
changes.txt
View File

@@ -1,5 +1,6 @@
Adminer dev: Adminer dev:
MySQL: Display default values of binary columns MySQL: Display default values of binary columns
PostgreSQL PDO: Escape bytea values (bug #218)
Adminer 5.0.4 (released 2025-03-11): Adminer 5.0.4 (released 2025-03-11):
Compile: Fix shortening in private methods (regression from 5.0.3) Compile: Fix shortening in private methods (regression from 5.0.3)