summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/orm/eager_relations.py4
-rw-r--r--test/sql/select.py8
2 files changed, 10 insertions, 2 deletions
diff --git a/test/orm/eager_relations.py b/test/orm/eager_relations.py
index d94332c09..dffc5322c 100644
--- a/test/orm/eager_relations.py
+++ b/test/orm/eager_relations.py
@@ -299,7 +299,7 @@ class EagerTest(QueryTest):
q = sess.query(User)
if testbase.db.engine.name != 'mssql':
- l = q.join('orders').order_by(desc(Order.user_id)).limit(2).offset(1)
+ l = q.join('orders').order_by(Order.user_id.desc()).limit(2).offset(1)
assert [
User(id=9,
orders=[Order(id=2), Order(id=4)],
@@ -311,7 +311,7 @@ class EagerTest(QueryTest):
)
] == l.all()
- l = q.join('addresses').order_by(desc(Address.email_address)).limit(1).offset(0)
+ l = q.join('addresses').order_by(Address.email_address.desc()).limit(1).offset(0)
assert [
User(id=7,
orders=[Order(id=1), Order(id=3), Order(id=5)],
diff --git a/test/sql/select.py b/test/sql/select.py
index 2e099b01a..0edaab071 100644
--- a/test/sql/select.py
+++ b/test/sql/select.py
@@ -314,6 +314,14 @@ sq.myothertable_othername AS sq_myothertable_othername FROM (" + sqstring + ") A
self.runtest(
select([table1.c.myid]).distinct(), "SELECT DISTINCT mytable.myid FROM mytable"
)
+
+ self.runtest(
+ select([func.count(table1.c.myid.distinct())]), "SELECT count(DISTINCT mytable.myid) FROM mytable"
+ )
+
+ self.runtest(
+ select([func.count(distinct(table1.c.myid))]), "SELECT count(DISTINCT mytable.myid) FROM mytable"
+ )
def testoperators(self):