diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-02-13 04:03:55 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2019-02-13 04:10:13 +0900 |
| commit | 7432e251873690234d0d288e8eb009fbee80b635 (patch) | |
| tree | 8752ed290d5708870cfbf1720a82948aaffa2a76 /activerecord | |
| parent | 3fb8ecc1353c76e5e80320c4886442b5ba525ea3 (diff) | |
| download | rails-7432e251873690234d0d288e8eb009fbee80b635.tar.gz rails-7432e251873690234d0d288e8eb009fbee80b635.tar.bz2 rails-7432e251873690234d0d288e8eb009fbee80b635.zip | |
Should respect attribute_types over column_types
Fixed the CI failure https://travis-ci.org/rails/rails/jobs/492291248#L1185-L1191.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/querying.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb index 8c1b2e2be1..2a27f53f06 100644 --- a/activerecord/lib/active_record/querying.rb +++ b/activerecord/lib/active_record/querying.rb @@ -40,8 +40,7 @@ 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 - cached_columns_hash = connection.schema_cache.columns_hash(table_name) - cached_columns_hash.each_key { |k| column_types.delete k } + attribute_types.each_key { |k| column_types.delete k } message_bus = ActiveSupport::Notifications.instrumenter payload = { |