Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-08-20 14:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

pushkey' are also bytes.

Browse source
This commit is contained in:
Erik Johnston 2015-04-29 19:27:02 +01:00
parent 0ade2712d1
commit 4a9dc5b2f5
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
synapse/storage/pusher.py
View file

@ -29,15 +29,22 @@ logger = logging.getLogger(__name__)
class PusherStore(SQLBaseStore): class PusherStore(SQLBaseStore):
@defer.inlineCallbacks @defer.inlineCallbacks
def get_pushers_by_app_id_and_pushkey(self, app_id, pushkey): def get_pushers_by_app_id_and_pushkey(self, app_id, pushkey):
sql = ( def r(txn):
"SELECT * FROM pushers " sql = (
"WHERE app_id = ? AND pushkey = ?" "SELECT * FROM pushers"
) " WHERE app_id = ? AND pushkey = ?"
)
rows = yield self._execute_and_decode( txn.execute(sql, (app_id, pushkey,))
"get_pushers_by_app_id_and_pushkey", rows = self.cursor_to_dict(txn)
sql,
app_id, pushkey 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) defer.returnValue(rows)
@ -60,6 +67,8 @@ class PusherStore(SQLBaseStore):
) )
pass pass
r['pushkey'] = str(r['pushkey']).decode("UTF8")
return rows return rows
rows = yield self.runInteraction("get_all_pushers", get_pushers) rows = yield self.runInteraction("get_all_pushers", get_pushers)