diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-15 23:50:12 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-15 23:50:12 +0000 |
| commit | b8657089f289e2b3a9d5c383516e951012b2bec2 (patch) | |
| tree | ea1fadd57c9b983d36cbcbec382c1af9e8c5c9f1 /activerecord/lib/active_record/associations.rb | |
| parent | a6083b86d18e02f7e3824be7ec8ccbbdec625908 (diff) | |
| download | rails-b8657089f289e2b3a9d5c383516e951012b2bec2.tar.gz rails-b8657089f289e2b3a9d5c383516e951012b2bec2.tar.bz2 rails-b8657089f289e2b3a9d5c383516e951012b2bec2.zip | |
Eager loading respects explicit :joins. Closes #9496.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7494 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index adde221477..8cb6bd02ac 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1266,7 +1266,7 @@ module ActiveRecord def construct_finder_sql_for_association_limiting(options, join_dependency) scope = scope(:find) - is_distinct = include_eager_conditions?(options) || include_eager_order?(options) + is_distinct = !options[:joins].blank? || include_eager_conditions?(options) || include_eager_order?(options) sql = "SELECT " if is_distinct sql << connection.distinct("#{table_name}.#{primary_key}", options[:order]) |