diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2015-11-18 18:07:32 -0200 |
---|---|---|
committer | Rafael França <rafaelmfranca@gmail.com> | 2015-11-18 18:07:32 -0200 |
commit | 3d8a7c0e64fef726c22fd64911771cee8c467447 (patch) | |
tree | e637babeba9aed53a622b8877a521b4a88312eb1 /activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | |
parent | a951d5b0933a4a043619bc1bccb561d499b04633 (diff) | |
parent | 5ce21d4f72e72f8acdd5b849425a9475733d4d11 (diff) | |
download | rails-3d8a7c0e64fef726c22fd64911771cee8c467447.tar.gz rails-3d8a7c0e64fef726c22fd64911771cee8c467447.tar.bz2 rails-3d8a7c0e64fef726c22fd64911771cee8c467447.zip |
Merge pull request #22330 from samphilipd/samphilipd/rename_advisory_lock_key
Rename 'key' to 'lock_id' or 'lock_name' for advisory locking
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_adapter.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 55910865e5..4d4dc07b04 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -289,14 +289,14 @@ module ActiveRecord # locks # # Return true if we got the lock, otherwise false - def get_advisory_lock(key) # :nodoc: + def get_advisory_lock(lock_id) # :nodoc: end # This is meant to be implemented by the adapters that support advisory # locks. # # Return true if we released the lock, otherwise false - def release_advisory_lock(key) # :nodoc: + def release_advisory_lock(lock_id) # :nodoc: end # A list of extensions, to be filled in by adapters that support them. |