From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 22 Jun 2015 15:35:02 +0000 (-0400)
Subject: - Re-fixed this issue first released in 1.0.5 to fix psycopg2cffi
X-Git-Tag: rel_1_0_6~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24f8ab2bc360c1e0837ce7c5392839f87b57e916;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- 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
---

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index efb5187163..363ae7f383 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -18,6 +18,16 @@
 .. changelog::
     :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
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2cffi.py b/lib/sqlalchemy/dialects/postgresql/psycopg2cffi.py
index f0fe23df3e..97f241d2e0 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)