diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2015-03-26 17:36:06 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2015-03-26 17:36:42 -0600 |
| commit | 3b50a7a3e18e1ae5ea1d76927e37021f50389abc (patch) | |
| tree | b3130dcfa4d6ee717ceb2aeca82e20f5ec45ee1f /activerecord/test/cases/query_cache_test.rb | |
| parent | 8b451e3a315666b93da43e7b61503014661f0ac6 (diff) | |
| parent | 1d8d5a74b81b8aab1f5e6d233d509a92525ed4e1 (diff) | |
| download | rails-3b50a7a3e18e1ae5ea1d76927e37021f50389abc.tar.gz rails-3b50a7a3e18e1ae5ea1d76927e37021f50389abc.tar.bz2 rails-3b50a7a3e18e1ae5ea1d76927e37021f50389abc.zip | |
Partially merge #17650
Merges 1d8d5a74b81b8aab1f5e6d233d509a92525ed4e1. The pull request as a
whole is quite large, and I'm reviewing the smaller pieces individually.
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 744f9edc47..2f0b5df286 100644 --- a/activerecord/test/cases/query_cache_test.rb +++ b/activerecord/test/cases/query_cache_test.rb @@ -184,7 +184,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, :Mysql2Adapter) + elsif current_adapter?(:SQLite3Adapter, :Mysql2Adapter, :PostgreSQLAdapter) # Future versions of the sqlite3 adapter will return numeric assert_instance_of Fixnum, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks") |