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

Merge pull request #15621 from sgrif/sg-column-type-decorations

Browse source 
No need to decorate columns twice
This commit is contained in:
Rafael Mendonça França 2014-06-10 19:14:37 -03:00
commit 80b4fe2c50
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,6 @@ module ActiveRecord
# how this "single-table" inheritance mapping is implemented.
def instantiate(attributes, column_types = {})
klass = discriminate_class_for_record(attributes)
column_types = klass.decorate_columns(column_types.dup)
klass.allocate.init_with(
'raw_attributes' => attributes,
'column_types' => column_types,

2
activerecord/lib/active_record/querying.rb
View file

@ -40,7 +40,7 @@ module ActiveRecord
column_types = {}
if result_set.respond_to? :column_types
column_types = result_set.column_types.merge(columns_hash)
column_types = result_set.column_types.except(*columns_hash.keys)
else
ActiveSupport::Deprecation.warn "the object returned from `select_all` must respond to `column_types`"
end