diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-08-09 15:17:17 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-08-09 15:17:17 -0700 |
| commit | 394f4c967957b600e3dca249ada931893a83bccf (patch) | |
| tree | 63ce34a1d01e7d33985a3c0d036b0819ed158d13 /activerecord/test/cases/calculations_test.rb | |
| parent | 7171161124a2852ee7b40c5c632ba8e092c97409 (diff) | |
| parent | 188855501b454d6732fb1fd1d76cc26d6119f2eb (diff) | |
| download | rails-394f4c967957b600e3dca249ada931893a83bccf.tar.gz rails-394f4c967957b600e3dca249ada931893a83bccf.tar.bz2 rails-394f4c967957b600e3dca249ada931893a83bccf.zip | |
Merge remote branch 'brianmario/mysql2'
Diffstat (limited to 'activerecord/test/cases/calculations_test.rb')
| -rw-r--r-- | activerecord/test/cases/calculations_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb index 2c9d23c80f..afef31396e 100644 --- a/activerecord/test/cases/calculations_test.rb +++ b/activerecord/test/cases/calculations_test.rb @@ -325,7 +325,7 @@ class CalculationsTest < ActiveRecord::TestCase end def test_from_option_with_specified_index - if Edge.connection.adapter_name == 'MySQL' + if Edge.connection.adapter_name == 'MySQL' or Edge.connection.adapter_name == 'Mysql2' assert_equal Edge.count(:all), Edge.count(:all, :from => 'edges USE INDEX(unique_edge_index)') assert_equal Edge.count(:all, :conditions => 'sink_id < 5'), Edge.count(:all, :from => 'edges USE INDEX(unique_edge_index)', :conditions => 'sink_id < 5') |