aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/query_cache_test.rb
diff options
context:
space:
mode:
authorBrian Lopez <seniorlopez@gmail.com>2010-08-02 01:37:57 -0700
committerBrian Lopez <seniorlopez@gmail.com>2010-08-02 01:37:57 -0700
commit21e81da33570ba9453831cfc59c4f42ff9cdc1b2 (patch)
tree80146b258842d120e3362119971971911ca6a0ef /activerecord/test/cases/query_cache_test.rb
parentfb0bd8c1092db51888ec4bb72af6c595e13c31fa (diff)
downloadrails-21e81da33570ba9453831cfc59c4f42ff9cdc1b2.tar.gz
rails-21e81da33570ba9453831cfc59c4f42ff9cdc1b2.tar.bz2
rails-21e81da33570ba9453831cfc59c4f42ff9cdc1b2.zip
update tests for mysql2 support
Diffstat (limited to 'activerecord/test/cases/query_cache_test.rb')
-rw-r--r--activerecord/test/cases/query_cache_test.rb2
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 f0d97a00d0..594db1d0ab 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'
+ elsif current_adapter?(:SQLite3Adapter) && SQLite3::Version::VERSION > '1.2.5' or current_adapter?(:Mysql2Adapter)
# Future versions of the sqlite3 adapter will return numeric
assert_instance_of Fixnum,
Task.connection.select_value("SELECT count(*) AS count_all FROM tasks")