mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 14:20:23 +00:00
pushkey' are also bytes.
This commit is contained in:
parent
0ade2712d1
commit
4a9dc5b2f5
1 changed files with 17 additions and 8 deletions
|
@ -29,15 +29,22 @@ logger = logging.getLogger(__name__)
|
|||
class PusherStore(SQLBaseStore):
|
||||
@defer.inlineCallbacks
|
||||
def get_pushers_by_app_id_and_pushkey(self, app_id, pushkey):
|
||||
def r(txn):
|
||||
sql = (
|
||||
"SELECT * FROM pushers "
|
||||
"WHERE app_id = ? AND pushkey = ?"
|
||||
"SELECT * FROM pushers"
|
||||
" WHERE app_id = ? AND pushkey = ?"
|
||||
)
|
||||
|
||||
rows = yield self._execute_and_decode(
|
||||
"get_pushers_by_app_id_and_pushkey",
|
||||
sql,
|
||||
app_id, pushkey
|
||||
txn.execute(sql, (app_id, pushkey,))
|
||||
rows = self.cursor_to_dict(txn)
|
||||
|
||||
for r in rows:
|
||||
r['pushkey'] = str(r['pushkey']).decode("UTF8")
|
||||
|
||||
return rows
|
||||
|
||||
rows = yield self.runInteraction(
|
||||
"get_pushers_by_app_id_and_pushkey", r
|
||||
)
|
||||
|
||||
defer.returnValue(rows)
|
||||
|
@ -60,6 +67,8 @@ class PusherStore(SQLBaseStore):
|
|||
)
|
||||
pass
|
||||
|
||||
r['pushkey'] = str(r['pushkey']).decode("UTF8")
|
||||
|
||||
return rows
|
||||
|
||||
rows = yield self.runInteraction("get_all_pushers", get_pushers)
|
||||
|
|
Loading…
Reference in a new issue