summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-06-22 11:35:02 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-06-22 11:35:02 -0400
commit24f8ab2bc360c1e0837ce7c5392839f87b57e916 (patch)
tree528b14548b42725fc4ab6a03fbcd52d623bfdc3e
parentcfa296d9cd27c66a05eee4cdaeae85b59593f3ab (diff)
downloadsqlalchemy-24f8ab2bc360c1e0837ce7c5392839f87b57e916.tar.gz
- Re-fixed this issue first released in 1.0.5 to fix psycopg2cffi
JSONB support once again, as they suddenly switched on unconditional decoding of JSONB types in version 2.7.1. Version detection now specifies 2.7.1 as where we should expect the DBAPI to do json encoding for us. fixes #3439
-rw-r--r--doc/build/changelog/changelog_10.rst10
-rw-r--r--lib/sqlalchemy/dialects/postgresql/psycopg2cffi.py2
2 files changed, 11 insertions, 1 deletions
diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index efb518716..363ae7f38 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -19,6 +19,16 @@
:version: 1.0.6
.. change::
+ :tags: bug, postgresql, pypy
+ :tickets: 3439
+
+ Re-fixed this issue first released in 1.0.5 to fix psycopg2cffi
+ JSONB support once again, as they suddenly
+ switched on unconditional decoding of JSONB types in version 2.7.1.
+ Version detection now specifies 2.7.1 as where we should expect
+ the DBAPI to do json encoding for us.
+
+ .. change::
:tags: feature, postgresql
:tickets: 3455
:pullreq: github:179
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2cffi.py b/lib/sqlalchemy/dialects/postgresql/psycopg2cffi.py
index f0fe23df3..97f241d2e 100644
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2cffi.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2cffi.py
@@ -37,7 +37,7 @@ class PGDialect_psycopg2cffi(PGDialect_psycopg2):
FEATURE_VERSION_MAP = dict(
native_json=(2, 4, 4),
- native_jsonb=(99, 99, 99),
+ native_jsonb=(2, 7, 1),
sane_multi_rowcount=(2, 4, 4),
array_oid=(2, 4, 4),
hstore_adapter=(2, 4, 4)