Skip to content

Commit d2cc375

Browse files
author
Anna
committed
updated AciveRecord syntax
1 parent 30d3945 commit d2cc375

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

test/cases/pessimistic_locking_test_sqlserver.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@ class PessimisticLockingTestSqlserver < ActiveRecord::TestCase
1616
should 'lock with simple find' do
1717
assert_nothing_raised do
1818
Person.transaction do
19-
Person.find 1, :lock => true
19+
Person.lock(true).find(1)
2020
end
2121
end
2222
end
23-
23+
#DEPRECATION WARNING: ActiveRecord::Base#with_scope and #with_exclusive_scope are deprecated. Please use ActiveRecord::Relation#scoping instead. (You can use #merge to merge multiple scopes together.). (called from with_scope at /Users/acarey/.rvm/gems/ruby-1.9.3-p448/gems/activerecord-deprecated_finders-1.0.3/lib/active_record/deprecated_finders/base.rb:75)
2424
should 'lock with scoped find' do
2525
assert_nothing_raised do
2626
Person.transaction do
27-
Person.send(:with_scope, :find => { :lock => true }) do
28-
Person.find 1
27+
Person.lock(true).scoping do
28+
Person.find(1)
2929
end
3030
end
3131
end
3232
end
3333

3434
should 'lock with eager find' do
35-
assert_nothing_raised do
35+
assert_nothing_raised do
3636
Person.transaction do
37-
Person.find 1, :include => :readers, :lock => true
37+
Person.lock(true).includes(:readers).find(1)
3838
end
3939
end
4040
end
@@ -52,7 +52,7 @@ class PessimisticLockingTestSqlserver < ActiveRecord::TestCase
5252

5353
should 'simply add lock to find all' do
5454
assert_sql %r|SELECT \[people\]\.\* FROM \[people\] WITH \(NOLOCK\)| do
55-
Person.all(:lock => 'WITH (NOLOCK)')
55+
Person.lock('WITH (NOLOCK)').load
5656
end
5757
end
5858

@@ -68,7 +68,7 @@ class PessimisticLockingTestSqlserver < ActiveRecord::TestCase
6868
eager_ids_sql = /SELECT TOP \(5\).*FROM \[people\] WITH \(NOLOCK\)/
6969
loader_sql = /FROM \[people\] WITH \(NOLOCK\).*WHERE \[people\]\.\[id\] IN/
7070
assert_sql(eager_ids_sql,loader_sql) do
71-
Person.all(:include => :readers, :lock => 'WITH (NOLOCK)', :limit => 5, :offset => 10)
71+
Person.lock('WITH (NOLOCK)').limit(5).offset(10).includes(:readers).references(:readers).load
7272
end
7373
end
7474

0 commit comments

Comments
 (0)