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

models: Use default db table name for UserTopic.

Browse Source 
Also update the realm import/export code and tests accordingly.
This commit is contained in:
Abhijeet Prasad Bodas
2021-07-31 11:09:59 +05:30
committed by Tim Abbott
parent 2aea944a7e
commit 4455dac424
5 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
zerver/lib/import_realm.py
View File

@@ -116,7 +116,7 @@ ID_MAP: Dict[str, Dict[int, int]] = {
"realmauditlog": {},
"recipient_to_huddle_map": {},
"userhotspot": {},
"mutedtopic": {},
"usertopic": {},
"muteduser": {},
"service": {},
"usergroup": {},
@@ -382,6 +382,10 @@ def idseq(model_class: Any) -> str:
return "zerver_botuserstatedata_id_seq"
elif model_class == BotConfigData:
return "zerver_botuserconfigdata_id_seq"
elif model_class == UserTopic:
# The database table for this model was renamed from `mutedtopic` to
# `usertopic`, but the name of the sequence object remained the same.
return "zerver_mutedtopic_id_seq"
return f"{model_class._meta.db_table}_id_seq"
@@ -1091,12 +1095,12 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int = 1) -> Rea
update_model_ids(UserHotspot, data, "userhotspot")
bulk_import_model(data, UserHotspot)
if "zerver_mutedtopic" in data:
fix_datetime_fields(data, "zerver_mutedtopic")
re_map_foreign_keys(data, "zerver_mutedtopic", "user_profile", related_table="user_profile")
re_map_foreign_keys(data, "zerver_mutedtopic", "stream", related_table="stream")
re_map_foreign_keys(data, "zerver_mutedtopic", "recipient", related_table="recipient")
update_model_ids(UserTopic, data, "mutedtopic")
if "zerver_usertopic" in data:
fix_datetime_fields(data, "zerver_usertopic")
re_map_foreign_keys(data, "zerver_usertopic", "user_profile", related_table="user_profile")
re_map_foreign_keys(data, "zerver_usertopic", "stream", related_table="stream")
re_map_foreign_keys(data, "zerver_usertopic", "recipient", related_table="recipient")
update_model_ids(UserTopic, data, "usertopic")
bulk_import_model(data, UserTopic)
if "zerver_muteduser" in data: