Skip to content

Commit 50efa73

Browse files
authored
Merge pull request rails#54482 from aidanharan/update-all-tests-update-fragment
Allow other database adapters in support joins `update_all` tests for Postgresql and SQLite
2 parents 424b9b5 + dbf80f6 commit 50efa73

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

activerecord/test/cases/relation/update_all_test.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,8 @@ def test_update_all_with_unpermitted_relation_raises_error
8989
def test_dynamic_update_all_with_one_joined_table
9090
update_fragment = if current_adapter?(:TrilogyAdapter, :Mysql2Adapter)
9191
"toys.name = pets.name"
92-
elsif current_adapter?(:PostgreSQLAdapter, :SQLite3Adapter)
92+
else # PostgreSQLAdapter, SQLite3Adapter
9393
"name = pets.name"
94-
else
95-
raise NotImplementedError
9694
end
9795

9896
toys = Toy.joins(:pet)
@@ -107,10 +105,8 @@ def test_dynamic_update_all_with_one_joined_table
107105
def test_dynamic_update_all_with_two_joined_table
108106
update_fragment = if current_adapter?(:TrilogyAdapter, :Mysql2Adapter)
109107
"toys.name = owners.name"
110-
elsif current_adapter?(:PostgreSQLAdapter, :SQLite3Adapter)
108+
else # PostgreSQLAdapter, SQLite3Adapter
111109
"name = owners.name"
112-
else
113-
raise NotImplementedError
114110
end
115111

116112
toys = Toy.joins(pet: [:owner])

0 commit comments

Comments
 (0)