Ticket #11424: generate_valid_sql_on_deeply_nested_tables_and_association_limiting.diff

activerecord/test/cases/associations/cascaded_eager_loading_test.rb

@@ -58 +58 @@
-    assert_equal companies(:first_firm).account, assert_no_queries { firms.first.account.firm.account }
-    assert_equal companies(:first_firm).account.firm.account, assert_no_queries { firms.first.account.firm.account }
-  end
+  
+  def test_eager_association_loading_with_condition_on_cascaded_table_generates_valid_sql
+    assert_nothing_raised { Author.find(:all, :include => {:posts => :comments}, :conditions => "comments.body LIKE '%hello%'", :limit => 10) }
+  end
-
-  def test_eager_association_loading_with_has_many_sti
-    topics = Topic.find(:all, :include => :replies, :order => 'topics.id')

activerecord/lib/active_record/associations.rb

@@ -1437 +1437 @@
-          sql << " FROM #{connection.quote_table_name table_name} "
-
-          if is_distinct
-reject{ |ja| !all_tables.include?(ja.table_name) }.
+
-            add_joins!(sql, options, scope)
-          end
-