Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

narrow: Add flags column outside get_base_query_for_search. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2024-03-04 16:36:19 -08:00
parent de35f44624
commit 64158775c3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/lib/narrow.py
View File

@ -1009,7 +1009,7 @@ def get_base_query_for_search(
assert user_profile is not None
if need_message:
query = (
select(column("message_id", Integer), column("flags", Integer))
select(column("message_id", Integer))
# We don't limit by realm_id despite the join to
# zerver_messages, since the user_profile_id limit in
# usermessage is more selective, and the query planner
@ -1028,7 +1028,7 @@ def get_base_query_for_search(
return (query, inner_msg_id_col)
query = (
select(column("message_id", Integer), column("flags", Integer))
select(column("message_id", Integer))
.where(column("user_profile_id", Integer) == literal(user_profile.id))
.select_from(table("zerver_usermessage"))
)
@ -1101,6 +1101,7 @@ def find_first_unread_anchor(
need_message=need_message,
need_user_message=need_user_message,
)
query = query.add_columns(column("flags", Integer))
query, is_search = add_narrow_conditions(
user_profile=user_profile,
@ -1376,6 +1377,8 @@ def fetch_messages(
need_message=need_message,
need_user_message=need_user_message,
)
if need_user_message:
query = query.add_columns(column("flags", Integer))
query, is_search = add_narrow_conditions(
user_profile=user_profile,