feat(client): middlewares

Closes prisma/prisma-client-js#770
prisma · Jul 16, 2020 · 2052d79 · 2052d79
1 parent 31a2cc9
commit 2052d79
Show file tree

Hide file tree

Showing 7 changed files with 227 additions and 316 deletions.
diff --git a/src/packages/client/fixtures/blog/main.ts b/src/packages/client/fixtures/blog/main.ts
@@ -5,45 +5,9 @@ const prisma = new PrismaClient({
 })
 
 async function main() {
-  // const result = await prisma.user.aggregate({
-  //   avg: {
-  //     age3: true,
-  //   },
-  //   sum: {
-  //     age: true,
-  //   },
-  //   min: {
-  //     age: true,
-  //   },
-  //   max: {
-  //     age: true,
-  //   },
-  //   count: true,
-  // })
-  // const result = await prisma.user.count({
-  //   take: 10,
-  // })
-  // const result = await prisma.user.aggregate({
-  //   avg: {
-  //     age: true
-  //   },
-  //   max: {
-  //     age: true
-  //   },
-  //   sum: {
-  //     age: true
-  //   },
-  //   min: {
-  //     age:  true
-  //   },
-  //   count: true
-  // })
-  // result.count
-  // result.avg.age
-  // console.log(result)
   const res = await prisma.user.findMany({
-    distinct: ['age'],
-  })
+    distinct: ['2age'],
+  } as any)
   console.log(res)
   prisma.disconnect()
 }

diff --git a/src/packages/client/src/__tests__/runtime-tests/blog-env-postgresql/index.js b/src/packages/client/src/__tests__/runtime-tests/blog-env-postgresql/index.js
@@ -121,10 +121,6 @@ module.exports = async () => {
   const userPromise = prisma.user.findMany()
   await userPromise
   // @ts-ignore
-  const perfResults = userPromise._collectTimestamps.getResults()
-  if (Object.keys(perfResults).length === 0) {
-    throw Error('measurePerformance is enabled but results object is empty')
-  }
 
   await prisma.disconnect()
 

diff --git a/src/packages/client/src/__tests__/runtime-tests/blog/index.js b/src/packages/client/src/__tests__/runtime-tests/blog/index.js
@@ -15,7 +15,6 @@ module.exports = async () => {
   const db = new PrismaClient({
     errorFormat: 'colorless',
     __internal: {
-      measurePerformance: true,
       hooks: {
         beforeRequest: (request) => requests.push(request),
       },
@@ -53,10 +52,6 @@ module.exports = async () => {
   const userPromise = db.user.findMany()
   await userPromise
   // @ts-ignore
-  const perfResults = userPromise._collectTimestamps.getResults()
-  if (Object.keys(perfResults).length === 0) {
-    throw Error('measurePerformance is enabled but results object is empty')
-  }
 
   await db.disconnect()
 

diff --git a/src/packages/client/src/__tests__/runtime-tests/hooks/index.js b/src/packages/client/src/__tests__/runtime-tests/hooks/index.js
@@ -7,13 +7,13 @@ module.exports = async () => {
   const allResults = []
   const engineResults = []
 
-  db.use('all', async ({ params, fetch }) => {
+  db.use('all', async (params, fetch) => {
     const result = await fetch(params)
     allResults.push(result)
     return result
   })
 
-  db.use('engine', async ({ params, fetch }) => {
+  db.use('engine', async (params, fetch) => {
     const result = await fetch(params)
     engineResults.push(result)
     return result

diff --git a/src/packages/client/src/generation/TSClient.ts b/src/packages/client/src/generation/TSClient.ts
@@ -225,7 +225,7 @@ declare class PrismaClientFetcher {
   private readonly debug;
   private readonly hooks?;
   constructor(prisma: PrismaClient<any, any>, debug?: boolean, hooks?: Hooks | undefined);
-  request<T>(document: any, dataPath?: string[], rootField?: string, typeName?: string, isList?: boolean, callsite?: string, collectTimestamps?: any): Promise<T>;
+  request<T>(document: any, dataPath?: string[], rootField?: string, typeName?: string, isList?: boolean, callsite?: string): Promise<T>;
   sanitizeMessage(message: string): string;
   protected unpack(document: any, data: any, path: string[], rootField?: string, isList?: boolean): any;
 }
@@ -1160,7 +1160,6 @@ export declare class Prisma__${name}Client<T> implements Promise<T> {
   private _isList;
   private _callsite;
   private _requestPromise?;
-  private _collectTimestamps?;
   constructor(_dmmf: DMMFClass, _fetcher: PrismaClientFetcher, _queryType: 'query' | 'mutation', _rootField: string, _clientMethod: string, _args: any, _dataPath: string[], _errorFormat: ErrorFormat, _measurePerformance?: boolean | undefined, _isList?: boolean);
   readonly [Symbol.toStringTag]: 'PrismaClientPromise';
 ${indent(