Changeset 1220
- Timestamp:
- 04/19/05 05:24:50 (3 years ago)
- Files:
-
- trunk/activerecord/CHANGELOG (modified) (1 diff)
- trunk/activerecord/lib/active_record/associations/has_many_association.rb (modified) (1 diff)
- trunk/activerecord/test/associations_go_eager_test.rb (modified) (1 diff)
- trunk/activerecord/test/fixtures/post.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/activerecord/CHANGELOG
r1216 r1220 1 *SVN* 2 3 * Fixed stray comma when using eager loading and ordering together from has_many associations #1143 4 5 1 6 *1.10.0* (19th April, 2005) 2 7 trunk/activerecord/lib/active_record/associations/has_many_association.rb
r1210 r1220 68 68 else 69 69 options[:conditions] = @finder_sql + (options[:conditions] ? " AND #{options[:conditions]}" : "") 70 options[:order] = options[:order] ? "#{options[:order]}, #{@options[:order]}" : @options[:order] 70 71 if options[:order] && @options[:order] 72 options[:order] = "#{options[:order]}, #{@options[:order]}" 73 elsif @options[:order] 74 options[:order] = @options[:order] 75 end 76 71 77 @association_class.find(args.size == 1 ? args.first : args, options) 72 78 end trunk/activerecord/test/associations_go_eager_test.rb
r1201 r1220 26 26 27 27 def test_loading_from_an_association 28 posts = @david.posts.find(:all, :include => :comments )28 posts = @david.posts.find(:all, :include => :comments, :order => "posts.id DESC") 29 29 assert_equal 2, posts.first.comments.size 30 30 end trunk/activerecord/test/fixtures/post.rb
r1132 r1220 1 1 class Post < ActiveRecord::Base 2 2 belongs_to :author 3 has_many :comments 3 has_many :comments, :order => "body" 4 4 has_and_belongs_to_many :categories 5 5 end
