Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class PostgrestQueryBuilder(
this.body = body
request()
val columns = body.flatMap { it.jsonObject.keys }.distinct()
if(columns.isNotEmpty()) params["columns"] = listOf(columns.joinToString(","))
if(columns.isNotEmpty()) params["columns"] = listOf(columns.joinToString(",") { "\"$it\"" })
}
return RestRequestExecutor.execute(postgrest = postgrest, path = table, request = requestBuilder)
}
Expand Down Expand Up @@ -137,7 +137,7 @@ class PostgrestQueryBuilder(
this.body = body
request()
val columns = body.flatMap { it.jsonObject.keys }.distinct()
if(columns.isNotEmpty()) params["columns"] = listOf(columns.joinToString(","))
if(columns.isNotEmpty()) params["columns"] = listOf(columns.joinToString(",") { "\"$it\"" })
}
return RestRequestExecutor.execute(postgrest = postgrest, path = table, request = requestBuilder)
}
Expand Down
38 changes: 36 additions & 2 deletions Postgrest/src/commonTest/kotlin/PostgrestTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class PostgrestTest {
assertMethodIs(HttpMethod.Post, it.method)
val receivedBody = it.body.toJsonElement()
assertEquals(expectedBody, receivedBody)
assertEquals("data", it.url.parameters["columns"])
assertEquals("\"data\"", it.url.parameters["columns"])
assertEquals("schema", it.headers["Content-Profile"])
respond("")
}
Expand All @@ -254,13 +254,47 @@ class PostgrestTest {
assertMethodIs(HttpMethod.Post, it.method)
val receivedBody = it.body.toJsonElement()
assertEquals(expectedBody, receivedBody)
assertEquals("data", it.url.parameters["columns"])
assertEquals("\"data\"", it.url.parameters["columns"])
assertEquals("schema", it.headers["Content-Profile"])
respond("")
}
)
}

@Test
fun testInsertQuotesColumnNames() {
val body = JsonArray(listOf(buildJsonObject {
put("price (usd)", 1)
put("a.b", 2)
}))
testClient(
request = { table ->
from(table).insert(body)
},
requestHandler = {
assertEquals("\"price (usd)\",\"a.b\"", it.url.parameters["columns"])
respond("")
}
)
}

@Test
fun testUpsertQuotesColumnNames() {
val body = JsonArray(listOf(buildJsonObject {
put("price (usd)", 1)
put("a.b", 2)
}))
testClient(
request = { table ->
from(table).upsert(body)
},
requestHandler = {
assertEquals("\"price (usd)\",\"a.b\"", it.url.parameters["columns"])
respond("")
}
)
}

@Test
fun testUpdate() {
val body = buildJsonObject {
Expand Down
Loading