Always add OrderBy in AdminDatabaseFeature

ServiceStack · Sep 23, 2022 · 80aa3a4 · 80aa3a4
1 parent 37beaa9
commit 80aa3a4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ServiceStack/src/ServiceStack.Server/AdminDatabaseFeature.cs b/ServiceStack/src/ServiceStack.Server/AdminDatabaseFeature.cs
@@ -267,10 +267,10 @@ public async Task<object> Any(AdminDatabase request)
         {
             sb.AppendLine($"WHERE {string.Join(" AND ", filters)}");
         }
-        if (!string.IsNullOrEmpty(request.OrderBy))
-        {
-            sb.AppendLine($"ORDER BY {OrmLiteUtils.OrderByFields(dialect, request.OrderBy)}");
-        }
+
+        // OrderBy always required when paging
+        var orderBy = request.OrderBy ?? (columns.FirstOrDefault(x => x.IsPrimaryKey == true) ?? columns[0]).Name;
+        sb.AppendLine($"ORDER BY {OrmLiteUtils.OrderByFields(dialect, orderBy)}");
 
         var take = Math.Min(request.Take.GetValueOrDefault(feature.QueryLimit), feature.QueryLimit);