diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-20 19:04:37 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-20 19:06:20 -0300 |
| commit | e4018a00fdfb6b0586c42d4a25a005b5ca416173 (patch) | |
| tree | ccfd1f364d8827972c200473e21a34e035fb6fa9 /activerecord/test/cases/associations | |
| parent | 50a76c14f95373b6e723e8603f43f1cf6af5b4c7 (diff) | |
| download | rails-e4018a00fdfb6b0586c42d4a25a005b5ca416173.tar.gz rails-e4018a00fdfb6b0586c42d4a25a005b5ca416173.tar.bz2 rails-e4018a00fdfb6b0586c42d4a25a005b5ca416173.zip | |
Revert "backport fair connection pool 02b2335563 to 3-2-stable"
This reverts commit 0693e079708a52b777f2b7872b8e3d467b880a0d.
Revert "Cache columns metadata to avoid extra while testing"
This reverts commit a82f1e3f5d11c8dfba9f4c911745ec40a7965216.
Reason: This is causing failures in the postgresql build.
See http://travis-ci.org/#!/rails/rails/builds/2485584
Related with #7675
Diffstat (limited to 'activerecord/test/cases/associations')
| -rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 6 | ||||
| -rw-r--r-- | activerecord/test/cases/associations/has_many_associations_test.rb | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index 544c01461d..bf01b46852 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -929,10 +929,6 @@ class EagerAssociationTest < ActiveRecord::TestCase end def test_eager_loading_with_conditions_on_joined_table_preloads - # cache metadata in advance to avoid extra sql statements executed while testing - Tagging.first - Tag.first - posts = assert_queries(2) do Post.find(:all, :select => 'distinct posts.*', :include => :author, :joins => [:comments], :conditions => "comments.body like 'Thank you%'", :order => 'posts.id') end @@ -981,9 +977,7 @@ class EagerAssociationTest < ActiveRecord::TestCase end def test_eager_loading_with_conditions_on_join_model_preloads - # cache metadata in advance to avoid extra sql statements executed while testing Author.columns - AuthorAddress.first authors = assert_queries(2) do Author.find(:all, :include => :author_address, :joins => :comments, :conditions => "posts.title like 'Welcome%'") diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb index 618daa1b35..30cfcc53d2 100644 --- a/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_associations_test.rb @@ -1470,8 +1470,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase end def test_custom_primary_key_on_new_record_should_fetch_with_query - Essay.first # cache metadata in advance to avoid extra sql statements executed while testing - author = Author.new(:name => "David") assert !author.essays.loaded? |