diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/ext/declarative.py | 10 |
2 files changed, 9 insertions, 4 deletions
@@ -80,6 +80,9 @@ CHANGES __tablename__ = 'foos' id = Column(Integer, primary_key=True) + - inheritance in declarative can be disabled when sending + "inherits=None" to __mapper_args__. + 0.4.4 ------ - sql diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index 6616a77fe..784236662 100644 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -211,11 +211,13 @@ class DeclarativeMeta(type): else: table = cls.__table__ - inherits = cls.__mro__[1] - inherits = cls._decl_class_registry.get(inherits.__name__, None) mapper_args = getattr(cls, '__mapper_args__', {}) - - cls.__mapper__ = mapper(cls, table, inherits=inherits, properties=our_stuff, **mapper_args) + if 'inherits' not in mapper_args: + inherits = cls.__mro__[1] + inherits = cls._decl_class_registry.get(inherits.__name__, None) + mapper_args['inherits'] = inherits + + cls.__mapper__ = mapper(cls, table, properties=our_stuff, **mapper_args) return type.__init__(cls, classname, bases, dict_) def __setattr__(cls, key, value): |