diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2019-02-01 13:41:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-01 13:41:44 -0500 |
| commit | bc0cad0690ab2c16fefae7421a2908052ca57f19 (patch) | |
| tree | cd13433a1e7ce141b4d14b66cf76019686d94931 /activerecord/lib/active_record/connection_adapters/abstract | |
| parent | 630a343f739a1ba29cf93dc149fff6e3e0a00b05 (diff) | |
| parent | 74dbce0fcad322ae958abc0a1e00e78a519710a1 (diff) | |
| download | rails-bc0cad0690ab2c16fefae7421a2908052ca57f19.tar.gz rails-bc0cad0690ab2c16fefae7421a2908052ca57f19.tar.bz2 rails-bc0cad0690ab2c16fefae7421a2908052ca57f19.zip | |
Merge pull request #35082 from Shopify/eagerly-materialize-test-transactions
Eagerly materialize the fixtures transaction
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/transaction.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb index 112f376d0a..c9e84e48cc 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb @@ -205,9 +205,12 @@ module ActiveRecord run_commit_callbacks: run_commit_callbacks) end - transaction.materialize! unless @connection.supports_lazy_transactions? && lazy_transactions_enabled? + if @connection.supports_lazy_transactions? && lazy_transactions_enabled? && options[:_lazy] != false + @has_unmaterialized_transactions = true + else + transaction.materialize! + end @stack.push(transaction) - @has_unmaterialized_transactions = true if @connection.supports_lazy_transactions? transaction end end |