summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/attributes.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-08-27 16:04:16 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-08-27 16:04:16 -0400
commit640625bc9e98dd4060a1e61c717ddc98f8b3808b (patch)
tree8c8e19184af6c70ccc382d4f86111dae8c3ffdfe /lib/sqlalchemy/orm/attributes.py
parent326f2e4f60744d8073eaa4eda69d1dbb46bc9f50 (diff)
downloadsqlalchemy-640625bc9e98dd4060a1e61c717ddc98f8b3808b.tar.gz
- [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]
Diffstat (limited to 'lib/sqlalchemy/orm/attributes.py')
-rw-r--r--lib/sqlalchemy/orm/attributes.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index 9b0b35e28..eec72b5f3 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -117,7 +117,9 @@ PASSIVE_ONLY_PERSISTENT = util.symbol("PASSIVE_ONLY_PERSISTENT",
)
-class QueryableAttribute(interfaces._InspectionAttr, interfaces.PropComparator):
+class QueryableAttribute(interfaces._MappedAttribute,
+ interfaces._InspectionAttr,
+ interfaces.PropComparator):
"""Base class for class-bound attributes. """
is_attribute = True