diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-19 12:35:18 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-19 12:35:18 -0700 |
| commit | 7dbf6960c090c67073f6c68f32e418b26f9a93ef (patch) | |
| tree | adf60e38c2e957cfc1cc4cf768a8c49d3bb75cec | |
| parent | 51bef9d8fb0b4da7a104425ab8545e9331387743 (diff) | |
| parent | d589d9f16045e535d5cefc5ae34b5d4340c17d80 (diff) | |
| download | rails-7dbf6960c090c67073f6c68f32e418b26f9a93ef.tar.gz rails-7dbf6960c090c67073f6c68f32e418b26f9a93ef.tar.bz2 rails-7dbf6960c090c67073f6c68f32e418b26f9a93ef.zip | |
Merge pull request #3064 from arunagw/jruby_test_fix_query_cache_test
fix test error when running with postgresql.
| -rw-r--r-- | activerecord/test/cases/query_cache_test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb index cda30a773e..7feac2b920 100644 --- a/activerecord/test/cases/query_cache_test.rb +++ b/activerecord/test/cases/query_cache_test.rb @@ -147,8 +147,10 @@ class QueryCacheTest < ActiveRecord::TestCase end def test_cache_does_not_wrap_string_results_in_arrays - require 'sqlite3/version' if current_adapter?(:SQLite3Adapter) - sqlite3_version = RUBY_PLATFORM =~ /java/ ? Jdbc::SQLite3::VERSION : SQLite3::VERSION + if current_adapter?(:SQLite3Adapter) + require 'sqlite3/version' + sqlite3_version = RUBY_PLATFORM =~ /java/ ? Jdbc::SQLite3::VERSION : SQLite3::VERSION + end Task.cache do # Oracle adapter returns count() as Fixnum or Float |