diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2015-11-29 19:59:19 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2015-11-29 19:59:19 +0900 |
| commit | 81279484b928f6fb7a83d7c4ee3e718fa62f29e2 (patch) | |
| tree | ef668551af2102d90540031363cd2e35c89a37ef /activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | |
| parent | 127a87cf6569f02d3e1b377b23e075e4dcecaac8 (diff) | |
| download | rails-81279484b928f6fb7a83d7c4ee3e718fa62f29e2.tar.gz rails-81279484b928f6fb7a83d7c4ee3e718fa62f29e2.tar.bz2 rails-81279484b928f6fb7a83d7c4ee3e718fa62f29e2.zip | |
`connection_options` is only needed for `MysqlAdapter`
Not needed for `Mysql2Adapter` and `AbstractMysqlAdapter`.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index 3944698910..7ca597859d 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -16,8 +16,7 @@ module ActiveRecord end client = Mysql2::Client.new(config) - options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0] - ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config) + ConnectionAdapters::Mysql2Adapter.new(client, logger, nil, config) rescue Mysql2::Error => error if error.message.include?("Unknown database") raise ActiveRecord::NoDatabaseError |