TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

cache connection when quoting

Browse Source 
[#3642 state:committed]

Signed-off-by: Marius Nuennerich <marius@nuenneri.ch>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
This commit is contained in:
Comron Sattari 2010-05-02 13:09:22 +02:00 committed by Jeremy Kemper
parent 6b4e0cc526
commit e1a340a91d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activerecord/lib/active_record/base.rb
View File

@ -1362,7 +1362,8 @@ def sanitize_sql_array(ary)
def replace_bind_variables(statement, values) #:nodoc:
raise_if_bind_arity_mismatch(statement, statement.count('?'), values.size)
bound = values.dup
statement.gsub('?') { quote_bound_value(bound.shift) }
c = connection
statement.gsub('?') { quote_bound_value(bound.shift, c) }
end
def replace_named_bind_variables(statement, bind_vars) #:nodoc:
@ -1394,15 +1395,15 @@ def expand_range_bind_variables(bind_vars) #:nodoc:
expanded
end
def quote_bound_value(value) #:nodoc:
def quote_bound_value(value, c = connection) #:nodoc:
if value.respond_to?(:map) && !value.acts_like?(:string)
if value.respond_to?(:empty?) && value.empty?
connection.quote(nil)
c.quote(nil)
else
value.map { |v| connection.quote(v) }.join(',')
value.map { |v| c.quote(v) }.join(',')
end
else
connection.quote(value)
c.quote(value)
end
end