aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoichi ITO <koic.ito@gmail.com>2017-06-06 19:09:26 +0900
committerKoichi ITO <koic.ito@gmail.com>2017-06-06 19:09:26 +0900
commitb8dea23c4abe38b4599cf2faf72283e16d248fba (patch)
treed292f2bd4e3faaf849df6b96fb76f2130090bd9d
parent46ca735a0170e28db49fa48939ed697e97ed9f54 (diff)
downloadrails-b8dea23c4abe38b4599cf2faf72283e16d248fba.tar.gz
rails-b8dea23c4abe38b4599cf2faf72283e16d248fba.tar.bz2
rails-b8dea23c4abe38b4599cf2faf72283e16d248fba.zip
Fix `test_pluck_without_column_names` when using Oracle
-rw-r--r--activerecord/test/cases/calculations_test.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 21c5c0efee..80baaac30a 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -580,8 +580,11 @@ class CalculationsTest < ActiveRecord::TestCase
end
def test_pluck_without_column_names
- assert_equal [[1, "Firm", 1, nil, "37signals", nil, 1, nil, ""]],
- Company.order(:id).limit(1).pluck
+ if current_adapter?(:OracleAdapter)
+ assert_equal [[1, "Firm", 1, nil, "37signals", nil, 1, nil, nil]], Company.order(:id).limit(1).pluck
+ else
+ assert_equal [[1, "Firm", 1, nil, "37signals", nil, 1, nil, ""]], Company.order(:id).limit(1).pluck
+ end
end
def test_pluck_type_cast