diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-04-06 03:08:30 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-04-06 03:08:30 -0300 |
| commit | 31f6bb23929b1fafdc3390b85113dcbcd4b3203a (patch) | |
| tree | ebd498165a9efa9b53ba38d56581d97ba4b3b9df /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | |
| parent | ce2cc069db41d9358c34a4f23ca2b82b5a682de2 (diff) | |
| parent | 6918c18abcadc008e6bb1205958a6123f389b7ce (diff) | |
| download | rails-31f6bb23929b1fafdc3390b85113dcbcd4b3203a.tar.gz rails-31f6bb23929b1fafdc3390b85113dcbcd4b3203a.tar.bz2 rails-31f6bb23929b1fafdc3390b85113dcbcd4b3203a.zip | |
Merge pull request #24078 from kamipo/show_variables
Simply use `select_value` in `show_variable`
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 | 3 |
1 files changed, 1 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 426a92c0bd..42d3c68970 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -541,8 +541,7 @@ module ActiveRecord # SHOW VARIABLES LIKE 'name' def show_variable(name) - variables = select_all("select @@#{name} as 'Value'", 'SCHEMA') - variables.first['Value'] unless variables.empty? + select_value("SELECT @@#{name}", 'SCHEMA') rescue ActiveRecord::StatementInvalid nil end |