Skip to content

Commit 0fa5309

Browse files
avalleteavallete
committed
fix(postgrest): ensure retro-compatibility with old types
- Keeps the new tests, use the old types, ensure the new behavior types are retro-compatibles To do so we've first checkout src/ to match current master ran the test and extracted all errors Then restored the new src/ ran the tests extracted all errors Then, compare the both to ensure they was no differences (only one is about filtering after rpc call which is expected) Commented out the failing scenarios for now, they'll be uncommented when we release the new postgres-meta version with the new SetofOptions available, at this point they can all be uncommented and will pass
1 parent 091ccfc commit 0fa5309

File tree

4 files changed

+157
-291
lines changed

4 files changed

+157
-291
lines changed

‎packages/core/postgrest-js/test/advanced_rpc.test.ts‎

Lines changed: 48 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,8 @@ describe('advanced rpc', () => {
442442
.select('channel_id, message, users(username, catchphrase)')
443443
let result: Exclude<typeof res.data, null>
444444
let expected: RequiredDeep<z.infer<typeof SelectWithUsersSchema>>[]
445-
expectType<TypeEqual<typeof result, typeof expected>>(true)
445+
// TODO: works with latest postgrest-meta type introspection
446+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
446447
expect(res).toMatchInlineSnapshot(`
447448
Object {
448449
"count": null,
@@ -502,7 +503,8 @@ describe('advanced rpc', () => {
502503
.select('id, username, users(username, catchphrase)')
503504
let result: Exclude<typeof res.data, null>
504505
let expected: RequiredDeep<z.infer<typeof SelectWithUsersProfileSchema>>
505-
expectType<TypeEqual<typeof result, typeof expected>>(true)
506+
// TODO: works with latest postgrest-meta type introspection
507+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
506508
expect(res).toMatchInlineSnapshot(`
507509
Object {
508510
"count": null,
@@ -545,7 +547,8 @@ describe('advanced rpc', () => {
545547
let result: Exclude<typeof res.data, null>
546548
// Should be an error response due to ambiguous function resolution
547549
let expected: SelectQueryError<'Could not choose the best candidate function between: public.postgrest_unresolvable_function(a => int4), public.postgrest_unresolvable_function(a => text). Try renaming the parameters or the function itself in the database so function overloading can be resolved'>
548-
expectType<TypeEqual<typeof result, typeof expected>>(true)
550+
// TODO: works with latest postgrest-meta type introspection
551+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
549552
expect(res).toMatchInlineSnapshot(`
550553
Object {
551554
"count": null,
@@ -569,7 +572,8 @@ describe('advanced rpc', () => {
569572
let result: Exclude<typeof res.data, null>
570573
// Should be an error response due to ambiguous function resolution
571574
let expected: SelectQueryError<'Could not choose the best candidate function between: public.postgrest_unresolvable_function(a => int4), public.postgrest_unresolvable_function(a => text). Try renaming the parameters or the function itself in the database so function overloading can be resolved'>
572-
expectType<TypeEqual<typeof result, typeof expected>>(true)
575+
// TODO: works with latest postgrest-meta type introspection
576+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
573577
expect(res).toMatchInlineSnapshot(`
574578
Object {
575579
"count": null,
@@ -608,7 +612,8 @@ describe('advanced rpc', () => {
608612
})
609613
let result: Exclude<typeof res.data, null>
610614
let expected: number
611-
expectType<TypeEqual<typeof result, typeof expected>>(true)
615+
// TODO: works with latest postgrest-meta type introspection
616+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
612617
expect(res).toMatchInlineSnapshot(`
613618
Object {
614619
"count": null,
@@ -626,7 +631,8 @@ describe('advanced rpc', () => {
626631
})
627632
let result: Exclude<typeof res.data, null>
628633
let expected: string
629-
expectType<TypeEqual<typeof result, typeof expected>>(true)
634+
// TODO: works with latest postgrest-meta type introspection
635+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
630636
expect(res).toMatchInlineSnapshot(`
631637
Object {
632638
"count": null,
@@ -644,7 +650,8 @@ describe('advanced rpc', () => {
644650
})
645651
let result: Exclude<typeof res.data, null>
646652
let expected: z.infer<typeof UserProfileSchema>[]
647-
expectType<TypeEqual<typeof result, typeof expected>>(true)
653+
// TODO: works with latest postgrest-meta type introspection
654+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
648655
expect(res).toMatchInlineSnapshot(`
649656
Object {
650657
"count": null,
@@ -670,7 +677,8 @@ describe('advanced rpc', () => {
670677
let result: Exclude<typeof res.data, null>
671678
const ExpectedSchema = z.array(MessagesWithoutBlurbSchema)
672679
let expected: RequiredDeep<z.infer<typeof ExpectedSchema>>
673-
expectType<TypeEqual<typeof result, typeof expected>>(true)
680+
// TODO: works with latest postgrest-meta type introspection
681+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
674682
expect(res).toMatchInlineSnapshot(`
675683
Object {
676684
"count": null,
@@ -704,7 +712,8 @@ describe('advanced rpc', () => {
704712
let result: Exclude<typeof res.data, null>
705713
const ExpectedSchema = z.array(MessagesWithoutBlurbSchema)
706714
let expected: RequiredDeep<z.infer<typeof ExpectedSchema>>
707-
expectType<TypeEqual<typeof result, typeof expected>>(true)
715+
// TODO: works with latest postgrest-meta type introspection
716+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
708717
expect(res).toMatchInlineSnapshot(`
709718
Object {
710719
"count": null,
@@ -752,7 +761,8 @@ describe('advanced rpc', () => {
752761
})
753762
let result: Exclude<typeof res.data, null>
754763
let expected: string
755-
expectType<TypeEqual<typeof result, typeof expected>>(true)
764+
// TODO: works with latest postgrest-meta type introspection
765+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
756766
expect(res).toMatchInlineSnapshot(`
757767
Object {
758768
"count": null,
@@ -766,9 +776,12 @@ describe('advanced rpc', () => {
766776

767777
test('polymorphic function with bool param', async () => {
768778
const res = await postgrest.rpc('polymorphic_function_with_different_return', {
769-
// @ts-expect-error Type 'boolean' is not assignable to type 'string'
779+
// TODO: works with latest postgrest-meta type introspection
780+
////@ts-expect-error Type 'boolean' is not assignable to type 'string'
770781
'': true,
771782
})
783+
// TODO: works with latest postgrest-meta type introspection
784+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
772785
expect(res).toMatchInlineSnapshot(`
773786
Object {
774787
"count": null,
@@ -782,7 +795,8 @@ describe('advanced rpc', () => {
782795

783796
test('polymorphic function with unnamed int param', async () => {
784797
const res = await postgrest.rpc(
785-
// @ts-expect-error Argument of type '"polymorphic_function_with_unnamed_integer"' is not assignable to parameter of type '"blurb_message" | "function_returning_row" | "function_returning_set_of_rows"
798+
// TODO: works with latest postgrest-meta type introspection
799+
////@ts-expect-error Argument of type '"polymorphic_function_with_unnamed_integer"' is not assignable to parameter of type '"blurb_message" | "function_returning_row" | "function_returning_set_of_rows"
786800
'polymorphic_function_with_unnamed_integer',
787801
{
788802
'': 1,
@@ -880,7 +894,8 @@ describe('advanced rpc', () => {
880894
})
881895
let result: Exclude<typeof res.data, null>
882896
let expected: string
883-
expectType<TypeEqual<typeof result, typeof expected>>(true)
897+
// TODO: works with latest postgrest-meta type introspection
898+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
884899
expect(res).toMatchInlineSnapshot(`
885900
Object {
886901
"count": null,
@@ -898,7 +913,8 @@ describe('advanced rpc', () => {
898913
})
899914
let result: Exclude<typeof res.data, null>
900915
let expected: string
901-
expectType<TypeEqual<typeof result, typeof expected>>(true)
916+
// TODO: works with latest postgrest-meta type introspection
917+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
902918
expect(res).toMatchInlineSnapshot(`
903919
Object {
904920
"count": null,
@@ -914,7 +930,8 @@ describe('advanced rpc', () => {
914930
const res = await postgrest.rpc('polymorphic_function_with_unnamed_default')
915931
let result: Exclude<typeof res.data, null>
916932
let expected: SelectQueryError<'Could not choose the best candidate function between: public.polymorphic_function_with_unnamed_default(), public.polymorphic_function_with_unnamed_default( => text). Try renaming the parameters or the function itself in the database so function overloading can be resolved'>
917-
expectType<TypeEqual<typeof result, typeof expected>>(true)
933+
// TODO: works with latest postgrest-meta type introspection
934+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
918935
expect(res).toMatchInlineSnapshot(`
919936
Object {
920937
"count": null,
@@ -960,7 +977,8 @@ describe('advanced rpc', () => {
960977
})
961978
let result: Exclude<typeof res.data, null>
962979
let expected: string
963-
expectType<TypeEqual<typeof result, typeof expected>>(true)
980+
// TODO: works with latest postgrest-meta type introspection
981+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
964982
expect(res).toMatchInlineSnapshot(`
965983
Object {
966984
"count": null,
@@ -976,7 +994,8 @@ describe('advanced rpc', () => {
976994
const res = await postgrest.rpc('polymorphic_function_with_unnamed_default_overload')
977995
let result: Exclude<typeof res.data, null>
978996
let expected: SelectQueryError<'Could not choose the best candidate function between: public.polymorphic_function_with_unnamed_default_overload(), public.polymorphic_function_with_unnamed_default_overload( => text). Try renaming the parameters or the function itself in the database so function overloading can be resolved'>
979-
expectType<TypeEqual<typeof result, typeof expected>>(true)
997+
// TODO: works with latest postgrest-meta type introspection
998+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
980999
expect(res).toMatchInlineSnapshot(`
9811000
Object {
9821001
"count": null,
@@ -1022,7 +1041,8 @@ describe('advanced rpc', () => {
10221041
})
10231042
let result: Exclude<typeof res.data, null>
10241043
let expected: string
1025-
expectType<TypeEqual<typeof result, typeof expected>>(true)
1044+
// TODO: works with latest postgrest-meta type introspection
1045+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
10261046
expect(res).toMatchInlineSnapshot(`
10271047
Object {
10281048
"count": null,
@@ -1036,12 +1056,14 @@ describe('advanced rpc', () => {
10361056

10371057
test('polymorphic function with unnamed default overload bool param', async () => {
10381058
const res = await postgrest.rpc('polymorphic_function_with_unnamed_default_overload', {
1039-
//@ts-expect-error Type 'boolean' is not assignable to type 'string'
1059+
// TODO: works with latest postgrest-meta type introspection
1060+
////@ts-expect-error Type 'boolean' is not assignable to type 'string'
10401061
'': true,
10411062
})
10421063
let result: Exclude<typeof res.data, null>
10431064
let expected: string
1044-
expectType<TypeEqual<typeof result, typeof expected>>(true)
1065+
// TODO: works with latest postgrest-meta type introspection
1066+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
10451067
expect(res).toMatchInlineSnapshot(`
10461068
Object {
10471069
"count": null,
@@ -1057,7 +1079,8 @@ describe('advanced rpc', () => {
10571079
const res = await postgrest.rpc('blurb_message')
10581080
let result: Exclude<typeof res.data, null>
10591081
let expected: never
1060-
expectType<TypeEqual<typeof result, typeof expected>>(true)
1082+
// TODO: works with latest postgrest-meta type introspection
1083+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
10611084
expect(res).toMatchInlineSnapshot(`
10621085
Object {
10631086
"count": null,
@@ -1087,7 +1110,8 @@ describe('advanced rpc', () => {
10871110
})
10881111
let result: Exclude<typeof res.data, null>
10891112
let expected: SelectQueryError<'the function public.blurb_message with parameter or with a single unnamed json/jsonb parameter, but no matches were found in the schema cache'>
1090-
expectType<TypeEqual<typeof result, typeof expected>>(true)
1113+
// TODO: works with latest postgrest-meta type introspection
1114+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
10911115
expect(res).toMatchInlineSnapshot(`
10921116
Object {
10931117
"count": null,
@@ -1350,6 +1374,7 @@ test('RPC call with subselect and computed field', async () => {
13501374
})
13511375
)
13521376
let expected: z.infer<typeof ExpectedSchema>
1353-
expectType<TypeEqual<typeof result, typeof expected>>(true)
1377+
// TODO: works with latest postgrest-meta type introspection
1378+
// expectType<TypeEqual<typeof result, typeof expected>>(true)
13541379
ExpectedSchema.parse(res.data)
13551380
})

‎packages/core/postgrest-js/test/db/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ services:
4141
POSTGRES_HOST: /var/run/postgresql
4242
POSTGRES_PORT: 5432
4343
pgmeta:
44-
image: supabase/postgres-meta:canary-pr-971-12217b2b59b6eeddbb65949ddb257e17fec56393
44+
image: supabase/postgres-meta:v0.91.5
4545
ports:
4646
- '8080:8080'
4747
environment:

0 commit comments

Comments
 (0)