kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Use current_adapter? over ActiveRecord::Base.connection.adapter_name in tests

Browse source
This commit is contained in:
Ryuta Kamizono 2021-02-25 13:07:29 +09:00
parent 534de08d51
commit 7dc16ddd48
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
activerecord/test/cases/column_alias_test.rb
View file

@ -6,14 +6,8 @@ require "models/topic"
class TestColumnAlias < ActiveRecord::TestCase class TestColumnAlias < ActiveRecord::TestCase
fixtures :topics fixtures :topics
QUERY = if "Oracle" == ActiveRecord::Base.connection.adapter_name
"SELECT id AS pk FROM topics WHERE ROWNUM < 2"
else
"SELECT id AS pk FROM topics"
end
def test_column_alias def test_column_alias
records = Topic.connection.select_all(QUERY) records = Topic.connection.select_all("SELECT id AS pk FROM topics")
assert_equal "pk", records[0].keys[0] assert_equal ["pk"], records.columns
end end
end end

2
activerecord/test/cases/fixtures_test.rb
View file

@ -1103,7 +1103,7 @@ class FoxyFixturesTest < ActiveRecord::TestCase
fixtures :parrots, :parrots_pirates, :pirates, :treasures, :mateys, :ships, :computers, fixtures :parrots, :parrots_pirates, :pirates, :treasures, :mateys, :ships, :computers,
:developers, :"admin/accounts", :"admin/users", :live_parrots, :dead_parrots, :books :developers, :"admin/accounts", :"admin/users", :live_parrots, :dead_parrots, :books
if ActiveRecord::Base.connection.adapter_name == "PostgreSQL" if current_adapter?(:PostgreSQLAdapter)
require "models/uuid_parent" require "models/uuid_parent"
require "models/uuid_child" require "models/uuid_child"
fixtures :uuid_parents, :uuid_children fixtures :uuid_parents, :uuid_children