summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/postgresql/psycopg2.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-12-17 17:46:09 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-12-17 17:46:09 -0500
commitfec03c88d659bf9a0b102dd328afac1ba3dc7f23 (patch)
tree86dc3507dcaa89ed0fe76f7c7774f20c91e65ab3 /lib/sqlalchemy/dialects/postgresql/psycopg2.py
parent653fcb892bd4680c97491cad70b86987db270208 (diff)
downloadsqlalchemy-fec03c88d659bf9a0b102dd328afac1ba3dc7f23.tar.gz
- make the json serializer and deserializer per-dialect, so that we are
compatible with psycopg2's per-connection/cursor approach. add round trip tests for both native and non-native.
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql/psycopg2.py')
-rw-r--r--lib/sqlalchemy/dialects/postgresql/psycopg2.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
index ceb04b580..f5da8a711 100644
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -428,6 +428,11 @@ class PGDialect_psycopg2(PGDialect):
array_oid=array_oid)
fns.append(on_connect)
+ if self.dbapi and self._json_deserializer:
+ def on_connect(conn):
+ extras.register_default_json(conn, loads=self._json_deserializer)
+ fns.append(on_connect)
+
if fns:
def on_connect(conn):
for fn in fns: