diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-04-04 03:55:04 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 03:55:04 +0900 |
| commit | 9bccf4604ff007f5a2474b91a10a285b1849b746 (patch) | |
| tree | b66a18ff72fd898b5d6f5917836afe46c342acf2 /railties/test | |
| parent | d39b2b684e94e856a4a1257984ff6a1d5f978a2c (diff) | |
| parent | 0908184e4c2dca5b941030bbd0d5eb2dfcfed120 (diff) | |
| download | rails-9bccf4604ff007f5a2474b91a10a285b1849b746.tar.gz rails-9bccf4604ff007f5a2474b91a10a285b1849b746.tar.bz2 rails-9bccf4604ff007f5a2474b91a10a285b1849b746.zip | |
Merge pull request #35844 from kamipo/fix_fixture_loading_performance_regression
Use `execute_batch2` rather than `execute_batch` to fix performance regression for fixture loading
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/db_system_change_generator_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 87de68fdbd..6bbb12f433 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -526,7 +526,7 @@ class AppGeneratorTest < Rails::Generators::TestCase if defined?(JRUBY_VERSION) assert_gem "activerecord-jdbcsqlite3-adapter" else - assert_gem "sqlite3", "'~> 1.3', '>= 1.3.6'" + assert_gem "sqlite3", "'~> 1.4'" end end diff --git a/railties/test/generators/db_system_change_generator_test.rb b/railties/test/generators/db_system_change_generator_test.rb index d3d27b616a..607db96906 100644 --- a/railties/test/generators/db_system_change_generator_test.rb +++ b/railties/test/generators/db_system_change_generator_test.rb @@ -68,7 +68,7 @@ module Rails assert_file("Gemfile") do |content| assert_match "# Use sqlite3 as the database for Active Record", content - assert_match "gem 'sqlite3', '~> 1.3', '>= 1.3.6'", content + assert_match "gem 'sqlite3', '~> 1.4'", content end end |