Skip to content

Исправление эскейпинга бинарных строк для Postgres 9.1+ #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2012
Merged

Исправление эскейпинга бинарных строк для Postgres 9.1+ #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion core/DB/PostgresDialect.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,16 @@ public static function prepareFullText(array $words, $logic)

public function quoteBinary($data)
{
return "E'".pg_escape_bytea($data)."'";
$esc = pg_escape_bytea($data);
if (mb_strpos($esc, '\\x') === 0) {
// http://www.postgresql.org/docs/9.1/static/datatype-binary.html
// if pg_escape_bytea use postgres 9.1+ it's return value like '\x00aabb' (new bytea hex format),
// but must return '\\x00aabb'. So we use this fix:'
return "E'\\".$esc."'";
} else {
//if function escape value like '\\000\\123' - all ok
return "E'".$esc."'";
}
}

public function unquoteBinary($data)
Expand Down
5 changes: 5 additions & 0 deletions doc/ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2012-08-10 Alexey S. Denisov

* core/DB/PostgresDialect.class.php:
fix incorrect bytea escaping for Postgres 9.1+

2012-08-10 Alexey S. Denisov

* core/Form/Primitives/PrimitiveHstore.class.php:
Expand Down