Merge branch 'master' into bug/multiple-json-profiles

Author: aragentum

src/gino/declarative.py

@@ -289,8 +289,12 @@ def _init_table(cls, sub_cls):
         inspected_args = []
         updates = {}
         column_name_map = InvertDict()
-        for each_cls in sub_cls.__mro__[::-1]:
+        visited = set()
+        for each_cls in sub_cls.__mro__:
             for k, v in getattr(each_cls, "__namespace__", each_cls.__dict__).items():
+                if k in visited:
+                    continue
+                visited.add(k)
                 declared_callable_attr = callable(v) and getattr(
                     v, "__declared_attr__", False
                 )
@@ -311,6 +315,8 @@ def _init_table(cls, sub_cls):
                     updates[k] = sub_cls.__attr_factory__(k, v)
                 elif isinstance(v, (sa.Index, sa.Constraint)):
                     inspected_args.append(v)
+                elif isinstance(v, json_support.JSONProperty):
+                    updates[k] = v
         if table_name is None:
             return
         sub_cls._column_name_map = column_name_map
@@ -351,6 +357,8 @@ def _init_table(cls, sub_cls):
                 if isinstance(v, json_support.JSONProperty):
                     if v.prop_name not in prop_names:
                         prop_names.append(v.prop_name)
+                    if not v.name:
+                        v.name = k
                     json_col = getattr(
                         sub_cls.__dict__.get(v.prop_name), "column", None
                     )

tests/test_declarative.py

@@ -179,6 +179,34 @@ class Another(Audit, db.Model):
         assert False, "Should not reach here"
 
 
+async def test_mixin_crud(engine):
+    db = gino.Gino()
+    db.bind = engine
+
+    class Mixin:
+        id = db.Column(db.Integer, primary_key=True)
+        name = db.Column(db.Text)
+
+    class MixinCrud(db.Model, Mixin):
+        __tablename__ = "mixin_crud"
+
+    await db.gino.create_all()
+    try:
+        mc = await MixinCrud.create(name="mctest")
+        assert mc.name == "mctest"
+
+        await mc.update(name="updated").apply()
+
+        mc = await MixinCrud.query.gino.first()
+        assert mc.name == "updated"
+
+        await mc.delete()
+        mc = await MixinCrud.query.gino.first()
+        assert mc is None
+    finally:
+        await db.gino.drop_all()
+
+
 # noinspection PyUnusedLocal
 async def test_inherit_constraint():
     with pytest.raises(ValueError, match="already attached to another table"):
@@ -328,3 +356,20 @@ def table_name(cls):
     assert n_call == 1
     assert Model.table_name == "model6"
     assert n_call == 1
+
+
+async def test_override():
+    class ModelMixin:
+        field = db.Column(db.String)
+
+    class Model(db.Model, ModelMixin):
+        __tablename__ = "model7"
+
+        normal = db.Column(db.Integer)
+
+        @property
+        def field(self):
+            return "field is a const value"
+
+    assert len(Model.__table__.columns) == 1
+    assert Model().field == "field is a const value"

tests/test_json.py

@@ -358,3 +358,27 @@ def age_idx(cls):
 
     await IndexTest.gino.create()
     await IndexTest.gino.drop()
+
+
+async def test_mixin(bind):
+    from gino.dialects.asyncpg import JSONB
+
+    class Base:
+        id = db.Column(db.Integer(), primary_key=True)
+        profile = db.Column(JSONB())
+
+    class Mixin(Base):
+        age = db.IntegerProperty()
+
+    class MixinTest(db.Model, Mixin):
+        __tablename__ = "mixin_test"
+
+    await MixinTest.gino.create()
+    try:
+        mt = await MixinTest.create(age=22)
+        await mt.update(age=24).apply()
+        assert (await MixinTest.query.gino.first()).age == 24
+        await mt.update(age=MixinTest.age - 5).apply()
+        assert (await MixinTest.query.gino.first()).age == 19
+    finally:
+        await MixinTest.gino.drop()