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/mysql | |
| 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/mysql')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb index d89eeb7f54..684c7042a7 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb @@ -29,6 +29,8 @@ module ActiveRecord end def exec_query(sql, name = "SQL", binds = [], prepare: false) + materialize_transactions + if without_prepared_statement?(binds) execute_and_free(sql, name) do |result| ActiveRecord::Result.new(result.fields, result.to_a) if result @@ -41,6 +43,8 @@ module ActiveRecord end def exec_delete(sql, name = nil, binds = []) + materialize_transactions + if without_prepared_statement?(binds) execute_and_free(sql, name) { @connection.affected_rows } else |