Order by is no longer a guarentee
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1164 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
ff1db4de5f
commit
cef09015c7
|
@ -66,7 +66,7 @@ module ActiveRecord
|
|||
# Otherwise, construct a query.
|
||||
else
|
||||
ids_list = ids.map { |id| @owner.send(:quote, id) }.join(',')
|
||||
records = find_target(@finder_sql.sub(/ORDER BY/, "AND j.#{@association_foreign_key} IN (#{ids_list}) ORDER BY"))
|
||||
records = find_target(@finder_sql.sub(/(ORDER BY|$)/, "AND j.#{@association_foreign_key} IN (#{ids_list}) \\1"))
|
||||
if records.size == ids.size
|
||||
if ids.size == 1 and !expects_array
|
||||
records.first
|
||||
|
|
Loading…
Reference in New Issue