Skip to content
This repository was archived by the owner on Oct 9, 2025. It is now read-only.

fix: handle postgrest special characters in filters #166

Merged
merged 3 commits into from
Mar 11, 2021
Merged

fix: handle postgrest special characters in filters #166

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf6a8c3
fix: handle postgrest special characters in filters
inian Mar 11, 2021
5c02d4a
fix: only need to quote `(),` for values
soedirgo Mar 11, 2021
5c36f1d
refactor: inline cleanFilterArray
soedirgo Mar 11, 2021
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
18 changes: 12 additions & 6 deletions src/lib/PostgrestFilterBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import PostgrestTransformBuilder from './PostgrestTransformBuilder'
* Filters
*/

const cleanFilterArray = <T>(filter: T[keyof T][]) => filter.map((s) => `${s}`).join(',')

type FilterOperator =
| 'eq'
| 'neq'
Expand Down Expand Up @@ -171,7 +169,15 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
* @param values The values to filter with.
*/
in(column: keyof T, values: T[keyof T][]): this {
this.url.searchParams.append(`${column}`, `in.(${cleanFilterArray(values)})`)
const cleanedValues = values
.map((s) => {
// handle postgrest reserved characters
// https://postgrest.org/en/v7.0.0/api.html#reserved-characters
if (typeof s === 'string' && new RegExp('[,()]').test(s)) return `"${s}"`
else return `${s}`
})
.join(',')
this.url.searchParams.append(`${column}`, `in.(${cleanedValues})`)
return this
}

Expand All @@ -189,7 +195,7 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
this.url.searchParams.append(`${column}`, `cs.${value}`)
} else if (Array.isArray(value)) {
// array
this.url.searchParams.append(`${column}`, `cs.{${cleanFilterArray(value)}}`)
this.url.searchParams.append(`${column}`, `cs.{${value.join(',')}}`)
} else {
// json
this.url.searchParams.append(`${column}`, `cs.${JSON.stringify(value)}`)
Expand All @@ -210,7 +216,7 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
this.url.searchParams.append(`${column}`, `cd.${value}`)
} else if (Array.isArray(value)) {
// array
this.url.searchParams.append(`${column}`, `cd.{${cleanFilterArray(value)}}`)
this.url.searchParams.append(`${column}`, `cd.{${value.join(',')}}`)
} else {
// json
this.url.searchParams.append(`${column}`, `cd.${JSON.stringify(value)}`)
Expand Down Expand Up @@ -291,7 +297,7 @@ export default class PostgrestFilterBuilder<T> extends PostgrestTransformBuilder
this.url.searchParams.append(`${column}`, `ov.${value}`)
} else {
// array
this.url.searchParams.append(`${column}`, `ov.{${cleanFilterArray(value)}}`)
this.url.searchParams.append(`${column}`, `ov.{${value.join(',')}}`)
}
return this
}
Expand Down