diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2019-06-11 01:49:48 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2019-06-11 01:49:48 +0900 |
commit | 0542e0608f86d9e4089861f4e72c578bc983f89f (patch) | |
tree | ae496aa2e7eacbd57b70e13fb3d8b4e0ba97fd30 /activerecord | |
parent | 0aa86534d726090bc244b21367adc333ab961835 (diff) | |
download | rails-0542e0608f86d9e4089861f4e72c578bc983f89f.tar.gz rails-0542e0608f86d9e4089861f4e72c578bc983f89f.tar.bz2 rails-0542e0608f86d9e4089861f4e72c578bc983f89f.zip |
All modern adapters returns a numeric value as the result of numeric calculation
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/test/cases/calculations_test.rb | 6 | ||||
-rw-r--r-- | activerecord/test/cases/query_cache_test.rb | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb index e42af3686e..5dabff1431 100644 --- a/activerecord/test/cases/calculations_test.rb +++ b/activerecord/test/cases/calculations_test.rb @@ -589,11 +589,7 @@ class CalculationsTest < ActiveRecord::TestCase end def test_should_sum_expression - if current_adapter?(:SQLite3Adapter, :Mysql2Adapter, :PostgreSQLAdapter, :OracleAdapter) - assert_equal 636, Account.sum("2 * credit_limit") - else - assert_equal 636, Account.sum("2 * credit_limit").to_i - end + assert_equal 636, Account.sum("2 * credit_limit") end def test_sum_expression_returns_zero_when_no_records_to_sum diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb index eb32b690aa..8adff9129d 100644 --- a/activerecord/test/cases/query_cache_test.rb +++ b/activerecord/test/cases/query_cache_test.rb @@ -335,11 +335,7 @@ class QueryCacheTest < ActiveRecord::TestCase def test_cache_does_not_wrap_results_in_arrays Task.cache do - if current_adapter?(:SQLite3Adapter, :Mysql2Adapter, :PostgreSQLAdapter, :OracleAdapter) - assert_equal 2, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks") - else - assert_instance_of String, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks") - end + assert_equal 2, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks") end end |