diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-26 11:34:02 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-26 11:34:02 -0300 |
| commit | b3d40546923b194a89be0d9e00758864fa60b9e8 (patch) | |
| tree | 8acac475b371d61924c67a439704c82c61968fff /activerecord/test/cases/associations | |
| parent | aa5512299041efb923cd582fd26009a72b9ec670 (diff) | |
| parent | 2f59066470193c6219dfd958fc5d8096a2ddee68 (diff) | |
| download | rails-b3d40546923b194a89be0d9e00758864fa60b9e8.tar.gz rails-b3d40546923b194a89be0d9e00758864fa60b9e8.tar.bz2 rails-b3d40546923b194a89be0d9e00758864fa60b9e8.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/test/cases/associations')
| -rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index 65049c4f87..4cf49be668 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -590,7 +590,7 @@ class EagerAssociationTest < ActiveRecord::TestCase end def test_limited_eager_with_numeric_in_association - assert_equal people(:david, :susan), Person.find(:all, :include => [:readers, :primary_contact, :number1_fan], :conditions => "number1_fans_people.first_name like 'M%'", :order => 'readers.id', :limit => 2, :offset => 0) + assert_equal people(:david, :susan), Person.find(:all, :include => [:readers, :primary_contact, :number1_fan], :conditions => "number1_fans_people.first_name like 'M%'", :order => 'people.id', :limit => 2, :offset => 0) end def test_preload_with_interpolation |