diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-11-27 14:43:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-27 14:43:01 -0500 |
| commit | ddaca7ccec208ee80652e696e001671fd6e735f9 (patch) | |
| tree | b9da5c640d7620bda396ff5cb667f4a999e3cde6 /activerecord/lib/active_record | |
| parent | e4aec40578ea0dd2944f97f1ad60cfbdf4b3a44d (diff) | |
| parent | d34c1fc3d64e51f9aeecfbffefd843e744dfbeac (diff) | |
| download | rails-ddaca7ccec208ee80652e696e001671fd6e735f9.tar.gz rails-ddaca7ccec208ee80652e696e001671fd6e735f9.tar.bz2 rails-ddaca7ccec208ee80652e696e001671fd6e735f9.zip | |
Merge pull request #34528 from DmitryTsepelev/fix-ignored-attributes
Additional types of ResultSet should not contain keys of #attributes_to_define_after_schema_loads
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/querying.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb index c84f3d0fbb..0c55284f4c 100644 --- a/activerecord/lib/active_record/querying.rb +++ b/activerecord/lib/active_record/querying.rb @@ -40,7 +40,8 @@ module ActiveRecord def find_by_sql(sql, binds = [], preparable: nil, &block) result_set = connection.select_all(sanitize_sql(sql), "#{name} Load", binds, preparable: preparable) column_types = result_set.column_types.dup - columns_hash.each_key { |k| column_types.delete k } + cached_columns_hash = connection.schema_cache.columns_hash(table_name) + cached_columns_hash.each_key { |k| column_types.delete k } message_bus = ActiveSupport::Notifications.instrumenter payload = { |