aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-12-20 21:12:25 +0900
committerGitHub <noreply@github.com>2017-12-20 21:12:25 +0900
commit8db0d36a967f51af93c79e6e9ffe472dd929281e (patch)
treec20fdf711bddad06426cedc8b28d13c7a737e089 /activerecord
parent3fcf72d4803faedd516cedcbea2a120be0f117b6 (diff)
parent429b2a2d3af74cdbe058baa29efebe5ef58c4bef (diff)
downloadrails-8db0d36a967f51af93c79e6e9ffe472dd929281e.tar.gz
rails-8db0d36a967f51af93c79e6e9ffe472dd929281e.tar.bz2
rails-8db0d36a967f51af93c79e6e9ffe472dd929281e.zip
Merge pull request #31521 from zinovyev/fix-mysql-get-lock-bigint
Fix Illegal parameter data type bigint for operation 'get_lock' error
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 0f4a11cb05..0afdd959f5 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -117,11 +117,11 @@ module ActiveRecord
end
def get_advisory_lock(lock_name, timeout = 0) # :nodoc:
- query_value("SELECT GET_LOCK(#{quote(lock_name)}, #{timeout})") == 1
+ query_value("SELECT GET_LOCK(#{quote(lock_name.to_s)}, #{timeout})") == 1
end
def release_advisory_lock(lock_name) # :nodoc:
- query_value("SELECT RELEASE_LOCK(#{quote(lock_name)})") == 1
+ query_value("SELECT RELEASE_LOCK(#{quote(lock_name.to_s)})") == 1
end
def native_database_types