aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-11-22 01:29:19 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-11-22 01:29:19 +0000
commitdd27c4e5fb338e2571e691c23b39cdd857eca7cd (patch)
tree96554cde217963c6e2c76664ef010303ba6e9d6e /activerecord/lib/active_record/connection_adapters
parentec93d61fb9a571aeb714ddc9bd594510485f5b7f (diff)
downloadrails-dd27c4e5fb338e2571e691c23b39cdd857eca7cd.tar.gz
rails-dd27c4e5fb338e2571e691c23b39cdd857eca7cd.tar.bz2
rails-dd27c4e5fb338e2571e691c23b39cdd857eca7cd.zip
PostgreSQL: correct binary escaping. References #8049, closes #10176 [jbasdf, tmacedo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8185 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 64f314a7f6..b5b636d1a4 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -75,7 +75,7 @@ module ActiveRecord
if PGconn.respond_to?(:unescape_bytea)
self.class.module_eval do
define_method(:binary_to_string) do |value|
- if value =~ /\\\\\d{3}/
+ if value =~ /\\\d{3}/
PGconn.unescape_bytea(value)
else
value
@@ -85,7 +85,7 @@ module ActiveRecord
else
self.class.module_eval do
define_method(:binary_to_string) do |value|
- if value =~ /\\\\\d{3}/
+ if value =~ /\\\d{3}/
result = ''
i, max = 0, value.size
while i < max