aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/associations
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-11-01 20:28:48 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-11-01 20:28:48 +0000
commit70840d4b7fcd16c45b7be69c51b0bd1d27c7cbff (patch)
treeb56f01e4586c05e69d1575a986ae59cfa640460e /activerecord/test/associations
parentc1c96d55d754e6de1572e35bc9bc68cc896655bf (diff)
downloadrails-70840d4b7fcd16c45b7be69c51b0bd1d27c7cbff.tar.gz
rails-70840d4b7fcd16c45b7be69c51b0bd1d27c7cbff.tar.bz2
rails-70840d4b7fcd16c45b7be69c51b0bd1d27c7cbff.zip
Oracle: resolve test failures, use prefetched primary key for inserts, check for null defaults. Factor out some common methods from all adapters. Closes #6515.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5384 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/associations')
-rw-r--r--activerecord/test/associations/eager_test.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/test/associations/eager_test.rb b/activerecord/test/associations/eager_test.rb
index 909083fd28..e8e14c2c50 100644
--- a/activerecord/test/associations/eager_test.rb
+++ b/activerecord/test/associations/eager_test.rb
@@ -121,10 +121,11 @@ class EagerAssociationTest < Test::Unit::TestCase
author = Author.find(:first, :include => :special_nonexistant_post_comments, :order => 'authors.id')
assert_equal [], author.special_nonexistant_post_comments
end
-
+
def test_eager_with_has_many_through_join_model_with_conditions
- assert_equal Author.find(:first, :include => :hello_post_comments).hello_post_comments,
- Author.find(:first).hello_post_comments
+ assert_equal Author.find(:first, :include => :hello_post_comments,
+ :order => 'authors.id').hello_post_comments.sort_by(&:id),
+ Author.find(:first, :order => 'authors.id').hello_post_comments.sort_by(&:id)
end
def test_eager_with_has_many_and_limit