aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorKenta Okamoto <chocoby@gmail.com>2013-08-11 14:27:16 +0900
committerKenta Okamoto <chocoby@gmail.com>2013-10-18 21:56:59 +0900
commitbc5148da3d39ed86fd056698a7dd285ac543c55a (patch)
tree57180c23654391f38349d325c1c67de45343aa50 /activerecord/lib/active_record
parent6c2810b8ed692004dca43e554982cdfdb8517b80 (diff)
downloadrails-bc5148da3d39ed86fd056698a7dd285ac543c55a.tar.gz
rails-bc5148da3d39ed86fd056698a7dd285ac543c55a.tar.bz2
rails-bc5148da3d39ed86fd056698a7dd285ac543c55a.zip
Convert Fixnum into String the port number in MySQL
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/tasks/mysql_database_tasks.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
index 50569d2462..c755831e6d 100644
--- a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb
@@ -134,8 +134,9 @@ IDENTIFIED BY '#{configuration['password']}' WITH GRANT OPTION;
args << "--password=#{configuration['password']}" if configuration['password']
args.concat(['--default-character-set', configuration['encoding']]) if configuration['encoding']
configuration.slice('host', 'port', 'socket').each do |k, v|
- args.concat([ "--#{k}", v ]) if v
+ args.concat([ "--#{k}", v.to_s ]) if v
end
+
args
end
end