diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-13 15:30:52 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-13 15:30:52 -0700 |
commit | f7ef7caac634eba23fb339a5bcfe4734e216d04d (patch) | |
tree | be5cb6c02daae10fa84244df0ce69f631e2a66ae /activerecord/test/cases/query_cache_test.rb | |
parent | 8f432300b8d575ab3cd43910b7a9bf5d1de28615 (diff) | |
download | rails-f7ef7caac634eba23fb339a5bcfe4734e216d04d.tar.gz rails-f7ef7caac634eba23fb339a5bcfe4734e216d04d.tar.bz2 rails-f7ef7caac634eba23fb339a5bcfe4734e216d04d.zip |
fixing tests to deal with data differences between prepared statements and non-prepared statements
Diffstat (limited to 'activerecord/test/cases/query_cache_test.rb')
-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 da9dcf2440..dd881f8230 100644 --- a/activerecord/test/cases/query_cache_test.rb +++ b/activerecord/test/cases/query_cache_test.rb @@ -156,7 +156,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 > '1.2.5' || current_adapter?(:Mysql2Adapter) || current_adapter?(:MysqlAdapter) + elsif current_adapter?(:SQLite3Adapter) && sqlite3_version > '1.2.5' || 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") |