diff options
| author | Matthew Draper <matthew@trebex.net> | 2018-08-23 19:40:04 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-23 19:40:04 +0930 |
| commit | 123fe0c9ac559cb58a208c23a96669845f24dfb1 (patch) | |
| tree | 5ea6d9893882d6eb48af809c54ec9f5c622dea83 /activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb | |
| parent | 2a321bff402bd990558b8a303f7168b5c4bcfc1d (diff) | |
| parent | 0ac81ee6ff3d1625fdbcc40b12c00cbff2208077 (diff) | |
| download | rails-123fe0c9ac559cb58a208c23a96669845f24dfb1.tar.gz rails-123fe0c9ac559cb58a208c23a96669845f24dfb1.tar.bz2 rails-123fe0c9ac559cb58a208c23a96669845f24dfb1.zip | |
Merge pull request #32647 from eugeneius/lazy_transactions
Omit BEGIN/COMMIT statements for empty transactions
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb index 41553cfa83..1d36c3c8b1 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb @@ -259,7 +259,9 @@ module ActiveRecord attr_reader :transaction_manager #:nodoc: - delegate :within_new_transaction, :open_transactions, :current_transaction, :begin_transaction, :commit_transaction, :rollback_transaction, to: :transaction_manager + delegate :within_new_transaction, :open_transactions, :current_transaction, :begin_transaction, + :commit_transaction, :rollback_transaction, :materialize_transactions, + :disable_lazy_transactions!, :enable_lazy_transactions!, to: :transaction_manager def transaction_open? current_transaction.open? |