Support for SA 0.9 JSON type

sqlalchemy_utils/types/json.py

@@ -10,7 +10,10 @@ import six
 from sqlalchemy.dialects.postgresql.base import ischema_names
 from ..exceptions import ImproperlyConfigured
 
-
+try:
+    from sqlalchemy.dialects.postgresql import JSON
+    has_postgres_json = True
+except ImportError:
     class PostgresJSONType(sa.types.UserDefinedType):
         """
         Text search vector type for postgresql.
@@ -18,8 +21,8 @@ class PostgresJSONType(sa.types.UserDefinedType):
         def get_col_spec(self):
             return 'json'
 
-
     ischema_names['json'] = PostgresJSONType
+    has_postgres_json = False
 
 
 class JSONType(sa.types.TypeDecorator):
@@ -60,16 +63,23 @@ class JSONType(sa.types.TypeDecorator):
     def load_dialect_impl(self, dialect):
         if dialect.name == 'postgresql':
             # Use the native JSON type.
+            if has_postgres_json:
+                return dialect.type_descriptor(JSON())
+            else:
                 return dialect.type_descriptor(PostgresJSONType())
         else:
             return dialect.type_descriptor(self.impl)
 
     def process_bind_param(self, value, dialect):
+        if dialect.name == 'postgresql' and has_postgres_json:
+            return value
         if value is not None:
             value = six.text_type(json.dumps(value))
         return value
 
     def process_result_value(self, value, dialect):
+        if dialect.name == 'postgresql' and has_postgres_json:
+            return value
         if value is not None:
             value = json.loads(value)
         return value

tests/types/test_json.py

@@ -5,8 +5,7 @@ from sqlalchemy_utils.types import json
 from tests import TestCase
 
 
-@mark.skipif('json.json is None')
-class TestJSONType(TestCase):
+class JSONTestCase(TestCase):
     def create_models(self):
         class Document(self.Base):
             __tablename__ = 'document'
@@ -47,3 +46,12 @@ class TestJSONType(TestCase):
 
         document = self.session.query(self.Document).first()
         assert document.json == {'something': u'äääööö'}
+
+
+@mark.skipif('json.json is None')
+class TestSqliteJSONType(JSONTestCase):
+    pass
+
+@mark.skipif('json.json is None')
+class TestPostgresJSONType(JSONTestCase):
+    dns = 'postgres://postgres@localhost/sqlalchemy_utils_test'