openstack/deb-python-sqlalchemy-utils
Code Issues Proposed changes

Make get_all_descriptors support selectables

Browse Source
This commit is contained in:
Konsta Vesterinen
2015-07-16 12:34:46 +03:00
parent 1368207b74
commit 8213fdba5d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sqlalchemy_utils/functions/orm.py
View File

@@ -624,16 +624,20 @@ def get_descriptor(entity, attr):
def get_all_descriptors(expr): def get_all_descriptors(expr):
if isinstance(expr, sa.sql.selectable.Selectable):
return expr.c
insp = sa.inspect(expr) insp = sa.inspect(expr)
polymorphic_mappers = get_polymorphic_mappers(insp) try:
if polymorphic_mappers: polymorphic_mappers = get_polymorphic_mappers(insp)
except sa.exc.NoInspectionAvailable:
return get_mapper(expr).all_orm_descriptors
else:
attrs = dict(get_mapper(expr).all_orm_descriptors) attrs = dict(get_mapper(expr).all_orm_descriptors)
for submapper in polymorphic_mappers: for submapper in polymorphic_mappers:
for key, descriptor in submapper.all_orm_descriptors.items(): for key, descriptor in submapper.all_orm_descriptors.items():
if key not in attrs: if key not in attrs:
attrs[key] = descriptor attrs[key] = descriptor
return attrs return attrs
return get_mapper(expr).all_orm_descriptors
def get_hybrid_properties(model): def get_hybrid_properties(model):