Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge [5689] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5690 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 0c483d0c8dc6639284a31f525a256d52dba19dca 1 parent 8804b7a
Jeremy Kemper jeremy authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 activerecord/test/locking_test.rb
7 activerecord/test/locking_test.rb
View
@@ -86,9 +86,12 @@ def test_lock_with_custom_column_without_default_sets_version_to_zero
unless current_adapter?(:SQLServerAdapter)
class PessimisticLockingTest < Test::Unit::TestCase
self.use_transactional_fixtures = false
- fixtures :people
+ fixtures :people, :readers
def setup
+ # Avoid introspection queries during tests.
+ Person.columns; Reader.columns
+
@allow_concurrency = ActiveRecord::Base.allow_concurrency
ActiveRecord::Base.allow_concurrency = true
end
@@ -123,7 +126,7 @@ def test_sane_find_with_scoped_lock
def test_eager_find_with_lock
assert_nothing_raised do
Person.transaction do
- Reader.find 1, :include => :person, :lock => true
+ Person.find 1, :include => :readers, :lock => true
end
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.