fix #579, allow __tablename__ to be a declared_attr

Author: wwwjfy

gino/declarative.py

@@ -144,10 +144,7 @@ def __init__(self):
 
     @classmethod
     def _init_table(cls, sub_cls):
-        table_name = getattr(sub_cls, '__tablename__', None)
-        if table_name is None:
-            return
-
+        table_name = None
         columns = []
         inspected_args = []
         updates = {}
@@ -156,6 +153,9 @@ def _init_table(cls, sub_cls):
             for k, v in getattr(each_cls, '__namespace__',
                                 each_cls.__dict__).items():
                 if callable(v) and getattr(v, '__declared_attr__', False):
+                    if k == '__tablename__':
+                        table_name = v(sub_cls)
+                        continue
                     v = updates[k] = v(sub_cls)
                 if isinstance(v, sa.Column):
                     v = v.copy()
@@ -166,6 +166,10 @@ 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)
+        if table_name is None:
+            table_name = getattr(sub_cls, '__tablename__', None)
+        if table_name is None:
+            return
         sub_cls._column_name_map = column_name_map
 
         # handle __table_args__

tests/test_declarative.py

@@ -53,6 +53,13 @@ class Model(db.Model):
     assert hasattr(Model.__table__.c, 'col2')
     assert hasattr(Model.__table__.c, 'col3')
 
+    class Model(db.Model):
+        @db.declared_attr
+        def __tablename__(cls):
+            return 'model5'
+
+    assert Model.__table__.name == 'model5'
+
 
 async def test_inline_constraints_and_indexes(bind, engine):
     u = await User.create(nickname='test')