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