From 081eed352fb7c16cbe1a18e13d032aa3512b04cd Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Mon, 11 Feb 2008 07:24:25 +0000 Subject: Fix the pre-quoted table names in the eager tests. [mislav] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8857 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/test/cases/associations/eager_test.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'activerecord') diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index c95099c146..a4fd71abea 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -126,8 +126,9 @@ class EagerAssociationTest < ActiveRecord::TestCase end def test_eager_association_loading_with_belongs_to_and_conditions_string_with_quoted_table_name + quoted_posts_id= Comment.connection.quote_table_name('posts') + '.' + Comment.connection.quote_column_name('id') assert_nothing_raised do - Comment.find(:all, :include => :post, :conditions => ["#{Comment.connection.quote_table_name('posts.id')} = ?",4]) + Comment.find(:all, :include => :post, :conditions => ["#{quoted_posts_id} = ?",4]) end end @@ -138,8 +139,9 @@ class EagerAssociationTest < ActiveRecord::TestCase end def test_eager_association_loading_with_belongs_to_and_order_string_with_quoted_table_name + quoted_posts_id= Comment.connection.quote_table_name('posts') + '.' + Comment.connection.quote_column_name('id') assert_nothing_raised do - Comment.find(:all, :include => :post, :order => Comment.connection.quote_table_name('posts.id')) + Comment.find(:all, :include => :post, :order => quoted_posts_id) end end -- cgit v1.2.3