diff --git a/sqlalchemy_utils/functions/defer_except.py b/sqlalchemy_utils/functions/defer_except.py index 4de18e4..dd2f328 100644 --- a/sqlalchemy_utils/functions/defer_except.py +++ b/sqlalchemy_utils/functions/defer_except.py @@ -1,38 +1,6 @@ -import six from sqlalchemy import inspect from sqlalchemy.orm import defer from sqlalchemy.orm.properties import ColumnProperty -from sqlalchemy.orm.query import _ColumnEntity -from sqlalchemy.orm.mapper import Mapper - - -def property_names(properties): - names = [] - for property_ in properties: - if isinstance(property_, six.string_types): - names.append(property_) - else: - names.append( - '%s.%s' % ( - property_.class_.__name__, - property_.key - ) - ) - return names - - -def query_entities(query): - entities = [] - for entity in query._entities: - if not isinstance(entity, _ColumnEntity): - entities.append(entity.entity_zero.class_) - - for entity in query._join_entities: - if isinstance(entity, Mapper): - entities.append(entity.class_) - else: - entities.append(entity) - return entities def defer_except(query, columns):