Merge pull request #86 from hunsra/hunsra-multiple-order-fix

fix: #85
supabase-community · Jan 8, 2024 · ce5f7d9 · ce5f7d9
2 parents 20240e6 + 99704ec
commit ce5f7d9
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 8 deletions.
diff --git a/Postgrest/Table.cs b/Postgrest/Table.cs
@@ -655,15 +655,28 @@ public string GenerateUrl()
             foreach (var parsedFilter in _filters.Select(PrepareFilter))
                 query.Add(parsedFilter.Key, parsedFilter.Value);
 
-            foreach (var orderer in _orderers)
+            if (_orderers.Count > 0)
             {
-                var nullPosAttr = orderer.NullPosition.GetAttribute<MapToAttribute>();
-                var orderingAttr = orderer.Ordering.GetAttribute<MapToAttribute>();
+                var order = new StringBuilder();
 
-                if (nullPosAttr == null || orderingAttr == null) continue;
+                foreach (var orderer in _orderers)
+                {
+                    var nullPosAttr = orderer.NullPosition.GetAttribute<MapToAttribute>();
+                    var orderingAttr = orderer.Ordering.GetAttribute<MapToAttribute>();
+
+                    if (nullPosAttr == null || orderingAttr == null) continue;
+
+                    if (order.Length > 0)
+                        order.Append(",");
+
+                    var selector = !string.IsNullOrEmpty(orderer.ForeignTable)
+                        ? orderer.ForeignTable + "(" + orderer.Column + ")"
+                        : orderer.Column;
+
+                    order.Append($"{selector}.{orderingAttr.Mapping}.{nullPosAttr.Mapping}");
+                }
 
-                var key = !string.IsNullOrEmpty(orderer.ForeignTable) ? $"{orderer.ForeignTable}.order" : "order";
-                query.Add(key, $"{orderer.Column}.{orderingAttr.Mapping}.{nullPosAttr.Mapping}");
+                query.Add("order", order.ToString());
             }
 
             if (!string.IsNullOrEmpty(_columnQuery))

diff --git a/PostgrestTests/ClientTests.cs b/PostgrestTests/ClientTests.cs
@@ -424,13 +424,26 @@ public async Task TestOrderBy()
         {
             var client = new Client(BaseUrl);
 
+            // Test with a single orderer specified
             var orderedResponse = await client.Table<User>().Order("username", Ordering.Descending).Get();
             var unorderedResponse = await client.Table<User>().Get();
 
-            var supaOrderedUsers = orderedResponse.Models;
             var linqOrderedUsers = unorderedResponse.Models.OrderByDescending(u => u.Username).ToList();
 
-            CollectionAssert.AreEqual(linqOrderedUsers, supaOrderedUsers);
+            CollectionAssert.AreEqual(linqOrderedUsers, orderedResponse.Models);
+
+            // Test with multiple orderers specified
+            var multipleOrderedResponse = await client.Table<User>()
+                .Order(u => u.Username!, Ordering.Descending)
+                .Order(u => u.Status!, Ordering.Descending)
+                .Get();
+
+            linqOrderedUsers = unorderedResponse.Models
+                .OrderByDescending(u => u.Username)
+                .ThenByDescending(u => u.Status)
+                .ToList();
+
+            CollectionAssert.AreEqual(linqOrderedUsers, multipleOrderedResponse.Models);
         }
 
         [TestMethod("limit: basic")]