diff options
| author | Brandon Keepers <brandon@collectiveidea.com> | 2008-06-09 11:30:48 -0400 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-06-09 12:05:20 -0400 |
| commit | e94e53f9cd70bee69759661e9771da3fe0ee9554 (patch) | |
| tree | ebd08651543a0c28ce6ce0ef6d8a0bc9bf7c4430 /activerecord/lib/active_record/associations.rb | |
| parent | 8bf74c30fe276606214850ae2de76fe0efb08d94 (diff) | |
| download | rails-e94e53f9cd70bee69759661e9771da3fe0ee9554.tar.gz rails-e94e53f9cd70bee69759661e9771da3fe0ee9554.tar.bz2 rails-e94e53f9cd70bee69759661e9771da3fe0ee9554.zip | |
fix eager loading with dynamic finders
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index a3d1bbbada..f32b217326 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1506,7 +1506,7 @@ module ActiveRecord end def order_tables(options) - order = options[:order] + order = [options[:order], scope(:find, :order) ].join(", ") return [] unless order && order.is_a?(String) order.scan(/([\.\w]+).?\./).flatten end |