Skip to content

Commit b4a7b53

Browse files
authored
Merge pull request #493 from supabase-community/r2.1.6
Fix ordering by multiple columns
2 parents b9b057d + 8c505bb commit b4a7b53

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/PostgrestRequestBuilder.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ class PostgrestRequestBuilder(@PublishedApi internal val propertyConversionMetho
6868
*/
6969
fun order(column: String, order: Order, nullsFirst: Boolean = false, referencedTable: String? = null) {
7070
val key = if (referencedTable == null) "order" else "$referencedTable.order"
71-
_params[key] = listOf("${column}.${order.value}.${if (nullsFirst) "nullsfirst" else "nullslast"}")
71+
val orderEntry = _params[key]?.firstOrNull()
72+
val existingOrder = if (orderEntry == null) "" else "$orderEntry,"
73+
val newOrder = "$existingOrder${column}.${order.value}.${if (nullsFirst) "nullsfirst" else "nullslast"}"
74+
_params[key] = listOf(newOrder)
7275
}
7376

7477
/**

0 commit comments

Comments
 (0)