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 /activerecord | |
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 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3/database_statements.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3/database_statements.rb b/activerecord/lib/active_record/connection_adapters/sqlite3/database_statements.rb index 84dcae49b9..ffa75172b5 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3/database_statements.rb @@ -14,7 +14,7 @@ module ActiveRecord log(sql, name) do ActiveSupport::Dependencies.interlock.permit_concurrent_loads do - @connection.execute_batch(sql) + @connection.execute_batch2(sql) end end end diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index 8504438d2d..1801924c09 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -10,7 +10,7 @@ require "active_record/connection_adapters/sqlite3/schema_definitions" require "active_record/connection_adapters/sqlite3/schema_dumper" require "active_record/connection_adapters/sqlite3/schema_statements" -gem "sqlite3", "~> 1.3", ">= 1.3.6" +gem "sqlite3", "~> 1.4" require "sqlite3" module ActiveRecord |