Skip to content

fix(postgrest-js): prevent shared state between query builder operations #1978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
7ttp wants to merge 1 commit into
base: master
Choose a base branch
from
+40 −22
Open

fix(postgrest-js): prevent shared state between query builder operations #1978

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 40 additions & 22 deletions packages/core/postgrest-js/src/PostgrestQueryBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ export default class PostgrestQueryBuilder<
this.fetch = fetch
}

/**
* Clone URL and headers to prevent shared state between operations.
*/
private cloneRequestState(): { url: URL; headers: Headers } {
return {
url: new URL(this.url.toString()),
headers: new Headers(this.headers),
}
}

/**
* Perform a SELECT query on the table or view.
*
Expand Down Expand Up @@ -115,16 +125,18 @@ export default class PostgrestQueryBuilder<
return c
})
.join('')
this.url.searchParams.set('select', cleanedColumns)

const { url, headers } = this.cloneRequestState()
url.searchParams.set('select', cleanedColumns)

if (count) {
this.headers.append('Prefer', `count=${count}`)
headers.append('Prefer', `count=${count}`)
}

return new PostgrestFilterBuilder({
method,
url: this.url,
headers: this.headers,
url,
headers,
schema: this.schema,
fetch: this.fetch,
})
Expand Down Expand Up @@ -205,26 +217,27 @@ export default class PostgrestQueryBuilder<
'POST'
> {
const method = 'POST'
const { url, headers } = this.cloneRequestState()

if (count) {
this.headers.append('Prefer', `count=${count}`)
headers.append('Prefer', `count=${count}`)
}
if (!defaultToNull) {
this.headers.append('Prefer', `missing=default`)
headers.append('Prefer', `missing=default`)
}

if (Array.isArray(values)) {
const columns = values.reduce((acc, x) => acc.concat(Object.keys(x)), [] as string[])
if (columns.length > 0) {
const uniqueColumns = [...new Set(columns)].map((column) => `"${column}"`)
this.url.searchParams.set('columns', uniqueColumns.join(','))
url.searchParams.set('columns', uniqueColumns.join(','))
}
}

return new PostgrestFilterBuilder({
method,
url: this.url,
headers: this.headers,
url,
headers,
schema: this.schema,
body: values,
fetch: this.fetch ?? fetch,
Expand Down Expand Up @@ -375,29 +388,30 @@ export default class PostgrestQueryBuilder<
'POST'
> {
const method = 'POST'
const { url, headers } = this.cloneRequestState()

this.headers.append('Prefer', `resolution=${ignoreDuplicates ? 'ignore' : 'merge'}-duplicates`)
headers.append('Prefer', `resolution=${ignoreDuplicates ? 'ignore' : 'merge'}-duplicates`)

if (onConflict !== undefined) this.url.searchParams.set('on_conflict', onConflict)
if (onConflict !== undefined) url.searchParams.set('on_conflict', onConflict)
if (count) {
this.headers.append('Prefer', `count=${count}`)
headers.append('Prefer', `count=${count}`)
}
if (!defaultToNull) {
this.headers.append('Prefer', 'missing=default')
headers.append('Prefer', 'missing=default')
}

if (Array.isArray(values)) {
const columns = values.reduce((acc, x) => acc.concat(Object.keys(x)), [] as string[])
if (columns.length > 0) {
const uniqueColumns = [...new Set(columns)].map((column) => `"${column}"`)
this.url.searchParams.set('columns', uniqueColumns.join(','))
url.searchParams.set('columns', uniqueColumns.join(','))
}
}

return new PostgrestFilterBuilder({
method,
url: this.url,
headers: this.headers,
url,
headers,
schema: this.schema,
body: values,
fetch: this.fetch ?? fetch,
Expand Down Expand Up @@ -442,14 +456,16 @@ export default class PostgrestQueryBuilder<
'PATCH'
> {
const method = 'PATCH'
const { url, headers } = this.cloneRequestState()

if (count) {
this.headers.append('Prefer', `count=${count}`)
headers.append('Prefer', `count=${count}`)
}

return new PostgrestFilterBuilder({
method,
url: this.url,
headers: this.headers,
url,
headers,
schema: this.schema,
body: values,
fetch: this.fetch ?? fetch,
Expand Down Expand Up @@ -489,14 +505,16 @@ export default class PostgrestQueryBuilder<
'DELETE'
> {
const method = 'DELETE'
const { url, headers } = this.cloneRequestState()

if (count) {
this.headers.append('Prefer', `count=${count}`)
headers.append('Prefer', `count=${count}`)
}

return new PostgrestFilterBuilder({
method,
url: this.url,
headers: this.headers,
url,
headers,
schema: this.schema,
fetch: this.fetch ?? fetch,
})
Expand Down