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

Add ColumnEntity support for get_mapper

Browse Source
This commit is contained in:
Konsta Vesterinen
2014-11-03 15:27:53 +02:00
parent d02bc5ee8c
commit 9ce66c3a0d
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.rst
View File

@@ -7,7 +7,7 @@ Here you can see the full list of changes between each SQLAlchemy-Utils release.
0.27.7 (2014-11-03) 0.27.7 (2014-11-03)
^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
- Added support for Column objects in get_mapper - Added support for Column and ColumnEntity objects in get_mapper
- Made make_order_by_deterministic add deterministic column more aggressively - Made make_order_by_deterministic add deterministic column more aggressively

2
sqlalchemy_utils/functions/orm.py
View File

@@ -79,6 +79,8 @@ def get_mapper(mixed):
mixed = mixed.expr mixed = mixed.expr
elif isinstance(mixed, sa.Column): elif isinstance(mixed, sa.Column):
mixed = mixed.table mixed = mixed.table
elif isinstance(mixed, sa.orm.query._ColumnEntity):
mixed = mixed.expr
if isinstance(mixed, sa.orm.Mapper): if isinstance(mixed, sa.orm.Mapper):
return mixed return mixed

4
tests/functions/test_get_mapper.py
View File

@@ -91,6 +91,10 @@ class TestGetMapperWithQueryEntities(TestCase):
sa.inspect(self.Building) sa.inspect(self.Building)
) )
def test_column_entity(self):
query = self.session.query(self.Building.id)
assert get_mapper(query._entities[0]) == sa.inspect(self.Building)
class TestGetMapperWithMultipleMappersFound(object): class TestGetMapperWithMultipleMappersFound(object):
def setup_method(self, method): def setup_method(self, method):