diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-12 10:18:11 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-12 10:18:11 +0000 |
| commit | c302cdfcc4e70d1adbc5fb4c89d361e446349800 (patch) | |
| tree | c7421a3fa7dcc685cbe3fa1a5d22fa45bd8dd132 /activerecord/lib/active_record | |
| parent | 41198ad3ad1925b2b88df9b16638c36dee43500f (diff) | |
| download | rails-c302cdfcc4e70d1adbc5fb4c89d361e446349800.tar.gz rails-c302cdfcc4e70d1adbc5fb4c89d361e446349800.tar.bz2 rails-c302cdfcc4e70d1adbc5fb4c89d361e446349800.zip | |
Fix scope typo in add_lock! Closes #6482. [zubek]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5907 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index b6bdf65d0f..c51564ecfc 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1143,7 +1143,7 @@ module ActiveRecord #:nodoc: # The optional scope argument is for the current :find scope. # The :lock option has precedence over a scoped :lock. def add_lock!(sql, options, scope = :auto) - scope = scope(:find) if :auto == :scope + scope = scope(:find) if :auto == scope options = options.reverse_merge(:lock => scope[:lock]) if scope connection.add_lock!(sql, options) end |