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/associations | |
| 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/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_collection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index d2c61cdc78..b3a69ab0c0 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -21,7 +21,7 @@ module ActiveRecord construct_sql end - delegate :group, :order, :limit, :joins, :where, :preload, :eager_load, :from, :to => :scoped + delegate :group, :order, :limit, :joins, :where, :preload, :eager_load, :from, :lock, :to => :scoped def select(select = nil, &block) if block_given? |