diff options
author | Erik Johnston <erik@matrix.org> | 2015-04-10 13:41:54 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-04-10 13:41:54 +0100 |
commit | 7ed2ec3061b12ad79f3bd07da8758c5e41af8e5e (patch) | |
tree | 2172b59fd044f027b6c7b2fa031fd3c04e1219c7 /synapse/storage/engines/maria.py | |
parent | Bump schema version (diff) | |
download | synapse-7ed2ec3061b12ad79f3bd07da8758c5e41af8e5e.tar.xz |
Handle the fact that in sqlite binary data might be stored as unicode or bytes
Diffstat (limited to 'synapse/storage/engines/maria.py')
-rw-r--r-- | synapse/storage/engines/maria.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/engines/maria.py b/synapse/storage/engines/maria.py index 230b32858c..c934376930 100644 --- a/synapse/storage/engines/maria.py +++ b/synapse/storage/engines/maria.py @@ -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") |