Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix up sql

This commit is contained in:
Erik Johnston 2017-06-13 11:19:18 +01:00
parent 6fd7e6db3d
commit 505e7e8b9d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
synapse/storage/user_directory.py
View File

@ -171,10 +171,12 @@ class UserDirectoryStore(SQLBaseStore):
|| setweight(to_tsvector('english', COALESCE(?, '')), 'B') || setweight(to_tsvector('english', COALESCE(?, '')), 'B')
) )
""" """
args = ( txn.execute(
user_id, sql,
get_localpart_from_id(user_id), get_domain_from_id(user_id), (
display_name, user_id, get_localpart_from_id(user_id),
get_domain_from_id(user_id), display_name,
)
) )
else: else:
sql = """ sql = """
@ -184,10 +186,12 @@ class UserDirectoryStore(SQLBaseStore):
|| setweight(to_tsvector('english', COALESCE(?, '')), 'B') || setweight(to_tsvector('english', COALESCE(?, '')), 'B')
WHERE user_id = ? WHERE user_id = ?
""" """
args = ( txn.execute(
get_localpart_from_id(user_id), get_domain_from_id(user_id), sql,
display_name, (
user_id, get_localpart_from_id(user_id), get_domain_from_id(user_id),
display_name, user_id,
)
) )
elif isinstance(self.database_engine, Sqlite3Engine): elif isinstance(self.database_engine, Sqlite3Engine):
value = "%s %s" % (user_id, display_name,) if display_name else user_id value = "%s %s" % (user_id, display_name,) if display_name else user_id
@ -202,8 +206,6 @@ class UserDirectoryStore(SQLBaseStore):
# This should be unreachable. # This should be unreachable.
raise Exception("Unrecognized database engine") raise Exception("Unrecognized database engine")
txn.execute(sql, args)
txn.call_after(self.get_user_in_directory.invalidate, (user_id,)) txn.call_after(self.get_user_in_directory.invalidate, (user_id,))
return self.runInteraction( return self.runInteraction(