aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2014-04-07 22:54:58 +0930
committerMatthew Draper <matthew@trebex.net>2014-04-08 00:36:30 +0930
commitc4bdca19a7a61eb12c75c4a3225e54b69b486a15 (patch)
treeaee1a37d4138b1dcd4348a2231522b4c5c8317d8 /activerecord/lib/active_record/connection_adapters
parent67e67063a4a39530ec0f49d979edb7c2897b8280 (diff)
downloadrails-c4bdca19a7a61eb12c75c4a3225e54b69b486a15.tar.gz
rails-c4bdca19a7a61eb12c75c4a3225e54b69b486a15.tar.bz2
rails-c4bdca19a7a61eb12c75c4a3225e54b69b486a15.zip
Use connection-specific bytea escaping
In our normal usage, it's rare for this to make a difference... but is more technically correct. As well as a spec that proves this is a good idea, let's also add a more sane-looking one that just covers basic to_sql functionality. There aren't many places where we actually use escape_bytea, but that's one that won't be going away.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
index 210172cf32..ac3b0f713d 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
@@ -4,14 +4,14 @@ module ActiveRecord
module Quoting
# Escapes binary strings for bytea input to the database.
def escape_bytea(value)
- PGconn.escape_bytea(value) if value
+ @connection.escape_bytea(value) if value
end
# Unescapes bytea output from a database to the binary string it represents.
# NOTE: This is NOT an inverse of escape_bytea! This is only to be used
# on escaped binary output from database drive.
def unescape_bytea(value)
- PGconn.unescape_bytea(value) if value
+ @connection.unescape_bytea(value) if value
end
# Quotes PostgreSQL-specific data types for SQL input.