external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-rpc-ordering' into pu

Browse source
This commit is contained in:
Kevin Morris 2021-11-29 19:57:45 -08:00
commit 274682f040
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
aurweb/rpc.py
View file

@ -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.