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

retention: Inline move_rows query arguments.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2022-07-29 22:17:40 -07:00
committed by Tim Abbott
parent 73374996a5
commit b4b8691239
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/lib/retention.py
View File

@@ -109,14 +109,11 @@ def move_rows(
fields = [field for field in base_model._meta.fields if field not in EXCLUDE_FIELDS] fields = [field for field in base_model._meta.fields if field not in EXCLUDE_FIELDS]
src_fields = [Identifier(src_db_table, field.column) for field in fields] src_fields = [Identifier(src_db_table, field.column) for field in fields]
dst_fields = [Identifier(field.column) for field in fields] dst_fields = [Identifier(field.column) for field in fields]
sql_args = {
"src_fields": SQL(",").join(src_fields),
"dst_fields": SQL(",").join(dst_fields),
}
sql_args.update(kwargs)
with connection.cursor() as cursor: with connection.cursor() as cursor:
cursor.execute( cursor.execute(
raw_query.format(**sql_args), raw_query.format(
src_fields=SQL(",").join(src_fields), dst_fields=SQL(",").join(dst_fields), **kwargs
)
) )
if returning_id: if returning_id:
return [id for (id,) in cursor.fetchall()] # return list of row ids return [id for (id,) in cursor.fetchall()] # return list of row ids