Merge pull request #493 from supabase-community/r2.1.6

Fix ordering by multiple columns
supabase-community · Mar 3, 2024 · b4a7b53 · b4a7b53
2 parents b9b057d + 8c505bb
commit b4a7b53
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...t/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/PostgrestRequestBuilder.kt b/...t/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/PostgrestRequestBuilder.kt
@@ -68,7 +68,10 @@ class PostgrestRequestBuilder(@PublishedApi internal val propertyConversionMetho
      */
     fun order(column: String, order: Order, nullsFirst: Boolean = false, referencedTable: String? = null) {
         val key = if (referencedTable == null) "order" else "$referencedTable.order"
-        _params[key] = listOf("${column}.${order.value}.${if (nullsFirst) "nullsfirst" else "nullslast"}")
+        val orderEntry = _params[key]?.firstOrNull()
+        val existingOrder = if (orderEntry == null) "" else "$orderEntry,"
+        val newOrder = "$existingOrder${column}.${order.value}.${if (nullsFirst) "nullsfirst" else "nullslast"}"
+        _params[key] = listOf(newOrder)
     }
 
     /**