Changeset 7494

Timestamp:

09/15/07 23:50:12 (1 year ago)

Author:

bitsweat

Message:

Eager loading respects explicit :joins. Closes #9496.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (1 diff)
• trunk/activerecord/test/associations/eager_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Eager loading respects explicit :joins.  #9496 [dasil003]
-
-* Extract Firebird, FronBase, and OpenBase adapters into gems.  #9508, #9509, #9510 [Jeremy Kemper]

trunk/activerecord/lib/active_record/associations.rb

@@ -1267 +1267 @@
-        def construct_finder_sql_for_association_limiting(options, join_dependency)
-          scope       = scope(:find)
-
+!options[:joins].blank? || 
-          sql = "SELECT "
-          if is_distinct

trunk/activerecord/test/associations/eager_test.rb

@@ -102 +102 @@
-    assert_equal 1, posts.length
-    assert_equal [2], posts.collect { |p| p.id }
+  end
+  
+  def test_eager_association_loading_with_explicit_join
+    posts = Post.find(:all, :include => :comments, :joins => "INNER JOIN authors ON posts.author_id = authors.id AND authors.name = 'Mary'", :limit => 1, :order => 'author_id')
+    assert_equal 1, posts.length
-  end
-