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

Remove unused column types override

Browse source
This commit is contained in:
Sean Griffin 2014-06-10 11:17:09 -06:00
parent 584498a61f
commit ea6f28c8a1
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
activerecord/lib/active_record/core.rb
View file

@ -256,7 +256,6 @@ module ActiveRecord
end
@attributes = defaults
@column_types_override = nil
@column_types = self.class.column_types
init_internals
@ -283,7 +282,6 @@ module ActiveRecord
# post.title # => 'hello world'
def init_with(coder)
@attributes = coder['attributes']
@column_types_override = coder['column_types']
@column_types = self.class.column_types
init_internals
@ -357,7 +355,6 @@ module ActiveRecord
# FIXME: Remove this when we better serialize attributes
coder['raw_attributes'] = attributes_before_type_cast
coder['attributes'] = @attributes
coder['column_types'] = @column_types_override
coder['new_record'] = new_record?
end

10
activerecord/lib/active_record/persistence.rb
View file

@ -53,12 +53,7 @@ module ActiveRecord
type = column_types.fetch(name) { klass.type_for_attribute(name) }
h[name] = Attribute.from_database(value, type)
end
klass.allocate.init_with(
'attributes' => attributes,
'column_types' => column_types,
'new_record' => false,
)
klass.allocate.init_with('attributes' => attributes, 'new_record' => false)
end
private
@ -406,8 +401,7 @@ module ActiveRecord
@attributes.update(fresh_object.instance_variable_get('@attributes'))
@column_types = self.class.column_types
@column_types_override = fresh_object.instance_variable_get('@column_types_override')
@column_types = self.class.column_types
self
end