diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-02-04 08:02:45 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-02-04 08:02:45 +1030 |
| commit | cdc112e3ea8bd7b5ba787e64f3f8ee3da3e5a64f (patch) | |
| tree | af61cbfd48e5b43dbbc070e7c298a3cf84fc2544 /activerecord/lib/active_record/inheritance.rb | |
| parent | 7710d7f432ca776885a346346ccf0971e80b7a34 (diff) | |
| download | rails-cdc112e3ea8bd7b5ba787e64f3f8ee3da3e5a64f.tar.gz rails-cdc112e3ea8bd7b5ba787e64f3f8ee3da3e5a64f.tar.bz2 rails-cdc112e3ea8bd7b5ba787e64f3f8ee3da3e5a64f.zip | |
Defer Arel attribute lookup to the model class
This still isn't as separated as I'd like, but it at least moves most of
the burden of alias mapping in one place.
Diffstat (limited to 'activerecord/lib/active_record/inheritance.rb')
| -rw-r--r-- | activerecord/lib/active_record/inheritance.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/inheritance.rb b/activerecord/lib/active_record/inheritance.rb index 3b6fb70d0d..899683ee4f 100644 --- a/activerecord/lib/active_record/inheritance.rb +++ b/activerecord/lib/active_record/inheritance.rb @@ -192,7 +192,7 @@ module ActiveRecord end def type_condition(table = arel_table) - sti_column = table[inheritance_column] + sti_column = arel_attribute(inheritance_column, table) sti_names = ([self] + descendants).map(&:sti_name) sti_column.in(sti_names) |