Skip to content

Commit 2d1ca38

Browse files
committed
Merge pull request rails#6709 from amatsuda/sqlite3_version_is_always_gt_125
current AR::ConnectionAdapters::SQLite3Adapter supports only SQLite3 ~> 1.3.6
2 parents c53ff33 + 998ef50 commit 2d1ca38

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

activerecord/test/cases/query_cache_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def test_cache_does_not_wrap_string_results_in_arrays
160160
# Oracle adapter returns count() as Fixnum or Float
161161
if current_adapter?(:OracleAdapter)
162162
assert_kind_of Numeric, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks")
163-
elsif current_adapter?(:SQLite3Adapter) && sqlite3_version > '1.2.5' || current_adapter?(:Mysql2Adapter) || current_adapter?(:MysqlAdapter)
163+
elsif current_adapter?(:SQLite3Adapter) || current_adapter?(:Mysql2Adapter) || current_adapter?(:MysqlAdapter)
164164
# Future versions of the sqlite3 adapter will return numeric
165165
assert_instance_of Fixnum,
166166
Task.connection.select_value("SELECT count(*) AS count_all FROM tasks")

0 commit comments

Comments
 (0)