From a6ac5f0dbf5b2e8d0d0c55a58e7a41ee7d5ad5dc Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Mon, 29 Nov 2021 19:44:18 -0800 Subject: [PATCH] fix(rpc): fix ordering of related records They were being ordered by IDs; they should be ordered by Names. Signed-off-by: Kevin Morris --- aurweb/rpc.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/aurweb/rpc.py b/aurweb/rpc.py index c70ddf1a..7bdae638 100644 --- a/aurweb/rpc.py +++ b/aurweb/rpc.py @@ -193,7 +193,7 @@ class RPC: models.DependencyType.Name.label("Type"), models.PackageDependency.DepName.label("Name"), models.PackageDependency.DepCondition.label("Cond") - ).distinct().order_by("ID"), + ).distinct().order_by("Name"), # PackageRelation db.query( @@ -205,7 +205,7 @@ class RPC: models.RelationType.Name.label("Type"), models.PackageRelation.RelName.label("Name"), models.PackageRelation.RelCondition.label("Cond") - ).distinct().order_by("ID"), + ).distinct().order_by("Name"), # Groups db.query(models.PackageGroup).join( @@ -217,7 +217,7 @@ class RPC: literal("Groups").label("Type"), models.Group.Name.label("Name"), literal(str()).label("Cond") - ).distinct().order_by("ID"), + ).distinct().order_by("Name"), # Licenses db.query(models.PackageLicense).join( @@ -230,7 +230,7 @@ class RPC: literal("License").label("Type"), models.License.Name.label("Name"), literal(str()).label("Cond") - ).distinct().order_by("ID"), + ).distinct().order_by("Name"), # Keywords db.query(models.PackageKeyword).join( @@ -242,7 +242,7 @@ class RPC: literal("Keywords").label("Type"), models.PackageKeyword.Keyword.label("Name"), literal(str()).label("Cond") - ).distinct().order_by("ID") + ).distinct().order_by("Name") ] # Union all subqueries together.