diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-12-28 12:33:35 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-12-28 12:42:06 +0530 |
| commit | a3c1db4e444baa8ae4f8d968fab786e03c93f413 (patch) | |
| tree | 0a4aaf8ff52648ff9e9593c867300765a66d3445 /activerecord/lib/active_record/base.rb | |
| parent | 1c47d04ea5ac19601b316daf8fdc6f38c50eec73 (diff) | |
| download | rails-a3c1db4e444baa8ae4f8d968fab786e03c93f413.tar.gz rails-a3c1db4e444baa8ae4f8d968fab786e03c93f413.tar.bz2 rails-a3c1db4e444baa8ae4f8d968fab786e03c93f413.zip | |
Add Model.lock and relation#lock now that arel has locking
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 3b880ce17f..a887b0c571 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -652,7 +652,7 @@ module ActiveRecord #:nodoc: end end - delegate :select, :group, :order, :limit, :joins, :where, :preload, :eager_load, :from, :to => :scoped + delegate :select, :group, :order, :limit, :joins, :where, :preload, :eager_load, :from, :lock, :to => :scoped # A convenience wrapper for <tt>find(:first, *args)</tt>. You can pass in all the # same arguments to this method as you can to <tt>find(:first)</tt>. @@ -1573,6 +1573,9 @@ module ActiveRecord #:nodoc: offset(construct_offset(options[:offset], scope)). from(options[:from]) + lock = (scope && scope[:lock]) || options[:lock] + relation = relation.lock if lock.present? + relation = relation.readonly if options[:readonly] relation |