diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-10-13 10:37:43 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-10-26 13:44:09 -0700 |
| commit | d6b16bbaf705237f68980c4b0bd3b407225d8aa0 (patch) | |
| tree | dc94cb3daa88394d9e2117f70a95f58e0d99234b /activerecord/test | |
| parent | 77b1193ac148aec3fd08fd21b26827428a1449bb (diff) | |
| download | rails-d6b16bbaf705237f68980c4b0bd3b407225d8aa0.tar.gz rails-d6b16bbaf705237f68980c4b0bd3b407225d8aa0.tar.bz2 rails-d6b16bbaf705237f68980c4b0bd3b407225d8aa0.zip | |
one more mysql test left!
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/query_cache_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb index 594db1d0ab..bdd0cc6b7b 100644 --- a/activerecord/test/cases/query_cache_test.rb +++ b/activerecord/test/cases/query_cache_test.rb @@ -57,7 +57,7 @@ class QueryCacheTest < ActiveRecord::TestCase # Oracle adapter returns count() as Fixnum or Float if current_adapter?(:OracleAdapter) assert_kind_of Numeric, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks") - elsif current_adapter?(:SQLite3Adapter) && SQLite3::Version::VERSION > '1.2.5' or current_adapter?(:Mysql2Adapter) + elsif current_adapter?(:SQLite3Adapter) && SQLite3::Version::VERSION > '1.2.5' || current_adapter?(:Mysql2Adapter) || current_adapter?(:MysqlAdapter) # Future versions of the sqlite3 adapter will return numeric assert_instance_of Fixnum, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks") |