Changeset 8856

Timestamp:

02/11/08 02:50:58 (5 months ago)

Author:

nzkoz

Message:

Fix eager loading with pre-quoted table names. Closes #11046 [danielmorrison, Koz, Jeremy Kemper]

Files:

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

trunk/activerecord/lib/active_record/associations.rb

@@ -1380 +1380 @@
-          end
-          return false unless conditions.any?
-\.\w+
+.?\.
-            condition_table_name != table_name
-          end
@@ -1389 +1389 @@
-          order = options[:order]
-          return false unless order
-\.\w+
+.?\.
-            order_table_name != table_name
-          end

trunk/activerecord/test/cases/associations/eager_test.rb

@@ -118 +118 @@
-    assert_equal 3, comments.length
-    assert_equal [6,7,8], comments.collect { |c| c.id }
+  end
+
+  def test_eager_association_loading_with_belongs_to_and_conditions_string_with_unquoted_table_name
+    assert_nothing_raised do
+      Comment.find(:all, :include => :post, :conditions => ['posts.id = ?',4])
+    end
+  end
+
+  def test_eager_association_loading_with_belongs_to_and_conditions_string_with_quoted_table_name
+    assert_nothing_raised do
+      Comment.find(:all, :include => :post, :conditions => ["#{Comment.connection.quote_table_name('posts.id')} = ?",4])
+    end
+  end
+
+  def test_eager_association_loading_with_belongs_to_and_order_string_with_unquoted_table_name
+    assert_nothing_raised do
+      Comment.find(:all, :include => :post, :order => 'posts.id')
+    end
+  end
+
+  def test_eager_association_loading_with_belongs_to_and_order_string_with_quoted_table_name
+    assert_nothing_raised do
+      Comment.find(:all, :include => :post, :order => Comment.connection.quote_table_name('posts.id'))
+    end
-  end
-