|
 |
239fb7 |
From 9103f7858aa712039d73a59d363ad1768df2abcf Mon Sep 17 00:00:00 2001
|
|
|
239fb7 |
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
|
|
|
239fb7 |
Date: Thu, 19 Jan 2017 11:40:59 +0900
|
|
|
239fb7 |
Subject: [PATCH] update CREATE TABLE statements generated by `sqlite3` command
|
|
|
239fb7 |
|
|
|
239fb7 |
From SQLite 3.16.0, `IF NOT EXISTS` set to CREATE TABLE statements.
|
|
|
239fb7 |
Ref: https://www.sqlite.org/src/info/c7021960f5c070fb
|
|
|
239fb7 |
|
|
|
239fb7 |
Fixes #27635.
|
|
|
239fb7 |
|
|
|
239fb7 |
(cherry picked from commit bdc8818330ec051cd226590e9539588e492e3c9d)
|
|
|
239fb7 |
---
|
|
|
239fb7 |
railties/test/application/rake/dbs_test.rb | 4 ++--
|
|
|
239fb7 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
239fb7 |
|
|
|
239fb7 |
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
|
|
|
239fb7 |
index cee9db5..1ec49ea 100644
|
|
|
239fb7 |
--- a/railties/test/application/rake/dbs_test.rb
|
|
|
239fb7 |
+++ b/railties/test/application/rake/dbs_test.rb
|
|
|
239fb7 |
@@ -176,7 +176,7 @@ def db_structure_dump_and_load(expected_database)
|
|
|
239fb7 |
`bin/rails generate model book title:string;
|
|
|
239fb7 |
bin/rails db:migrate db:structure:dump`
|
|
|
239fb7 |
structure_dump = File.read("db/structure.sql")
|
|
|
239fb7 |
- assert_match(/CREATE TABLE \"books\"/, structure_dump)
|
|
|
239fb7 |
+ assert_match(/CREATE TABLE (?:IF NOT EXISTS )?\"books\"/, structure_dump)
|
|
|
239fb7 |
`bin/rails environment db:drop db:structure:load`
|
|
|
239fb7 |
assert_match expected_database, ActiveRecord::Base.connection_config[:database]
|
|
|
239fb7 |
require "#{app_path}/app/models/book"
|
|
|
239fb7 |
@@ -204,7 +204,7 @@ def db_structure_dump_and_load(expected_database)
|
|
|
239fb7 |
stderr_output = capture(:stderr) { `bin/rails db:structure:dump` }
|
|
|
239fb7 |
assert_empty stderr_output
|
|
|
239fb7 |
structure_dump = File.read("db/structure.sql")
|
|
|
239fb7 |
- assert_match(/CREATE TABLE \"posts\"/, structure_dump)
|
|
|
239fb7 |
+ assert_match(/CREATE TABLE (?:IF NOT EXISTS )?\"posts\"/, structure_dump)
|
|
|
239fb7 |
end
|
|
|
239fb7 |
end
|
|
|
239fb7 |
|