diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-28 11:19:50 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-28 11:19:50 -0700 |
| commit | f369f7747186f9c619856a1f3004a4d5d6c94fd3 (patch) | |
| tree | cf4120766eb6e7666ee919c8e73173cba9ef9e4e /activerecord | |
| parent | d5980b5f52c359252b53f771114a06b06b52076e (diff) | |
| parent | ef3f8093c0f4021e7304163e3ceeb8617bb83476 (diff) | |
| download | rails-f369f7747186f9c619856a1f3004a4d5d6c94fd3.tar.gz rails-f369f7747186f9c619856a1f3004a4d5d6c94fd3.tar.bz2 rails-f369f7747186f9c619856a1f3004a4d5d6c94fd3.zip | |
Merge pull request #5640 from yahonda/address_ora_00918_with_oracle
Address an error for test_has_many_through_polymorphic_has_one with Oracle
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/associations/join_model_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb index 6f5644ada0..f4592f7d0e 100644 --- a/activerecord/test/cases/associations/join_model_test.rb +++ b/activerecord/test/cases/associations/join_model_test.rb @@ -403,7 +403,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase end def test_has_many_through_polymorphic_has_one - assert_equal Tagging.find(1,2).sort_by { |t| t.id }, authors(:david).tagging.order(:id) + assert_equal Tagging.find(1,2).sort_by { |t| t.id }, authors(:david).tagging.order('taggings.id') end def test_has_many_through_polymorphic_has_many |