diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 02:59:42 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:00:56 +0530 |
| commit | cd90dcb1bde5c411a55bcec97597a8fe22b56a5d (patch) | |
| tree | 41d3c22a8c81d8bdbb4d79749aea495e1bc0a7aa /activerecord/lib/active_record/associations.rb | |
| parent | e9a1dbe79a6610793a71af227aaf64ff55554cad (diff) | |
| download | rails-cd90dcb1bde5c411a55bcec97597a8fe22b56a5d.tar.gz rails-cd90dcb1bde5c411a55bcec97597a8fe22b56a5d.tar.bz2 rails-cd90dcb1bde5c411a55bcec97597a8fe22b56a5d.zip | |
Rename Model.active_relation to Model.unscoped
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index b52b298027..3034e9d237 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1703,7 +1703,7 @@ module ActiveRecord end def construct_finder_arel_with_included_associations(options, join_dependency) - relation = active_relation + relation = unscoped for association in join_dependency.join_associations relation = association.join_relation(relation) @@ -1754,7 +1754,7 @@ module ActiveRecord end def construct_finder_sql_for_association_limiting(options, join_dependency) - relation = active_relation + relation = unscoped for association in join_dependency.join_associations relation = association.join_relation(relation) |