diff options
author | Matthew Draper <matthew@trebex.net> | 2019-04-09 09:44:04 +0930 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-09 09:44:04 +0930 |
commit | 95fee9438bfbd2130aba6e8bcd05ed28a77e7a85 (patch) | |
tree | c52a02c7af2901abd10bc820e78acd149d02d9f9 | |
parent | a497ece3f7046123cb7fe6720f08d40e4ca6019d (diff) | |
parent | 66762b81f45a4499a749378bbf14eb64bc097d3a (diff) | |
download | rails-95fee9438bfbd2130aba6e8bcd05ed28a77e7a85.tar.gz rails-95fee9438bfbd2130aba6e8bcd05ed28a77e7a85.tar.bz2 rails-95fee9438bfbd2130aba6e8bcd05ed28a77e7a85.zip |
Merge pull request #34800 from mqchau/mysqlCountDeleteRowInLock
Wrap Mysql count of deleted rows in lock block to avoid conflict in test
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb | 4 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/mysql2/count_deleted_rows_with_lock_test.rb | 28 |
2 files changed, 31 insertions, 1 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 a14394fe04..2132e5d248 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb @@ -61,7 +61,9 @@ module ActiveRecord def exec_delete(sql, name = nil, binds = []) if without_prepared_statement?(binds) - execute_and_free(sql, name) { @connection.affected_rows } + @lock.synchronize do + execute_and_free(sql, name) { @connection.affected_rows } + end else exec_stmt_and_free(sql, name, binds) { |stmt| stmt.affected_rows } end diff --git a/activerecord/test/cases/adapters/mysql2/count_deleted_rows_with_lock_test.rb b/activerecord/test/cases/adapters/mysql2/count_deleted_rows_with_lock_test.rb new file mode 100644 index 0000000000..4d361e405c --- /dev/null +++ b/activerecord/test/cases/adapters/mysql2/count_deleted_rows_with_lock_test.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +require "cases/helper" +require "support/connection_helper" +require "models/author" +require "models/bulb" + +module ActiveRecord + class CountDeletedRowsWithLockTest < ActiveRecord::Mysql2TestCase + test "delete and create in different threads synchronize correctly" do + Bulb.unscoped.delete_all + Bulb.create!(name: "Jimmy", color: "blue") + + delete_thread = Thread.new do + Bulb.unscoped.delete_all + end + + create_thread = Thread.new do + Author.create!(name: "Tommy") + end + + delete_thread.join + create_thread.join + + assert_equal 1, delete_thread.value + end + end +end |