From b535a455a8a8e83901c8720eac9b0cb4a6445680 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sat, 20 Jun 2020 16:04:47 +0900 Subject: [PATCH] Add regression tests for 859fba7c4bf7d33b4f9655914ed4bdc85380552e --- activerecord/test/cases/relation/delete_all_test.rb | 10 +++++++++- activerecord/test/cases/relation/update_all_test.rb | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/activerecord/test/cases/relation/delete_all_test.rb b/activerecord/test/cases/relation/delete_all_test.rb index d1c13fa1b5..68ab852952 100644 --- a/activerecord/test/cases/relation/delete_all_test.rb +++ b/activerecord/test/cases/relation/delete_all_test.rb @@ -56,7 +56,15 @@ class DeleteAllTest < ActiveRecord::TestCase pets = Pet.joins(:toys).where(toys: { name: "Bone" }) assert_equal true, pets.exists? - assert_equal pets.count, pets.delete_all + sqls = capture_sql do + assert_equal pets.count, pets.delete_all + end + + if current_adapter?(:Mysql2Adapter) + assert_no_match %r/SELECT DISTINCT #{Regexp.escape(Pet.connection.quote_table_name("pets.pet_id"))}/, sqls.last + else + assert_match %r/SELECT #{Regexp.escape(Pet.connection.quote_table_name("pets.pet_id"))}/, sqls.last + end end def test_delete_all_with_joins_and_where_part_is_not_hash diff --git a/activerecord/test/cases/relation/update_all_test.rb b/activerecord/test/cases/relation/update_all_test.rb index fc4566e53f..67a575879b 100644 --- a/activerecord/test/cases/relation/update_all_test.rb +++ b/activerecord/test/cases/relation/update_all_test.rb @@ -46,7 +46,15 @@ class UpdateAllTest < ActiveRecord::TestCase pets = Pet.joins(:toys).where(toys: { name: "Bone" }) assert_equal true, pets.exists? - assert_equal pets.count, pets.update_all(name: "Bob") + sqls = capture_sql do + assert_equal pets.count, pets.update_all(name: "Bob") + end + + if current_adapter?(:Mysql2Adapter) + assert_no_match %r/SELECT DISTINCT #{Regexp.escape(Pet.connection.quote_table_name("pets.pet_id"))}/, sqls.last + else + assert_match %r/SELECT #{Regexp.escape(Pet.connection.quote_table_name("pets.pet_id"))}/, sqls.last + end end def test_update_all_with_left_joins