Skip to content
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.

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

feat: update postgrest-js with new query parser #1299

Merged
merged 9 commits into from
Oct 29, 2024
Merged
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@supabase/auth-js": "2.65.1",
"@supabase/functions-js": "2.4.3",
"@supabase/node-fetch": "2.6.15",
"@supabase/postgrest-js": "1.16.3",
"@supabase/postgrest-js": "1.17.0",
"@supabase/realtime-js": "2.10.7",
"@supabase/storage-js": "2.7.1"
},
Expand Down
4 changes: 3 additions & 1 deletion src/SupabaseClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,9 @@ export default class SupabaseClient<
? Fn['Returns'][number]
: never
: never,
Fn['Returns']
Fn['Returns'],
FnName,
null
> {
return this.rest.rpc(fn, args, options)
}
Expand Down
10 changes: 10 additions & 0 deletions src/lib/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,26 @@ export type SupabaseClientOptions<SchemaName> = {
accessToken?: () => Promise<string>
}

export type GenericRelationship = {
foreignKeyName: string
columns: string[]
isOneToOne?: boolean
referencedRelation: string
referencedColumns: string[]
}

export type GenericTable = {
Row: Record<string, unknown>
Insert: Record<string, unknown>
Update: Record<string, unknown>
Relationships: GenericRelationship[]
}

export type GenericUpdatableView = GenericTable

export type GenericNonUpdatableView = {
Row: Record<string, unknown>
Relationships: GenericRelationship[]
}

export type GenericView = GenericUpdatableView | GenericNonUpdatableView
Expand Down
7 changes: 5 additions & 2 deletions test/index.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const supabase = createClient<Database>(URL, KEY)
if (error) {
throw new Error(error.message)
}
expectType<Database['public']['Tables']['users']['Row'] | null>(message.user)
expectType<Database['public']['Tables']['users']['Row']>(message.user)
}

// one-to-many relationship
Expand All @@ -99,8 +99,11 @@ const supabase = createClient<Database>(URL, KEY)
// referencing missing column
{
type SelectQueryError<Message extends string> = { error: true } & Message

const res = await supabase.from('users').select('username, dat')
expectType<PostgrestSingleResponse<SelectQueryError<`Referencing missing column \`dat\``>[]>>(res)
expectType<
PostgrestSingleResponse<SelectQueryError<"column 'dat' does not exist on 'users'.">[]>
>(res)
}

// one-to-one relationship
Expand Down
Loading