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_mysql_adapter.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_mysql_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index 9ff76435a1..ad045f85ef 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -180,6 +180,8 @@ module ActiveRecord # Executes the SQL statement in the context of this connection. def execute(sql, name = nil) + materialize_transactions + log(sql, name) do ActiveSupport::Dependencies.interlock.permit_concurrent_loads do @connection.query(sql) |