aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-05-12 16:34:36 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-05-12 16:34:36 -0700
commit871b1c2115182e7273b75b76518733374a9883b3 (patch)
treed142af8ff8eb5c7e491d5302cb16eaabf2783b86
parent7be33feb17cb3af52025e959d40efe02ddbdcc4c (diff)
parenteea9777e99fe432c9a003a413c27c9476cf38087 (diff)
downloadrails-871b1c2115182e7273b75b76518733374a9883b3.tar.gz
rails-871b1c2115182e7273b75b76518733374a9883b3.tar.bz2
rails-871b1c2115182e7273b75b76518733374a9883b3.zip
Merge pull request #6193 from mhfs/fix_oracle_spec
Fix failing AR test on Oracle
-rw-r--r--activerecord/test/cases/relation_scoping_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index 342f7a86fa..3462fd99bd 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -84,7 +84,7 @@ class RelationScopingTest < ActiveRecord::TestCase
def test_scope_select_concatenates
Developer.select("id, name").scoping do
- developer = Developer.select('id, salary').where("name = 'David'").first
+ developer = Developer.select('salary').where("name = 'David'").first
assert_equal 80000, developer.salary
assert developer.has_attribute?(:id)
assert developer.has_attribute?(:name)