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

FIX: Prevent ambigous column errors when joining `TopicView` queries.

This commit is contained in:
Guo Xiang Tan 2018-06-29 10:33:08 +08:00
parent 25cfc98b67
commit 252e5574cc
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/topic_view.rb
View File

@ -506,7 +506,12 @@ class TopicView
# Username filters # Username filters
if @username_filters.present? if @username_filters.present?
usernames = @username_filters.map { |u| u.downcase } usernames = @username_filters.map { |u| u.downcase }
@filtered_posts = @filtered_posts.where('post_number = 1 OR posts.user_id IN (SELECT u.id FROM users u WHERE username_lower IN (?))', usernames)
@filtered_posts = @filtered_posts.where('
posts.post_number = 1
OR posts.user_id IN (SELECT u.id FROM users u WHERE u.username_lower IN (?))
', usernames)
@contains_gaps = true @contains_gaps = true
end end
@ -514,8 +519,12 @@ class TopicView
# This should be last - don't want to tell the admin about deleted posts that clicking the button won't show # This should be last - don't want to tell the admin about deleted posts that clicking the button won't show
# copy the filter for has_deleted? method # copy the filter for has_deleted? method
@predelete_filtered_posts = @filtered_posts.spawn @predelete_filtered_posts = @filtered_posts.spawn
if @guardian.can_see_deleted_posts? && !@show_deleted && has_deleted? if @guardian.can_see_deleted_posts? && !@show_deleted && has_deleted?
@filtered_posts = @filtered_posts.where("deleted_at IS NULL OR post_number = 1") @filtered_posts = @filtered_posts.where(
"posts.deleted_at IS NULL OR posts.post_number = 1"
)
@contains_gaps = true @contains_gaps = true
end end