aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-10 14:12:18 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-10 14:12:18 -0700
commit9432c55f12afbeb752e5123767c793cfcfeafede (patch)
treeb3fb1a640bf01047077c13e20b1dc762061c3cb0 /activerecord
parent5522fd9bd8a1efd79cb2f48c712fa95092c15907 (diff)
parent5571e833f2408e93d42410115cdac3bcdd2b5e22 (diff)
downloadrails-9432c55f12afbeb752e5123767c793cfcfeafede.tar.gz
rails-9432c55f12afbeb752e5123767c793cfcfeafede.tar.bz2
rails-9432c55f12afbeb752e5123767c793cfcfeafede.zip
Merge pull request #9650 from yahonda/group_by_oracle
Address ActiveRecord::StatementInvalid: OCIError: ORA-00979
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/base_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index e5880a6b7b..aa09df5743 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1156,8 +1156,8 @@ class BasicsTest < ActiveRecord::TestCase
end
def test_find_keeps_multiple_group_values
- combined = Developer.all.merge!(:group => 'developers.name, developers.salary, developers.id, developers.created_at, developers.updated_at').to_a
- assert_equal combined, Developer.all.merge!(:group => ['developers.name', 'developers.salary', 'developers.id', 'developers.created_at', 'developers.updated_at']).to_a
+ combined = Developer.all.merge!(:group => 'developers.name, developers.salary, developers.id, developers.created_at, developers.updated_at, developers.created_on, developers.updated_on').to_a
+ assert_equal combined, Developer.all.merge!(:group => ['developers.name', 'developers.salary', 'developers.id', 'developers.created_at', 'developers.updated_at', 'developers.created_on', 'developers.updated_on']).to_a
end
def test_find_symbol_ordered_last