diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-05-10 05:10:23 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-05-10 05:10:23 -0300 |
| commit | 6dec7645192bd89d81d47542255a346f93710830 (patch) | |
| tree | e35bfa9ced3e8447f6029dc23c484d033418bf0d /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | |
| parent | 6c471becf0c108e95e1ae5844bba6e0d481a139a (diff) | |
| parent | 54772667eef242cb550882f155fd16c4eecfe685 (diff) | |
| download | rails-6dec7645192bd89d81d47542255a346f93710830.tar.gz rails-6dec7645192bd89d81d47542255a346f93710830.tar.bz2 rails-6dec7645192bd89d81d47542255a346f93710830.zip | |
Merge pull request #24950 from kamipo/should_quote_lock_name
Should quote `lock_name` to pass to `get_advisory_lock`
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 4 |
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 4eb009c873..fdd6bffa13 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -146,11 +146,11 @@ module ActiveRecord end def get_advisory_lock(lock_name, timeout = 0) # :nodoc: - select_value("SELECT GET_LOCK('#{lock_name}', #{timeout});").to_s == '1' + select_value("SELECT GET_LOCK(#{quote(lock_name)}, #{timeout})") == 1 end def release_advisory_lock(lock_name) # :nodoc: - select_value("SELECT RELEASE_LOCK('#{lock_name}')").to_s == '1' + select_value("SELECT RELEASE_LOCK(#{quote(lock_name)})") == 1 end def native_database_types |