diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-29 11:23:07 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-29 11:23:07 -0300 |
| commit | 4a3f71b6fb07f5bbf9e43b259a7429c96752e00b (patch) | |
| tree | 0e9bbf31ebd8aa0e11a64d826bdc275291275010 /activerecord/lib | |
| parent | 29f8eae3faf96cbe46e7eb949c7f674c5860c1cf (diff) | |
| parent | 8eb536e7b487351d7485879d436e9d747520ed90 (diff) | |
| download | rails-4a3f71b6fb07f5bbf9e43b259a7429c96752e00b.tar.gz rails-4a3f71b6fb07f5bbf9e43b259a7429c96752e00b.tar.bz2 rails-4a3f71b6fb07f5bbf9e43b259a7429c96752e00b.zip | |
Merge pull request #15406 from sgrif/sg-column-type-override
Result sets never override a model's column type
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/querying.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb index ef138c6f80..1fe54cea3f 100644 --- a/activerecord/lib/active_record/querying.rb +++ b/activerecord/lib/active_record/querying.rb @@ -40,7 +40,7 @@ module ActiveRecord column_types = {} if result_set.respond_to? :column_types - column_types = result_set.column_types + column_types = result_set.column_types.merge(columns_hash) else ActiveSupport::Deprecation.warn "the object returned from `select_all` must respond to `column_types`" end |