kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fixed postgresql limited eager loading for the case where scoped :order was present

Browse source
This commit is contained in:
Tarmo Tänav 2008-07-15 05:17:06 +03:00 committed by Jeremy Kemper
parent 3451045658
commit 8c91b767c0
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
activerecord/lib/active_record/associations.rb
View file

@ -1486,10 +1486,15 @@ module ActiveRecord
join_dependency.joins_for_table_name(table) join_dependency.joins_for_table_name(table)
}.flatten.compact.uniq }.flatten.compact.uniq
order = options[:order]
if scoped_order = (scope && scope[:order])
order = order ? "#{order}, #{scoped_order}" : scoped_order
end
is_distinct = !options[:joins].blank? || include_eager_conditions?(options, tables_from_conditions) || include_eager_order?(options, tables_from_order) is_distinct = !options[:joins].blank? || include_eager_conditions?(options, tables_from_conditions) || include_eager_order?(options, tables_from_order)
sql = "SELECT " sql = "SELECT "
if is_distinct if is_distinct
sql << connection.distinct("#{connection.quote_table_name table_name}.#{primary_key}", options[:order]) sql << connection.distinct("#{connection.quote_table_name table_name}.#{primary_key}", order)
else else
sql << primary_key sql << primary_key
end end
@ -1503,8 +1508,8 @@ module ActiveRecord
add_conditions!(sql, options[:conditions], scope) add_conditions!(sql, options[:conditions], scope)
add_group!(sql, options[:group], scope) add_group!(sql, options[:group], scope)
if options[:order] && is_distinct if order && is_distinct
connection.add_order_by_for_association_limiting!(sql, options) connection.add_order_by_for_association_limiting!(sql, :order => order)
else else
add_order!(sql, options[:order], scope) add_order!(sql, options[:order], scope)
end end