diff options
author | Erik Johnston <erik@matrix.org> | 2015-04-16 11:17:52 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-04-16 11:17:52 +0100 |
commit | b8092fbc82edb3c7d8aa09f0756fa853ad6a6ad8 (patch) | |
tree | 57fad9f09c102550fdbad7ac047ec02eb6a24283 /synapse/storage/engines | |
parent | Move encoding and decoding of JSON into storage layer (diff) | |
download | synapse-b8092fbc82edb3c7d8aa09f0756fa853ad6a6ad8.tar.xz |
Go back to storing JSON in TEXT
Diffstat (limited to 'synapse/storage/engines')
-rw-r--r-- | synapse/storage/engines/postgres.py | 3 | ||||
-rw-r--r-- | synapse/storage/engines/sqlite3.py | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py index 457c1f70a5..6f75245fa7 100644 --- a/synapse/storage/engines/postgres.py +++ b/synapse/storage/engines/postgres.py @@ -39,6 +39,3 @@ class PostgresEngine(object): if isinstance(error, self.module.DatabaseError): return error.pgcode in ["40001", "40P01"] return False - - def load_unicode(self, v): - return bytes(v).decode("UTF8") diff --git a/synapse/storage/engines/sqlite3.py b/synapse/storage/engines/sqlite3.py index 389df35eb5..dd0d8e0e0f 100644 --- a/synapse/storage/engines/sqlite3.py +++ b/synapse/storage/engines/sqlite3.py @@ -37,8 +37,3 @@ 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") |