From: Tony Locke <tlocke@tlocke.org.uk>
Date: Sat, 3 Jan 2015 16:59:17 +0000 (+0000)
Subject: Changed pg8000 dialect to cope with native JSON
X-Git-Tag: rel_1_0_0b1~48^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17e03a0ea86cd92816b4002a203b2b0b2c1a538a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Changed pg8000 dialect to cope with native JSON

For versions > 1.10.1 pg8000 returns de-serialized JSON objects rather
than a string. SQL parameters are still strings though.
---

diff --git a/lib/sqlalchemy/dialects/postgresql/pg8000.py b/lib/sqlalchemy/dialects/postgresql/pg8000.py
index 17d83fa616..4bb376a963 100644
--- a/lib/sqlalchemy/dialects/postgresql/pg8000.py
+++ b/lib/sqlalchemy/dialects/postgresql/pg8000.py
@@ -72,6 +72,7 @@ from .base import (
     PGDialect, PGCompiler, PGIdentifierPreparer, PGExecutionContext,
     _DECIMAL_TYPES, _FLOAT_TYPES, _INT_TYPES)
 import re
+from sqlalchemy.dialects.postgresql.json import JSON
 
 
 class _PGNumeric(sqltypes.Numeric):
@@ -102,6 +103,15 @@ class _PGNumericNoBind(_PGNumeric):
         return None
 
 
+class _PGJSON(JSON):
+
+    def result_processor(self, dialect, coltype):
+        if dialect._dbapi_version > (1, 10, 1):
+            return None  # Has native JSON
+        else:
+            return super(_PGJSON, self).result_processor(dialect, coltype)
+
+
 class PGExecutionContext_pg8000(PGExecutionContext):
     pass
 
@@ -143,7 +153,8 @@ class PGDialect_pg8000(PGDialect):
         PGDialect.colspecs,
         {
             sqltypes.Numeric: _PGNumericNoBind,
-            sqltypes.Float: _PGNumeric
+            sqltypes.Float: _PGNumeric,
+            JSON: _PGJSON,
         }
     )