paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

bulk_get_subscriber_user_ids: Use cursor.execute correctly.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-06-09 02:30:40 -07:00
committed by Tim Abbott
parent 2604ebba38
commit 14bbfe6ffb
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/lib/actions.py
View File

@@ -2573,9 +2573,7 @@ def bulk_get_subscriber_user_ids(stream_dicts: Iterable[Mapping[str, Any]],
to optimize.) to optimize.)
''' '''
id_list = ', '.join(str(recipient_id) for recipient_id in recipient_ids) query = SQL('''
query = '''
SELECT SELECT
zerver_subscription.recipient_id, zerver_subscription.recipient_id,
zerver_subscription.user_profile_id zerver_subscription.user_profile_id
@@ -2584,16 +2582,16 @@ def bulk_get_subscriber_user_ids(stream_dicts: Iterable[Mapping[str, Any]],
INNER JOIN zerver_userprofile ON INNER JOIN zerver_userprofile ON
zerver_userprofile.id = zerver_subscription.user_profile_id zerver_userprofile.id = zerver_subscription.user_profile_id
WHERE WHERE
zerver_subscription.recipient_id in (%s) AND zerver_subscription.recipient_id in %(recipient_ids)s AND
zerver_subscription.active AND zerver_subscription.active AND
zerver_userprofile.is_active zerver_userprofile.is_active
ORDER BY ORDER BY
zerver_subscription.recipient_id, zerver_subscription.recipient_id,
zerver_subscription.user_profile_id zerver_subscription.user_profile_id
''' % (id_list,) ''')
cursor = connection.cursor() cursor = connection.cursor()
cursor.execute(query) cursor.execute(query, {"recipient_ids": tuple(recipient_ids)})
rows = cursor.fetchall() rows = cursor.fetchall()
cursor.close() cursor.close()