Skip to content

Commit

Permalink
Merge pull request #155 from supabase/fix/quoting
Browse files Browse the repository at this point in the history
fix: remove quoting of names
  • Loading branch information
kiwicopple authored Feb 14, 2021
2 parents eacc4f7 + fb0b82c commit 9ecb985
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/lib/PostgrestFilterBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PostgrestTransformBuilder from './PostgrestTransformBuilder'
* Filters
*/

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

type FilterOperator =
| 'eq'
Expand Down
8 changes: 4 additions & 4 deletions src/lib/PostgrestTransformBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default class PostgrestTransformBuilder<T> extends PostgrestBuilder<T> {
foreignTable,
}: { ascending?: boolean; nullsFirst?: boolean; foreignTable?: string } = {}
): this {
const key = typeof foreignTable === 'undefined' ? 'order' : `"${foreignTable}".order`
const key = typeof foreignTable === 'undefined' ? 'order' : `${foreignTable}.order`
this.url.searchParams.set(
key,
`${column}.${ascending ? 'asc' : 'desc'}.${nullsFirst ? 'nullsfirst' : 'nullslast'}`
Expand All @@ -60,7 +60,7 @@ export default class PostgrestTransformBuilder<T> extends PostgrestBuilder<T> {
* @param foreignTable The foreign table to use (for foreign columns).
*/
limit(count: number, { foreignTable }: { foreignTable?: string } = {}): this {
const key = typeof foreignTable === 'undefined' ? 'limit' : `"${foreignTable}".limit`
const key = typeof foreignTable === 'undefined' ? 'limit' : `${foreignTable}.limit`
this.url.searchParams.set(key, `${count}`)
return this
}
Expand All @@ -73,8 +73,8 @@ export default class PostgrestTransformBuilder<T> extends PostgrestBuilder<T> {
* @param foreignTable The foreign table to use (for foreign columns).
*/
range(from: number, to: number, { foreignTable }: { foreignTable?: string } = {}): this {
const keyOffset = typeof foreignTable === 'undefined' ? 'offset' : `"${foreignTable}".offset`
const keyLimit = typeof foreignTable === 'undefined' ? 'limit' : `"${foreignTable}".limit`
const keyOffset = typeof foreignTable === 'undefined' ? 'offset' : `${foreignTable}.offset`
const keyLimit = typeof foreignTable === 'undefined' ? 'limit' : `${foreignTable}.limit`
this.url.searchParams.set(keyOffset, `${from}`)
// Range is inclusive, so add 1
this.url.searchParams.set(keyLimit, `${to - from + 1}`)
Expand Down

0 comments on commit 9ecb985

Please sign in to comment.