diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-13 00:06:36 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-13 00:06:36 -0300 |
commit | b0a19903ed236c695ceb1939d1d07af23f5060c8 (patch) | |
tree | 23df188bfe4978cd4877492b44d1efb9ac3e21b1 /activerecord/test | |
parent | f91cbb068f7364eea9f902ff7851e498c5b66092 (diff) | |
parent | 01f7d14494f2a82d87386dd105075c2ae5bd6ef3 (diff) | |
download | rails-b0a19903ed236c695ceb1939d1d07af23f5060c8.tar.gz rails-b0a19903ed236c695ceb1939d1d07af23f5060c8.tar.bz2 rails-b0a19903ed236c695ceb1939d1d07af23f5060c8.zip |
Merge pull request #20126 from drcapulet/master
Add full set of MySQL CLI options to support SSL authentication when using db:structure dump and load
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/tasks/mysql_rake_test.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb index f58535f044..8d69741a4a 100644 --- a/activerecord/test/cases/tasks/mysql_rake_test.rb +++ b/activerecord/test/cases/tasks/mysql_rake_test.rb @@ -283,12 +283,21 @@ 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", "test-db").returns(true) + Kernel.expects(:system).with("mysqldump", "--port=10000", "--result-file", filename, "--no-data", "test-db").returns(true) ActiveRecord::Tasks::DatabaseTasks.structure_dump( @configuration.merge('port' => 10000), filename) end + + def test_structure_dump_with_ssl + filename = "awesome-file.sql" + Kernel.expects(:system).with("mysqldump", "--ssl-ca=ca.crt", "--result-file", filename, "--no-data", "test-db").returns(true) + + ActiveRecord::Tasks::DatabaseTasks.structure_dump( + @configuration.merge("sslca" => "ca.crt"), + filename) + end end class MySQLStructureLoadTest < ActiveRecord::TestCase |