Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 22:13:52 -05:00
Code Issues Projects Releases Packages Wiki Activity

Handle the fact that in sqlite binary data might be stored as unicode or bytes

Browse source
This commit is contained in:
Erik Johnston 2015-04-10 13:41:54 +01:00
parent ce797ad373
commit 7ed2ec3061
5 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/storage/engines/maria.py
View file

@ -27,7 +27,7 @@ class MariaEngine(object):
def encode_parameter(self, param):
if isinstance(param, types.BufferType):
return str(param)
return bytes(param)
return param
def on_new_connection(self, db_conn):
@ -45,3 +45,6 @@ class MariaEngine(object):
if isinstance(error, self.module.DatabaseError):
return error.sqlstate == "40001" and error.errno == 1213
return False
def load_unicode(self, v):
return bytes(v).decode("UTF8")

7
synapse/storage/engines/sqlite3.py
View file

@ -15,6 +15,8 @@
from synapse.storage import prepare_database, prepare_sqlite3_database
import types
class Sqlite3Engine(object):
def __init__(self, database_module):
@ -35,3 +37,8 @@ class Sqlite3Engine(object):
def is_deadlock(self, error):
return False
def load_unicode(self, v):
if isinstance(v, types.UnicodeType):
return v
return bytes(v).decode("UTF8")