diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-06-06 21:39:48 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-06 21:39:48 +0930 |
| commit | 86be4bfe37f8adc576b6895093656b63c2438d30 (patch) | |
| tree | d8c3ee0413e8ddba857f5c2034f95bd58c5fa213 /activerecord/test/cases | |
| parent | d1d39710cc4c525ab8f515eba70cb9ab4134fc64 (diff) | |
| parent | b8dea23c4abe38b4599cf2faf72283e16d248fba (diff) | |
| download | rails-86be4bfe37f8adc576b6895093656b63c2438d30.tar.gz rails-86be4bfe37f8adc576b6895093656b63c2438d30.tar.bz2 rails-86be4bfe37f8adc576b6895093656b63c2438d30.zip | |
Merge pull request #29370 from koic/fix_test_pluck_without_column_names_oracle
Fix `test_pluck_without_column_names` when using Oracle
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/calculations_test.rb | 7 |
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 |