diff options
| author | Naoto Koshikawa <koshikawa@ppworks.jp> | 2016-01-28 13:16:57 +0900 |
|---|---|---|
| committer | Naoto Koshikawa <koshikawa@ppworks.jp> | 2016-01-28 14:44:03 +0900 |
| commit | 941a735bbeafd9068bba8d29fa1c7c5371ad8ce3 (patch) | |
| tree | 46ba9c8b1f999474a7f0482088c8f98e7d6d1387 /activerecord | |
| parent | b2fe263fa66755521ba845a64dcbe3a1d86e3ff6 (diff) | |
| download | rails-941a735bbeafd9068bba8d29fa1c7c5371ad8ce3.tar.gz rails-941a735bbeafd9068bba8d29fa1c7c5371ad8ce3.tar.bz2 rails-941a735bbeafd9068bba8d29fa1c7c5371ad8ce3.zip | |
Skip comments when exec mysqldump
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/tasks/mysql_database_tasks.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/cases/tasks/mysql_rake_test.rb | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb index 7a49322e06..4cf32c2abe 100644 --- a/activerecord/lib/active_record/tasks/mysql_database_tasks.rb +++ b/activerecord/lib/active_record/tasks/mysql_database_tasks.rb @@ -58,6 +58,7 @@ module ActiveRecord args.concat(["--result-file", "#{filename}"]) args.concat(["--no-data"]) args.concat(["--routines"]) + args.concat(["--skip-comments"]) args.concat(["#{configuration['database']}"]) run_cmd('mysqldump', args, 'dumping') diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb index 1632f04854..7c1da51990 100644 --- a/activerecord/test/cases/tasks/mysql_rake_test.rb +++ b/activerecord/test/cases/tasks/mysql_rake_test.rb @@ -255,7 +255,7 @@ module ActiveRecord def test_structure_dump filename = "awesome-file.sql" - Kernel.expects(:system).with("mysqldump", "--result-file", filename, "--no-data", "--routines", "test-db").returns(true) + Kernel.expects(:system).with("mysqldump", "--result-file", filename, "--no-data", "--routines", "--skip-comments", "test-db").returns(true) ActiveRecord::Tasks::DatabaseTasks.structure_dump(@configuration, filename) end @@ -263,7 +263,7 @@ module ActiveRecord def test_warn_when_external_structure_dump_command_execution_fails filename = "awesome-file.sql" Kernel.expects(:system) - .with("mysqldump", "--result-file", filename, "--no-data", "--routines", "test-db") + .with("mysqldump", "--result-file", filename, "--no-data", "--routines", "--skip-comments", "test-db") .returns(false) e = assert_raise(RuntimeError) { @@ -274,7 +274,7 @@ module ActiveRecord def test_structure_dump_with_port_number filename = "awesome-file.sql" - Kernel.expects(:system).with("mysqldump", "--port=10000", "--result-file", filename, "--no-data", "--routines", "test-db").returns(true) + Kernel.expects(:system).with("mysqldump", "--port=10000", "--result-file", filename, "--no-data", "--routines", "--skip-comments", "test-db").returns(true) ActiveRecord::Tasks::DatabaseTasks.structure_dump( @configuration.merge('port' => 10000), @@ -283,7 +283,7 @@ module ActiveRecord def test_structure_dump_with_ssl filename = "awesome-file.sql" - Kernel.expects(:system).with("mysqldump", "--ssl-ca=ca.crt", "--result-file", filename, "--no-data", "--routines", "test-db").returns(true) + Kernel.expects(:system).with("mysqldump", "--ssl-ca=ca.crt", "--result-file", filename, "--no-data", "--routines", "--skip-comments", "test-db").returns(true) ActiveRecord::Tasks::DatabaseTasks.structure_dump( @configuration.merge("sslca" => "ca.crt"), |