diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-11 13:04:43 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-11 13:04:43 -0700 |
| commit | 2d1ca38774078d01f160b1a6e807d093f348747f (patch) | |
| tree | df7770b4a12044476e33cab31caf08db80c7c1e6 /activerecord | |
| parent | c53ff3317de5506943d3548ca6fb475bebe79aac (diff) | |
| parent | 998ef50ef100ee02ac3f9fbfcfa5882ac5d44f08 (diff) | |
| download | rails-2d1ca38774078d01f160b1a6e807d093f348747f.tar.gz rails-2d1ca38774078d01f160b1a6e807d093f348747f.tar.bz2 rails-2d1ca38774078d01f160b1a6e807d093f348747f.zip | |
Merge pull request #6709 from amatsuda/sqlite3_version_is_always_gt_125
current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6
Diffstat (limited to 'activerecord')
| -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 a712e5f689..f36e879305 100644 --- a/activerecord/test/cases/query_cache_test.rb +++ b/activerecord/test/cases/query_cache_test.rb @@ -160,7 +160,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) || current_adapter?(:Mysql2Adapter) || current_adapter?(:MysqlAdapter) # Future versions of the sqlite3 adapter will return numeric assert_instance_of Fixnum, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks") |