aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/calculations_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-08-07 11:58:45 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-08-07 11:58:45 -0700
commit06afa48c8c7bb7bf75f9e7ae48e06528f8ff82ed (patch)
tree9cecacc58dce4ed33885c2c143c10aca5feadb6d /activerecord/test/cases/calculations_test.rb
parent010a0c92eb573cd4c216c51371356adddfde11cf (diff)
parent5f0c425e8d106df4cdf844ac4859fc373f9c43e1 (diff)
downloadrails-06afa48c8c7bb7bf75f9e7ae48e06528f8ff82ed.tar.gz
rails-06afa48c8c7bb7bf75f9e7ae48e06528f8ff82ed.tar.bz2
rails-06afa48c8c7bb7bf75f9e7ae48e06528f8ff82ed.zip
Merge branch 'oracle_enhanced'
Diffstat (limited to 'activerecord/test/cases/calculations_test.rb')
-rw-r--r--activerecord/test/cases/calculations_test.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 75f52dfa4a..24bc4f71ce 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -298,7 +298,12 @@ class CalculationsTest < ActiveRecord::TestCase
end
def test_should_sum_expression
- assert_equal '636', Account.sum("2 * credit_limit")
+ # Oracle adapter returns floating point value 636.0 after SUM
+ if current_adapter?(:OracleAdapter)
+ assert_equal 636, Account.sum("2 * credit_limit")
+ else
+ assert_equal '636', Account.sum("2 * credit_limit")
+ end
end
def test_count_with_from_option