diff options
| author | Chris Withers <chris@simplistix.co.uk> | 2010-03-01 18:10:23 +0000 |
|---|---|---|
| committer | Chris Withers <chris@simplistix.co.uk> | 2010-03-01 18:10:23 +0000 |
| commit | 8aaf3da70a0b1beb3e9ca36d15e37454e3bfa958 (patch) | |
| tree | 5d49ab44cf66fbacfb020d34ee09a6c27ce86ccd /lib/sqlalchemy/ext/declarative.py | |
| parent | 83d7d12b0aea14507552bebdbdb78f40b8459e53 (diff) | |
| download | sqlalchemy-8aaf3da70a0b1beb3e9ca36d15e37454e3bfa958.tar.gz | |
allow __tablename__ to come from a mixin
Diffstat (limited to 'lib/sqlalchemy/ext/declarative.py')
| -rw-r--r-- | lib/sqlalchemy/ext/declarative.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index 65c9df133..12b79c796 100644 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -546,6 +546,9 @@ def _as_declarative(cls, classname, dict_): dict_[name]=column_copies[obj]=obj.copy() mapper_args = mapper_args or getattr(base,'__mapper_args__',mapper_args) table_args = table_args or getattr(base,'__table_args__',None) + tablename = getattr(base,'__tablename__',None) + if tablename: + dict_['__tablename__']=tablename # make sure that column copies are used rather than the original columns # from any mixins |