Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114 from edward/patch-1 

Consistency in SQL style
This commit is contained in:
Sam 2013-02-12 00:11:59 -08:00
parent 925925817f b7a76cbd24
commit 4668cf1d54
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/search.rb
View File

@ -100,7 +100,7 @@ module Search
db_result = [] db_result = []
[user_query_sql, category_query_sql, topic_query_sql].each do |sql| [user_query_sql, category_query_sql, topic_query_sql].each do |sql|
sql << " limit " << Search.per_facet.to_s sql << " LIMIT " << Search.per_facet.to_s
db_result += ActiveRecord::Base.exec_sql(sql , query: terms.join(" & ")).to_a db_result += ActiveRecord::Base.exec_sql(sql , query: terms.join(" & ")).to_a
end end
end end
@ -110,11 +110,13 @@ module Search
expected_topics = 0 expected_topics = 0
expected_topics = Search.facets.size unless type_filter.present? expected_topics = Search.facets.size unless type_filter.present?
expected_topics = Search.per_facet * Search.facets.size if type_filter == 'topic' expected_topics = Search.per_facet * Search.facets.size if type_filter == 'topic'
if expected_topics > 0 if expected_topics > 0
db_result.each do |row| db_result.each do |row|
expected_topics -= 1 if row['type'] == 'topic' expected_topics -= 1 if row['type'] == 'topic'
end end
end end
if expected_topics > 0 if expected_topics > 0
tmp = ActiveRecord::Base.exec_sql "#{post_query_sql} limit :per_facet", tmp = ActiveRecord::Base.exec_sql "#{post_query_sql} limit :per_facet",
query: terms.join(" & "), per_facet: expected_topics * 3 query: terms.join(" & "), per_facet: expected_topics * 3
@ -134,11 +136,9 @@ module Search
db_result += tmp[0..expected_topics-1] db_result += tmp[0..expected_topics-1]
end end
# Group the results by type # Group the results by type
grouped = {} grouped = {}
db_result.each do |row| db_result.each do |row|
type = row.delete('type') type = row.delete('type')
# Add the slug for topics # Add the slug for topics