Merge pull request #305 from wwwjfy/t291

fix #291, process JSON/JSONB scalar result

Author: wwwjfy

gino/dialects/asyncpg.py

@@ -291,10 +291,6 @@ class AsyncpgDialect(PGDialect, base.AsyncDialectMixin):
     statement_compiler = AsyncpgCompiler
     execution_ctx_cls = AsyncpgExecutionContext
     cursor_cls = DBAPICursor
-    dbapi_type_map = {
-        114: JSON(),
-        3802: JSONB(),
-    }
     init_kwargs = set(itertools.chain(
         *[inspect.getfullargspec(f).kwonlydefaults.keys() for f in
           [asyncpg.create_pool, asyncpg.connect]]))

gino/dialects/base.py

@@ -2,12 +2,15 @@
 import weakref
 
 from sqlalchemy import util
+from sqlalchemy.dialects.postgresql import JSON, JSONB
 
 # noinspection PyProtectedMember
 from ..engine import _SAConnection, _SAEngine, _DBAPIConnection
 from ..loader import Loader
 
 DEFAULT = object()
+JSON_COLTYPE = 114
+JSONB_COLTYPE = 3802
 
 
 class BaseDBAPI:
@@ -372,6 +375,13 @@ def _init_statement_prepared(cls, dialect, connection, dbapi_connection,
         self.cursor = self.create_cursor()
         return self
 
+    def get_result_processor(self, type_, colname, coltype):
+        if coltype == JSON_COLTYPE:
+            return JSON().result_processor(self.dialect, coltype)
+        if coltype == JSONB_COLTYPE:
+            return JSONB().result_processor(self.dialect, coltype)
+        return super().get_result_processor(type_, colname, coltype)
+
 
 class AsyncDialectMixin:
     cursor_cls = DBAPICursor

tests/test_json.py

@@ -173,3 +173,28 @@ class Test(db.Model):
             __tablename__ = 'tests_no_profile'
 
             age = db.IntegerProperty(default=18)
+
+
+async def test_t291(bind):
+    from gino.dialects.asyncpg import JSON, JSONB
+
+    class PropsTest(db.Model):
+        __tablename__ = 'props_test_291'
+        profile = db.Column(JSONB(), nullable=False, server_default='{}')
+        profile1 = db.Column(JSON(), nullable=False, server_default='{}')
+
+        bool = db.BooleanProperty()
+        bool1 = db.BooleanProperty(column_name='profile1')
+
+    await PropsTest.gino.create()
+    try:
+        t = await PropsTest.create(
+            bool=True,
+            bool1=True,
+        )
+        profile = await bind.scalar('SELECT profile FROM props_test_291')
+        assert isinstance(profile, dict)
+        profile1 = await bind.scalar('SELECT profile1 FROM props_test_291')
+        assert isinstance(profile1, dict)
+    finally:
+        await PropsTest.gino.drop()