aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/calculations_test.rb
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-12-20 18:44:26 -0700
committerSean Griffin <sean@seantheprogrammer.com>2015-12-20 18:44:26 -0700
commit560995884128a1651d3efee99fcce67e8f88d8c5 (patch)
treea1c908f353b10cdcf0d554f7cefbaf7ce0421cfc /activerecord/test/cases/calculations_test.rb
parent249e943a0d25f0014e14e52454e01205c9537019 (diff)
parentaf9878d6405c43f46c0b1dd65df788a2b1194ce0 (diff)
downloadrails-560995884128a1651d3efee99fcce67e8f88d8c5.tar.gz
rails-560995884128a1651d3efee99fcce67e8f88d8c5.tar.bz2
rails-560995884128a1651d3efee99fcce67e8f88d8c5.zip
Merge pull request #22715 from kamipo/remove_mysql_adapter
Remove legacy mysql adapter
Diffstat (limited to 'activerecord/test/cases/calculations_test.rb')
-rw-r--r--activerecord/test/cases/calculations_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index d09009b65d..c922a8d1c2 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -545,8 +545,8 @@ class CalculationsTest < ActiveRecord::TestCase
assert_equal 7, Company.includes(:contracts).sum(:developer_id)
end
- def test_from_option_with_specified_index
- if Edge.connection.adapter_name == 'Mysql2'
+ if current_adapter?(:Mysql2Adapter)
+ def test_from_option_with_specified_index
assert_equal Edge.count(:all), Edge.from('edges USE INDEX(unique_edge_index)').count(:all)
assert_equal Edge.where('sink_id < 5').count(:all),
Edge.from('edges USE INDEX(unique_edge_index)').where('sink_id < 5').count(:all)