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/dirty_test.rb | |
| 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/dirty_test.rb')
| -rw-r--r-- | activerecord/test/cases/dirty_test.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb index e1129704a6..3bd2e909d7 100644 --- a/activerecord/test/cases/dirty_test.rb +++ b/activerecord/test/cases/dirty_test.rb @@ -325,8 +325,6 @@ class DirtyTest < ActiveRecord::TestCase end def test_partial_update_with_optimistic_locking - Person.first # cache metadata in advance to avoid extra sql statements executed while testing - person = Person.new(:first_name => 'foo') old_lock_version = 1 @@ -532,7 +530,7 @@ class DirtyTest < ActiveRecord::TestCase pirate = target.create(:created_on => created_on) pirate.reload # Here mysql truncate the usec value to 0 - + pirate.created_on = created_on assert !pirate.created_on_changed? end |