mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Avoid repeated calls to Base#connection. Closes #11111 [adymo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8871 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
838b02450a
commit
c75abf058e
1 changed files with 4 additions and 2 deletions
|
@ -2417,9 +2417,10 @@ module ActiveRecord #:nodoc:
|
||||||
# an SQL statement.
|
# an SQL statement.
|
||||||
def attributes_with_quotes(include_primary_key = true, include_readonly_attributes = true)
|
def attributes_with_quotes(include_primary_key = true, include_readonly_attributes = true)
|
||||||
quoted = {}
|
quoted = {}
|
||||||
|
connection = self.class.connection
|
||||||
@attributes.each_pair do |name, value|
|
@attributes.each_pair do |name, value|
|
||||||
if column = column_for_attribute(name)
|
if column = column_for_attribute(name)
|
||||||
quoted[name] = quote_value(read_attribute(name), column) unless !include_primary_key && column.primary
|
quoted[name] = connection.quote(read_attribute(name), column) unless !include_primary_key && column.primary
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
include_readonly_attributes ? quoted : remove_readonly_attributes(quoted)
|
include_readonly_attributes ? quoted : remove_readonly_attributes(quoted)
|
||||||
|
@ -2529,8 +2530,9 @@ module ActiveRecord #:nodoc:
|
||||||
end
|
end
|
||||||
|
|
||||||
def quoted_column_names(attributes = attributes_with_quotes)
|
def quoted_column_names(attributes = attributes_with_quotes)
|
||||||
|
connection = self.class.connection
|
||||||
attributes.keys.collect do |column_name|
|
attributes.keys.collect do |column_name|
|
||||||
self.class.connection.quote_column_name(column_name)
|
connection.quote_column_name(column_name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue