diff options
| author | Edouard CHIN <edouard.chin@shopify.com> | 2017-06-21 14:08:12 -0400 |
|---|---|---|
| committer | Edouard CHIN <edouard.chin@shopify.com> | 2017-06-21 14:10:19 -0400 |
| commit | 8f1486f2697095749777c7896ab5bf9211a4b8d3 (patch) | |
| tree | c712bcfabc2224cd91967ae7a9359bbc010c62ce /activerecord | |
| parent | bed0fa8a88d8d51acb7d6084db76ab1cce7ecccc (diff) | |
| download | rails-8f1486f2697095749777c7896ab5bf9211a4b8d3.tar.gz rails-8f1486f2697095749777c7896ab5bf9211a4b8d3.tar.bz2 rails-8f1486f2697095749777c7896ab5bf9211a4b8d3.zip | |
PR Review
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/tasks/mysql_database_tasks.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb index 5b1eba6345..c25d87dd3e 100644 --- a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb +++ b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb @@ -66,7 +66,7 @@ module ActiveRecord end args.concat(["#{configuration['database']}"]) - args.insert(0, Array(extra_flags)).flatten! if extra_flags + args.unshift(*extra_flags) if extra_flags run_cmd("mysqldump", args, "dumping") end @@ -75,7 +75,7 @@ module ActiveRecord args = prepare_command_options args.concat(["--execute", %{SET FOREIGN_KEY_CHECKS = 0; SOURCE #{filename}; SET FOREIGN_KEY_CHECKS = 1}]) args.concat(["--database", "#{configuration['database']}"]) - args.insert(0, Array(extra_flags)).flatten! if extra_flags + args.unshift(*extra_flags) if extra_flags run_cmd("mysql", args, "loading") end |