Merge pull request #542 from fantix/instant-column-name

Instant Column Name

Author: fantix

gino/api.py

@@ -327,6 +327,7 @@ def __init__(self, bind=None, model_classes=None, query_ext=True,
             model_classes = self.model_base_classes
         self._model = declarative_base(self, model_classes)
         self.declared_attr = declared_attr
+        self.quoted_name = sa.sql.quoted_name
         for mod in json_support, sa:
             for key in mod.__all__:
                 if not hasattr(self, key) and key not in self.no_delegate:

gino/declarative.py

@@ -47,6 +47,13 @@ def invert_get(self, key, default=None):
         return self._inverted_dict.get(key, default)
 
 
+class Dict(collections.OrderedDict):
+    def __setitem__(self, key, value):
+        if isinstance(value, sa.Column) and not value.name:
+            value.name = key
+        return super().__setitem__(key, value)
+
+
 class ModelType(type):
     def _check_abstract(self):
         if self.__table__ is None:
@@ -71,7 +78,7 @@ def __getattr__(self, item):
 
     @classmethod
     def __prepare__(mcs, name, bases, **kwargs):
-        return collections.OrderedDict()
+        return Dict()
 
     def __new__(mcs, name, bases, namespace, **kwargs):
         rv = type.__new__(mcs, name, bases, namespace)

tests/test_declarative.py

@@ -243,3 +243,13 @@ async def test_invert_dict():
     d['col2'] = 'c2'
     assert d.invert_get('c1') == 'col1'
     assert d.invert_get('c2') == 'col2'
+
+
+async def test_instant_column_name():
+    class Model(db.Model):
+        user = db.Column()
+        assert user.name == 'user'
+
+        select_col = db.Column(name=db.quoted_name('select', False))
+        assert select_col.name == 'select'
+        assert not select_col.name.quote