nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Join on contacts correctly in search

Browse source
This commit is contained in:
Raphael 2011-01-20 12:05:25 -08:00
parent 4deec0cb38
commit 661d5e41a1
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/person.rb
View file

@ -55,8 +55,15 @@ class Person < ActiveRecord::Base
sql << where_clause
tokens.concat([token, token, token])
end
Person.searchable.where(sql, *tokens).includes(:contacts).order("contacts.user_id DESC", "profiles.last_name ASC", "profiles.first_name ASC", "people.diaspora_handle ASC")
#SELECT `people`.* FROM people
# INNER JOIN `profiles` ON `profiles`.person_id = `people`.id
# LEFT OUTER JOIN `contacts` ON (`contacts`.user_id = #{user.id} AND `contacts`.person_id = `people`.id)
# WHERE `profiles`.searchable = true AND
# `profiles`.first_name LIKE '%Max%'
# ORDER BY `contacts`.user_id DESC
Person.searchable.where(sql, *tokens).joins(
"LEFT OUTER JOIN `contacts` ON `contacts`.user_id = #{user.id} AND `contacts`.person_id = `people`.id"
).order("contacts.user_id DESC", "profiles.last_name ASC", "profiles.first_name ASC", "people.diaspora_handle ASC")
end
def name