diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-16 23:11:35 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-16 23:11:35 +0530 |
| commit | 3968825f5ff6a75cb83400716d56ec10f261e41a (patch) | |
| tree | 2a595291556ae52b920036e596fd2b7f257e4ab2 /activerecord/lib/active_record/calculations.rb | |
| parent | cfdfd899262c79c37ac89e030f4d90c8f9868b50 (diff) | |
| download | rails-3968825f5ff6a75cb83400716d56ec10f261e41a.tar.gz rails-3968825f5ff6a75cb83400716d56ec10f261e41a.tar.bz2 rails-3968825f5ff6a75cb83400716d56ec10f261e41a.zip | |
Make sure Model#active_relation always adds STI conditions if needed
Diffstat (limited to 'activerecord/lib/active_record/calculations.rb')
| -rw-r--r-- | activerecord/lib/active_record/calculations.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index a79ceb1d05..ed4218807d 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -167,8 +167,6 @@ module ActiveRecord if merge_with_relation relation = merge_with_relation.except(:select, :order, :limit, :offset, :group, :from).merge(relation) - else - relation = relation.where(type_condition) if finder_needs_type_condition? end from = merge_with_relation.from_value if merge_with_relation && merge_with_relation.from_value.present? @@ -194,8 +192,6 @@ module ActiveRecord relation.where_values = merge_with_relation.where_values merge_limit = merge_with_relation.taken - else - relation = relation.where(type_condition) if finder_needs_type_condition? end relation = relation.apply_finder_options(options.slice(:joins, :group, :having, :order, :conditions, :from)). |