From 984798cdad2071ed66d3cf8b7e65a6afbadf6155 Mon Sep 17 00:00:00 2001 From: ansable Date: Tue, 4 Jun 2019 19:43:47 +0200 Subject: [PATCH] Update test_db.py --- test/test_db.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/test_db.py b/test/test_db.py index 0a279d01..b0e76064 100644 --- a/test/test_db.py +++ b/test/test_db.py @@ -768,8 +768,8 @@ def test_query(self): "select persons.* from `persons` where persons.age<30 or persons.name='john';", [(1, "john", 30, 2), (2, "jack", 20, 2)]), - (dict(fields=["name", "gender.name"], relations=[db.relation("gender", "id", "gender")]), - "select persons.name, gender.name from `persons` left join `gender` on persons.gender=gender.id;", + (dict(fields=["name", "gender.name"], relations=[db.relation("gender", "id", "gender")], sort=["persons.id"]), + "select persons.name, gender.name from `persons` left join `gender` on persons.gender=gender.id order by persons.id asc;", [("john", "male"), ("jack", "male"), ("jane", "female")]), @@ -801,11 +801,11 @@ def test_query(self): self.assertEqual(v.SQL(), sql) self.assertEqual(v.rows(), rows) # Assert Database.link() permanent relations. - v = self.db.persons.search(fields=["name", "gender.name"]) + v = self.db.persons.search(fields=["name", "gender.name"], sort=["persons.id"]) v.aliases["gender.name"] = "gender" self.db.link("persons", "gender", "gender", "id", join=db.LEFT) self.assertEqual(v.SQL(), - "select persons.name, gender.name as gender from `persons` left join `gender` on persons.gender=gender.id;") + "select persons.name, gender.name as gender from `persons` left join `gender` on persons.gender=gender.id order by persons.id asc;") self.assertEqual(v.rows(), [('john', 'male'), ('jack', 'male'), @@ -815,7 +815,7 @@ def test_query(self): def test_xml(self): # Assert Query.xml dump. - v = self.db.persons.search(fields=["name", "gender.name"]) + v = self.db.persons.search(fields=["name", "gender.name"], sort=["persons.id"]) v.aliases["gender.name"] = "gender" self.db.link("persons", "gender", "gender", "id", join=db.LEFT) self.assertEqual(v.xml,