From d02bc5ee8cb6365e1324d5df56d0de2b2d29fab7 Mon Sep 17 00:00:00 2001 From: Konsta Vesterinen Date: Mon, 3 Nov 2014 15:22:20 +0200 Subject: [PATCH] Add deterministic column more aggressively --- CHANGES.rst | 1 + sqlalchemy_utils/functions/sort_query.py | 2 +- tests/functions/test_make_order_by_deterministic.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 39eb01b..914284a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,6 +8,7 @@ Here you can see the full list of changes between each SQLAlchemy-Utils release. ^^^^^^^^^^^^^^^^^^^ - Added support for Column objects in get_mapper +- Made make_order_by_deterministic add deterministic column more aggressively 0.27.6 (2014-10-29) diff --git a/sqlalchemy_utils/functions/sort_query.py b/sqlalchemy_utils/functions/sort_query.py index a7a8134..5421d4e 100644 --- a/sqlalchemy_utils/functions/sort_query.py +++ b/sqlalchemy_utils/functions/sort_query.py @@ -190,7 +190,7 @@ def make_order_by_deterministic(query): if has_unique_index(column): return query except TypeError: - return query + pass base_table = get_tables(query._entities[0])[0] query = query.order_by( diff --git a/tests/functions/test_make_order_by_deterministic.py b/tests/functions/test_make_order_by_deterministic.py index 10b51c7..87f635d 100644 --- a/tests/functions/test_make_order_by_deterministic.py +++ b/tests/functions/test_make_order_by_deterministic.py @@ -88,4 +88,4 @@ class TestMakeOrderByDeterministic(TestCase): alias = sa.orm.aliased(self.User.__table__) query = self.session.query(alias).order_by(alias.c.name) query = make_order_by_deterministic(query) - assert str(query).endswith('ORDER BY user_1.name') + assert str(query).endswith('ORDER BY user_1.name, "user".id ASC')