aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-04-26 19:47:47 -0700
committerGitHub <noreply@github.com>2017-04-26 19:47:47 -0700
commit9ca49e0fdbda534429beb7c31e3f7e6318e3cf74 (patch)
tree450be048ee32b80cce9109c4bf18a5ecf5c4d520 /activerecord/lib/active_record
parentf52cdaac6336f99d13622ff9bda556a3124a4121 (diff)
parent1ea09e2ea04d282c8ef6182b4496931ba7dc785a (diff)
downloadrails-9ca49e0fdbda534429beb7c31e3f7e6318e3cf74.tar.gz
rails-9ca49e0fdbda534429beb7c31e3f7e6318e3cf74.tar.bz2
rails-9ca49e0fdbda534429beb7c31e3f7e6318e3cf74.zip
Merge pull request #28891 from sodabrew/patch-1
Remove mysql2 database adapter default username root
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb2
1 files changed, 0 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 45e400b75b..af55cfe2f6 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -10,8 +10,6 @@ module ActiveRecord
# Establishes a connection to the database that's used by all Active Record objects.
def mysql2_connection(config)
config = config.symbolize_keys
-
- config[:username] = "root" if config[:username].nil?
config[:flags] ||= 0
if config[:flags].kind_of? Array