diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-08 19:14:35 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-08 19:14:35 -0300 |
| commit | 952014315926d370f2a0b681cb765948bf2e6883 (patch) | |
| tree | 3abfe7e82554c09df4b2fe8a170e90cf1f0bcf02 /activerecord/test/cases/query_cache_test.rb | |
| parent | ae9e1e9f6d08bbd5f5c1512b72d495168e9fa5e5 (diff) | |
| parent | ed8a0a1c2370ab8715434ba824b2826d807401d5 (diff) | |
| download | rails-952014315926d370f2a0b681cb765948bf2e6883.tar.gz rails-952014315926d370f2a0b681cb765948bf2e6883.tar.bz2 rails-952014315926d370f2a0b681cb765948bf2e6883.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/test/cases/adapter_test.rb
activerecord/test/cases/method_scoping_test.rb
Diffstat (limited to 'activerecord/test/cases/query_cache_test.rb')
| -rw-r--r-- | activerecord/test/cases/query_cache_test.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb index f90a66d1dc..2af6a56b6a 100644 --- a/activerecord/test/cases/query_cache_test.rb +++ b/activerecord/test/cases/query_cache_test.rb @@ -50,7 +50,12 @@ class QueryCacheTest < ActiveRecord::TestCase def test_cache_does_not_wrap_string_results_in_arrays Task.cache do - assert_instance_of String, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks") + # Oracle adapter returns count() as Fixnum or Float + if current_adapter?(:OracleAdapter) + assert Task.connection.select_value("SELECT count(*) AS count_all FROM tasks").is_a?(Numeric) + else + assert_instance_of String, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks") + end end end end |