Rename 'key' to 'lock_id' or 'lock_name' for advisory locking

- key was a poor choice of name. A key implies something that will
  unlock a lock. The concept is actually more like a 'lock identifier'
- mysql documentation calls this a 'lock name'
- postgres documentation calls it a 'lock_id'
- Updated variable names to reflect the preferred terminology for the database in
  question

1 files changed, 9 insertions, 9 deletions

diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index 71c4028675..507d024bb6 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -133,30 +133,30 @@ class Mysql2ConnectionTest < ActiveRecord::Mysql2TestCase
   end
 
   def test_get_and_release_advisory_lock
-    key = "test_key"
+    lock_name = "test_lock_name"
 
-    got_lock = @connection.get_advisory_lock(key)
+    got_lock = @connection.get_advisory_lock(lock_name)
     assert got_lock, "get_advisory_lock should have returned true but it didn't"
 
-    assert_equal test_lock_free(key), false,
+    assert_equal test_lock_free(lock_name), false,
       "expected the test advisory lock to be held but it wasn't"
 
-    released_lock = @connection.release_advisory_lock(key)
+    released_lock = @connection.release_advisory_lock(lock_name)
     assert released_lock, "expected release_advisory_lock to return true but it didn't"
 
-    assert test_lock_free(key), 'expected the test key to be available after releasing'
+    assert test_lock_free(lock_name), 'expected the test lock to be available after releasing'
   end
 
   def test_release_non_existent_advisory_lock
-    fake_key = "fake_key"
-    released_non_existent_lock = @connection.release_advisory_lock(fake_key)
+    lock_name = "fake_lock_name"
+    released_non_existent_lock = @connection.release_advisory_lock(lock_name)
     assert_equal released_non_existent_lock, false,
       'expected release_advisory_lock to return false when there was no lock to release'
   end
 
   protected
 
-  def test_lock_free(key)
-    @connection.select_value("SELECT IS_FREE_LOCK('#{key}');") == 1
+  def test_lock_free(lock_name)
+    @connection.select_value("SELECT IS_FREE_LOCK('#{lock_name}');") == 1
   end
 end