TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

make add_order a tad faster (Closes #6567)

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5452 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck 2006-11-07 19:06:35 +00:00
parent a3dba1ed7c
commit 57a3e44052
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/CHANGELOG
View File

@ -1,5 +1,7 @@
*SVN*
* make add_order a tad faster. #6567 [Stefan Kaes]
* Find with :include respects scoped :order. #5850
* Support nil and Array in :conditions => { attr => value } hashes. #6548 [Assaf, Jeremy Kemper]

10
activerecord/lib/active_record/base.rb
View File

@ -1096,7 +1096,7 @@ def construct_finder_sql(options)
sql << " GROUP BY #{options[:group]} " if options[:group]
add_order!(sql, options[:order])
add_order!(sql, options[:order], scope)
add_limit!(sql, options, scope)
add_lock!(sql, options, scope)
@ -1120,12 +1120,14 @@ def safe_to_array(o)
end
end
def add_order!(sql, order)
def add_order!(sql, order, scope = :auto)
scope = scope(:find) if :auto == scope
scoped_order = scope[:order] if scope
if order
sql << " ORDER BY #{order}"
sql << ", #{scope(:find, :order)}" if scoped?(:find, :order)
sql << ", #{scoped_order}" if scoped_order
else
sql << " ORDER BY #{scope(:find, :order)}" if scoped?(:find, :order)
sql << " ORDER BY #{scoped_order}" if scoped_order
end
end