diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-10 19:49:02 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-11 00:10:55 -0300 |
| commit | c9f27e3a479e17cd94248c007e4f528026bc18f6 (patch) | |
| tree | 841997003fcebc7c11c79b92d62d6f49c688c64d | |
| parent | bbec883edb350cc9f75beea183e335b91a11e242 (diff) | |
| download | rails-c9f27e3a479e17cd94248c007e4f528026bc18f6.tar.gz rails-c9f27e3a479e17cd94248c007e4f528026bc18f6.tar.bz2 rails-c9f27e3a479e17cd94248c007e4f528026bc18f6.zip | |
Merge pull request #6698 from yahonda/address_ora_911_master
Address ORA-00911 errors because of the heading underscore.
| -rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/finder_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index 86f1d6936e..abc67d9c15 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -190,7 +190,7 @@ module ActiveRecord join_dependency = construct_join_dependency_for_association_find relation = construct_relation_for_association_find(join_dependency) - relation = relation.except(:select, :order).select("1 AS _one").limit(1) + relation = relation.except(:select, :order).select("1 AS one").limit(1) case id when Array, Hash diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb index e3e3a1ca7c..5d72e35c60 100644 --- a/activerecord/test/cases/finder_test.rb +++ b/activerecord/test/cases/finder_test.rb @@ -46,7 +46,7 @@ class FinderTest < ActiveRecord::TestCase end def test_exists_does_not_select_columns_without_alias - assert_sql(/SELECT\W+1 AS _one FROM ["`]topics["`]\W+LIMIT 1/) do + assert_sql(/SELECT\W+1 AS one FROM ["`]topics["`]/i) do Topic.exists? end end |