Fix tests
This commit is contained in:
parent
0130beea30
commit
a77887bf58
|
@ -46,58 +46,58 @@ class TestMakeOrderByDeterministic(object):
|
|||
def test_column_property(self, session, User):
|
||||
query = session.query(User).order_by(User.email_lower)
|
||||
query = make_order_by_deterministic(query)
|
||||
assert_contains('lower("user".name) AS lower_1', query)
|
||||
assert_contains('lower_1, "user".id ASC', query)
|
||||
assert_contains('lower(user.name) AS lower_1', query)
|
||||
assert_contains('lower_1, user.id ASC', query)
|
||||
|
||||
def test_unique_column(self, session, User):
|
||||
query = session.query(User).order_by(User.email)
|
||||
query = make_order_by_deterministic(query)
|
||||
|
||||
assert str(query).endswith('ORDER BY "user".email')
|
||||
assert str(query).endswith('ORDER BY user.email')
|
||||
|
||||
def test_non_unique_column(self, session, User):
|
||||
query = session.query(User).order_by(User.name)
|
||||
query = make_order_by_deterministic(query)
|
||||
assert_contains('ORDER BY "user".name, "user".id ASC', query)
|
||||
assert_contains('ORDER BY user.name, user.id ASC', query)
|
||||
|
||||
def test_descending_order_by(self, session, User):
|
||||
query = session.query(User).order_by(
|
||||
sa.desc(User.name)
|
||||
)
|
||||
query = make_order_by_deterministic(query)
|
||||
assert_contains('ORDER BY "user".name DESC, "user".id DESC', query)
|
||||
assert_contains('ORDER BY user.name DESC, user.id DESC', query)
|
||||
|
||||
def test_ascending_order_by(self, session, User):
|
||||
query = session.query(User).order_by(
|
||||
sa.asc(User.name)
|
||||
)
|
||||
query = make_order_by_deterministic(query)
|
||||
assert_contains('ORDER BY "user".name ASC, "user".id ASC', query)
|
||||
assert_contains('ORDER BY user.name ASC, user.id ASC', query)
|
||||
|
||||
def test_string_order_by(self, session, User):
|
||||
query = session.query(User).order_by('name')
|
||||
query = make_order_by_deterministic(query)
|
||||
assert_contains('ORDER BY "user".name, "user".id ASC', query)
|
||||
assert_contains('ORDER BY user.name, user.id ASC', query)
|
||||
|
||||
def test_annotated_label(self, session, User):
|
||||
query = session.query(User).order_by(User.article_count)
|
||||
query = make_order_by_deterministic(query)
|
||||
assert_contains('article_count, "user".id ASC', query)
|
||||
assert_contains('article_count, user.id ASC', query)
|
||||
|
||||
def test_annotated_label_with_descending_order(self, session, User):
|
||||
query = session.query(User).order_by(
|
||||
sa.desc(User.article_count)
|
||||
)
|
||||
query = make_order_by_deterministic(query)
|
||||
assert_contains('ORDER BY article_count DESC, "user".id DESC', query)
|
||||
assert_contains('ORDER BY article_count DESC, user.id DESC', query)
|
||||
|
||||
def test_query_without_order_by(self, session, User):
|
||||
query = session.query(User)
|
||||
query = make_order_by_deterministic(query)
|
||||
assert 'ORDER BY "user".id' in str(query)
|
||||
assert 'ORDER BY user.id' in str(query)
|
||||
|
||||
def test_alias(self, session, User):
|
||||
alias = sa.orm.aliased(User.__table__)
|
||||
query = session.query(alias).order_by(alias.c.name)
|
||||
query = make_order_by_deterministic(query)
|
||||
assert str(query).endswith('ORDER BY user_1.name, "user".id ASC')
|
||||
assert str(query).endswith('ORDER BY user_1.name, user.id ASC')
|
||||
|
|
|
@ -96,7 +96,7 @@ class TestTranslationHybrid(object):
|
|||
|
||||
assert (
|
||||
'coalesce(article.name_translations -> article.locale'
|
||||
in str(Article.name)
|
||||
in str(Article.name.expression)
|
||||
)
|
||||
|
||||
def test_locales_casted_only_in_compilation_phase(self, Base):
|
||||
|
|
Loading…
Reference in New Issue