fix: apply potential dedupe alias on normalized query also on pk filter

.changeset/calm-mirrors-study.md

@@ -0,0 +1,5 @@
+---
+"@supabase-cache-helpers/postgrest-core": patch
+---
+
+fix: apply dedupe aliased to pk filters if there are any

packages/postgrest-core/__tests__/delete-fetcher.spec.ts

@@ -3,6 +3,7 @@ import { createClient, SupabaseClient } from '@supabase/supabase-js';
 import { Database } from './database.types';
 import { buildDeleteFetcher } from '../src/delete-fetcher';
 import './utils';
+import { PostgrestParser } from '../dist';
 
 const TEST_PREFIX = 'postgrest-fetcher-delete-';
 
@@ -139,4 +140,38 @@ describe('delete', () => {
 
     expect(data).toEqual([]);
   });
+
+  it('should use alias if there is one on the pks', async () => {
+    const { data: contact } = await client
+      .from('contact')
+      .insert({ username: `${testRunPrefix}-test`, ticket_number: 1234 })
+      .select('id')
+      .throwOnError()
+      .single();
+    expect(contact?.id).toBeDefined();
+
+    const q = client
+      .from('contact')
+      .select('test:id,username')
+      .eq('test', contact!.id);
+
+    const result = await buildDeleteFetcher(client.from('contact'), ['id'], {
+      query: 'ticket_number',
+      queriesForTable: () => [new PostgrestParser(q)],
+    })([
+      {
+        id: contact?.id,
+      },
+    ]);
+    expect(result).toEqual([
+      {
+        normalizedData: {
+          id: contact?.id,
+          ticket_number: 1234,
+          username: `${testRunPrefix}-test`,
+        },
+        userQueryData: { ticket_number: 1234 },
+      },
+    ]);
+  });
 });

packages/postgrest-core/__tests__/update-fetcher.spec.ts

@@ -3,6 +3,7 @@ import { createClient, SupabaseClient } from '@supabase/supabase-js';
 import { Database } from './database.types';
 import './utils';
 
+import { PostgrestParser } from '../dist';
 import { buildUpdateFetcher } from '../src/update-fetcher';
 
 const TEST_PREFIX = 'postgrest-fetcher-update-';
@@ -79,4 +80,33 @@ describe('update', () => {
       },
     });
   });
+
+  it('should use alias if there is one on the pks', async () => {
+    const q = client
+      .from('contact')
+      .select('test:id,username')
+      .eq('test', contact!.id);
+
+    const updatedContact = await buildUpdateFetcher(
+      client.from('contact'),
+      ['id'],
+      { queriesForTable: () => [new PostgrestParser(q)] },
+    )({
+      id: contact?.id,
+      username: `${testRunPrefix}-username-4`,
+    });
+    expect(updatedContact).toEqual({
+      normalizedData: {
+        id: expect.anything(),
+        username: `${testRunPrefix}-username-4`,
+      },
+    });
+    const { data } = await client
+      .from('contact')
+      .select('*')
+      .eq('id', contact?.id ?? '')
+      .throwOnError()
+      .maybeSingle();
+    expect(data?.username).toEqual(`${testRunPrefix}-username-4`);
+  });
 });

packages/postgrest-core/src/delete-fetcher.ts

@@ -42,10 +42,15 @@ export const buildDeleteFetcher =
   ): Promise<MutationFetcherResponse<R>[] | null> => {
     let filterBuilder = qb.delete(opts);
 
+    const query = buildNormalizedQuery<Q>(opts);
+
+    const pkAlias = (path: string): string =>
+      query?.paths.find((p) => p.path === path)?.alias || path;
+
     if (primaryKeys.length === 1) {
-      const primaryKey = primaryKeys[0];
+      const primaryKey = primaryKeys[0] as string;
       filterBuilder.in(
-        primaryKey as string,
+        pkAlias(primaryKey),
         input.map((i) => {
           const v = i[primaryKey];
           if (!v) {
@@ -68,7 +73,7 @@ export const buildDeleteFetcher =
                     `Missing value for primary key ${c as string}`,
                   );
                 }
-                return `${c as string}.eq.${v}`;
+                return `${pkAlias(c as string)}.eq.${v}`;
               })})`,
           )
           .join(','),
@@ -84,7 +89,6 @@ export const buildDeleteFetcher =
       }, {} as R),
     );
 
-    const query = buildNormalizedQuery<Q>(opts);
     if (query) {
       const { selectQuery, userQueryPaths, paths } = query;
       // make sure that primary keys are included in the select query

packages/postgrest-core/src/update-fetcher.ts

@@ -41,13 +41,19 @@ export const buildUpdateFetcher =
     input: Partial<T['Row']>,
   ): Promise<MutationFetcherResponse<R> | null> => {
     let filterBuilder = qb.update(input as any, opts); // todo fix type;
+
+    const query = buildNormalizedQuery<Q>(opts);
+
+    const pkAlias = (path: string): string =>
+      query?.paths.find((p) => p.path === path)?.alias || path;
+
     for (const key of primaryKeys) {
       const value = input[key];
       if (!value)
         throw new Error(`Missing value for primary key ${String(key)}`);
-      filterBuilder = filterBuilder.eq(key as string, value);
+      filterBuilder = filterBuilder.eq(pkAlias(key as string), value);
     }
-    const query = buildNormalizedQuery<Q>(opts);
+
     if (query) {
       const { selectQuery, userQueryPaths, paths } = query;
       const { data } = await filterBuilder