From 640625bc9e98dd4060a1e61c717ddc98f8b3808b Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 27 Aug 2012 16:04:16 -0400 Subject: - [feature] Conflicts between columns on single-inheritance declarative subclasses, with or without using a mixin, can be resolved using a new @declared_attr usage described in the documentation. [ticket:2472] --- lib/sqlalchemy/ext/declarative/api.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/ext/declarative/api.py') diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py index 80934c194..143468c13 100644 --- a/lib/sqlalchemy/ext/declarative/api.py +++ b/lib/sqlalchemy/ext/declarative/api.py @@ -8,7 +8,8 @@ from ...schema import Table, MetaData from ...orm import synonym as _orm_synonym, mapper,\ - comparable_property + comparable_property,\ + interfaces from ...orm.util import polymorphic_union, _mapper_or_none from ... import exc import weakref @@ -96,7 +97,7 @@ def comparable_using(comparator_factory): return comparable_property(comparator_factory, fn) return decorate -class declared_attr(property): +class declared_attr(interfaces._MappedAttribute, property): """Mark a class-level method as representing the definition of a mapped property or special declarative member name. -- cgit v1.2.1