Merge pull request #1331 from jgnieuwhof/refresh-prisma-delegate

Keep Prisma delegate in-sync with client cache
hayes · Nov 1, 2024 · 2529fc2 · 2529fc2
2 parents 7a4fa4c + 52a70e9
commit 2529fc2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/.changeset/nice-fishes-switch.md b/.changeset/nice-fishes-switch.md
@@ -0,0 +1,6 @@
+---
+"@pothos/plugin-drizzle": patch
+"@pothos/plugin-prisma": patch
+---
+
+Load client when db request is initialized rather than caching on model loader
diff --git a/packages/plugin-drizzle/src/model-loader.ts b/packages/plugin-drizzle/src/model-loader.ts
@@ -36,7 +36,6 @@ export class ModelLoader {
   table: TableRelationalConfig;
   columns: Column[];
   selectSQL;
-  client: DrizzleClient;
 
   constructor(
     context: object,
@@ -54,8 +53,6 @@ export class ModelLoader {
       this.columns.length > 1
         ? sql`(${sql.join(this.columns, sql`, `)})`
         : this.columns[0].getSQL();
-
-    this.client = getClient(builder, context);
   }
 
   static forModel<Types extends SchemaTypes>(
@@ -166,11 +163,12 @@ export class ModelLoader {
     this.staged.add(entry);
 
     const nextTick = createResolvablePromise<void>();
+    const client = getClient(this.builder, this.context);
 
     nextTick.promise
       .then(() => {
         const api = (
-          this.client.query as Record<
+          client.query as Record<
             string,
             { findMany: (...args: unknown[]) => Promise<Record<string, unknown>[]> }
           >

diff --git a/packages/plugin-prisma/src/model-loader.ts b/packages/plugin-prisma/src/model-loader.ts
@@ -39,8 +39,6 @@ export class ModelLoader {
     models: Map<object, ResolvablePromise<Record<string, unknown> | null>>;
   }>();
 
-  delegate: PrismaDelegate;
-
   tick = Promise.resolve();
 
   constructor(
@@ -53,10 +51,6 @@ export class ModelLoader {
     this.builder = builder;
     this.findUnique = findUnique;
     this.modelName = modelName;
-    this.delegate = getDelegateFromModel(
-      getClient(this.builder, this.context as never),
-      this.modelName,
-    );
   }
 
   static forRef<Types extends SchemaTypes>(
@@ -285,6 +279,11 @@ export class ModelLoader {
   }
 
   async initLoad(state: SelectionState, initialModel: {}) {
+    const delegate = getDelegateFromModel(
+      getClient(this.builder, this.context as never),
+      this.modelName,
+    );
+
     const models = new Map<object, ResolvablePromise<Record<string, unknown> | null>>();
 
     const promise = createResolvablePromise<Record<string, unknown> | null>();
@@ -302,15 +301,15 @@ export class ModelLoader {
       this.staged.delete(entry);
 
       for (const [model, { resolve, reject }] of entry.models) {
-        if (this.delegate.findUniqueOrThrow) {
-          this.delegate
+        if (delegate.findUniqueOrThrow) {
+          delegate
             .findUniqueOrThrow({
               ...selectionToQuery(state),
               where: { ...(this.findUnique(model as Record<string, unknown>, this.context) as {}) },
             } as never)
             .then(resolve as () => {}, reject);
         } else {
-          this.delegate
+          delegate
             .findUnique({
               rejectOnNotFound: true,
               ...selectionToQuery(state),