aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-04-17 22:57:24 +0900
committerGitHub <noreply@github.com>2018-04-17 22:57:24 +0900
commit1fa91ee450227c5a5f0bfc2f99cabdc4c8ecb9da (patch)
tree694ee4ae4b9baf306be4fa50e86842535c465057
parent15d7fb90cc9e783b4b925246f22d4c41c7fc447b (diff)
parent74982a1be5dc040a16c5bc6d84f666b9fbdd445a (diff)
downloadrails-1fa91ee450227c5a5f0bfc2f99cabdc4c8ecb9da.tar.gz
rails-1fa91ee450227c5a5f0bfc2f99cabdc4c8ecb9da.tar.bz2
rails-1fa91ee450227c5a5f0bfc2f99cabdc4c8ecb9da.zip
Merge pull request #32594 from utilum/structure_dump_create_table
Fix test to allow IF NOT EXISTS in structure:dump
-rw-r--r--railties/test/application/rake/multi_dbs_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/rake/multi_dbs_test.rb b/railties/test/application/rake/multi_dbs_test.rb
index 43a433d40f..da5ae8376a 100644
--- a/railties/test/application/rake/multi_dbs_test.rb
+++ b/railties/test/application/rake/multi_dbs_test.rb
@@ -67,8 +67,8 @@ module ApplicationTests
else
schema_dump = File.read("db/#{format}.sql")
schema_dump_animals = File.read("db/animals_#{format}.sql")
- assert_match(/CREATE TABLE \"books\"/, schema_dump)
- assert_match(/CREATE TABLE \"dogs\"/, schema_dump_animals)
+ assert_match(/CREATE TABLE (?:IF NOT EXISTS )?\"books\"/, schema_dump)
+ assert_match(/CREATE TABLE (?:IF NOT EXISTS )?\"dogs\"/, schema_dump_animals)
end
rails "db:#{format}:load"