kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

r1609@asus: jeremy | 2005-07-03 00:18:43 -0700

Browse source 
more minor perf tweaks


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1627 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2005-07-03 08:32:17 +00:00
parent 397c8ee2a9
commit af9d03824a
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
activerecord/lib/active_record/base.rb
View file

@ -1207,8 +1207,11 @@ module ActiveRecord #:nodoc:
def read_attribute(attr_name)
if @attributes.keys.include? attr_name
if column = column_for_attribute(attr_name)
unserializable_attribute?(attr_name, column) ?
unserialize_attribute(attr_name) : column.type_cast(@attributes[attr_name])
if unserializable_attribute?(attr_name, column)
unserialize_attribute(attr_name)
else
column.type_cast(@attributes[attr_name])
end
else
@attributes[attr_name]
end
@ -1223,7 +1226,9 @@ module ActiveRecord #:nodoc:
# Returns true if the attribute is of a text column and marked for serialization.
def unserializable_attribute?(attr_name, column)
@attributes[attr_name] && [:text, :string].include?(column.send(:type)) && @attributes[attr_name].is_a?(String) && self.class.serialized_attributes[attr_name]
if value = @attributes[attr_name]
[:text, :string].include?(column.send(:type)) && value.is_a?(String) && self.class.serialized_attributes[attr_name]
end
end
# Returns the unserialized object of the attribute.
@ -1301,7 +1306,7 @@ module ActiveRecord #:nodoc:
# Quote strings appropriately for SQL statements.
def quote(value, column = nil)
connection.quote(value, column)
self.class.connection.quote(value, column)
end
# Interpolate custom sql string in instance context.