fix: use schema of table when not explicitly set in revalidateTables …

…and revalidateRelations
psteinroe · Jul 13, 2023 · 7b57743 · 7b57743
1 parent e9a18c4
commit 7b57743
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 4 deletions.
diff --git a/.changeset/heavy-phones-grow.md b/.changeset/heavy-phones-grow.md
@@ -0,0 +1,5 @@
+---
+"@supabase-cache-helpers/postgrest-mutate": patch
+---
+
+fix: use schema of table when not explicitly set in revalidateTables and revalidateRelations
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
 
       - uses: supabase/setup-cli@v1
         with:
-          version: latest
+          version: 1.77.4
 
       - name: Start Supabase
         run: supabase start

diff --git a/packages/postgrest-mutate/__tests__/lib/mutate.spec.ts b/packages/postgrest-mutate/__tests__/lib/mutate.spec.ts
@@ -28,6 +28,7 @@ type MockMutateProps = {
   decode: DecodedKey | null;
   input?: ItemType;
   opts?: PostgrestMutatorOpts<ItemType>;
+  schema?: string;
 };
 
 const mockMutate = async ({
@@ -36,12 +37,13 @@ const mockMutate = async ({
   decode,
   opts,
   input = { id: '0', value: 'test', fkey: 'fkey' },
+  schema = 'schema',
 }: MockMutateProps) => {
   const mutateMockFn = jest.fn();
   await mutate(
     {
       input: input as ItemType,
-      schema: 'schema',
+      schema,
       table: 'table',
       type,
       primaryKeys: ['id'],
@@ -323,6 +325,43 @@ describe('mutate', () => {
     expect(mutateMock).toHaveBeenCalledWith('1');
   });
 
+  it('should use same schema as table if none is set on revalidateRelations', async () => {
+    const mutateMock = await mockMutate({
+      type: 'UPSERT',
+      postgrestFilter: {
+        apply: true,
+        applyFilters: true,
+        hasPaths: true,
+
+        hasFiltersOnPaths: true,
+        applyFiltersOnPaths: true,
+      },
+      schema: 'public',
+      decode: {
+        queryKey: 'queryKey',
+        table: 'relation',
+        bodyKey: undefined,
+        count: null,
+        orderByKey: '',
+        isHead: false,
+        schema: 'schema',
+        limit: undefined,
+        offset: undefined,
+      },
+      opts: {
+        revalidateRelations: [
+          {
+            relation: 'relation',
+            fKeyColumn: 'fkey',
+            relationIdColumn: 'id',
+          },
+        ],
+      },
+    });
+    expect(mutateMock).toHaveBeenCalledTimes(1);
+    expect(mutateMock).toHaveBeenCalledWith('1');
+  });
+
   it('should set tables defined in revalidateTables to stale', async () => {
     const mutateMock = await mockMutate({
       type: 'UPSERT',
@@ -352,4 +391,34 @@ describe('mutate', () => {
     expect(mutateMock).toHaveBeenCalledTimes(1);
     expect(mutateMock).toHaveBeenCalledWith('1');
   });
+
+  it('should use same schema as table if none is defined in revalidateTables', async () => {
+    const mutateMock = await mockMutate({
+      type: 'UPSERT',
+      postgrestFilter: {
+        apply: true,
+        applyFilters: true,
+        hasPaths: true,
+        hasFiltersOnPaths: true,
+        applyFiltersOnPaths: true,
+      },
+      schema: 'public',
+      decode: {
+        queryKey: 'queryKey',
+        table: 'relation',
+        bodyKey: undefined,
+        count: null,
+        isHead: false,
+        schema: 'schema',
+        limit: undefined,
+        orderByKey: '',
+        offset: undefined,
+      },
+      opts: {
+        revalidateTables: [{ table: 'relation' }],
+      },
+    });
+    expect(mutateMock).toHaveBeenCalledTimes(1);
+    expect(mutateMock).toHaveBeenCalledWith('1');
+  });
 });
diff --git a/packages/postgrest-mutate/src/lib/mutate.ts b/packages/postgrest-mutate/src/lib/mutate.ts
@@ -122,7 +122,7 @@ export const mutate = async <KeyType, Type extends Record<string, unknown>>(
 
     for (const r of opts?.revalidateRelations ?? []) {
       if (
-        r.schema === key.schema &&
+        (!r.schema || r.schema === key.schema) &&
         r.relation === key.table &&
         getPostgrestFilter(key.queryKey, {
           exclusivePaths: [r.relationIdColumn],
@@ -136,7 +136,7 @@ export const mutate = async <KeyType, Type extends Record<string, unknown>>(
 
     if (
       opts?.revalidateTables?.find(
-        (t) => t.schema === key.schema && t.table === key.table
+        (t) => (!t.schema || t.schema === key.schema) && t.table === key.table
       )
     ) {
       mutations.push(mutate(k));