feat(client): aggregate runtime

prisma · Jul 3, 2020 · fdd0b20 · fdd0b20
1 parent 3d5e41a
commit fdd0b20
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 29 deletions.
diff --git a/src/packages/client/fixtures/blog/main.ts b/src/packages/client/fixtures/blog/main.ts
@@ -5,21 +5,23 @@ const prisma = new PrismaClient({
 })
 
 async function main() {
-  const result = await prisma.user.aggregate({
-    avg: {
-      age: true,
-      blub: true,
-    },
-    sum: {
-      age: true,
-    },
-    min: {
-      age: true,
-    },
-    max: {
-      age: true,
-    },
-    count: true,
+  // 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,
   })
   console.log(result)
   prisma.disconnect()

diff --git a/src/packages/client/src/__tests__/json-dmmf.test.ts b/src/packages/client/src/__tests__/json-dmmf.test.ts
@@ -127,7 +127,6 @@ test('JsonFilter should contain equals and not', async () => {
             "name": "id",
           },
         ],
-        "isOneOf": true,
         "name": "UserWhereUniqueInput",
       },
       Object {
@@ -157,7 +156,6 @@ test('JsonFilter should contain equals and not', async () => {
             "name": "field",
           },
         ],
-        "isOneOf": false,
         "name": "UserCreateInput",
       },
       Object {
@@ -187,7 +185,6 @@ test('JsonFilter should contain equals and not', async () => {
             "name": "field",
           },
         ],
-        "isOneOf": false,
         "name": "UserUpdateInput",
       },
       Object {
@@ -217,7 +214,6 @@ test('JsonFilter should contain equals and not', async () => {
             "name": "field",
           },
         ],
-        "isOneOf": false,
         "name": "UserUpdateManyMutationInput",
       },
       Object {

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
@@ -104,6 +104,9 @@ module.exports = async () => {
 
   await prisma.user.findMany()
   prisma.disconnect()
+
+  // flakyness :shrug:
+  await new Promise((r) => setTimeout(r, 200))
   assert(requests.length === 2)
 
   const count = await prisma.user.count()

diff --git a/src/packages/client/src/__tests__/runtime-tests/blog/schema.prisma b/src/packages/client/src/__tests__/runtime-tests/blog/schema.prisma
@@ -5,7 +5,8 @@ datasource db {
 }
 
 generator client {
-  provider = "prisma-client-js"
+  provider             = "prisma-client-js"
+  experimentalFeatures = ["aggregations"]
 }
 
 // / User model comment
@@ -26,4 +27,4 @@ model Post {
   content   String?
   authorId  String?
   author    User?    @relation(fields: [authorId], references: [id])
-}
+}
diff --git a/src/packages/client/src/__tests__/runtime-tests/runtime.test.ts b/src/packages/client/src/__tests__/runtime-tests/runtime.test.ts
@@ -9,8 +9,6 @@ const del = promisify(rimraf)
 
 jest.setTimeout(35000)
 
-// TODO: Figure out the problem with debug
-
 process.setMaxListeners(100)
 
 let subDirs = getSubDirs(__dirname)
@@ -23,7 +21,7 @@ if (
 ) {
   const dirsLeft = subDirs.filter((dir) => dir.includes(folderFilter))
   if (dirsLeft.length > 0) {
-    subDirs = dirsLeft
+    subDirs = [dirsLeft[0]] // only take the first matchh
     console.log(
       `As ${folderFilter} is provided, only ${subDirs.join(
         ', ',

diff --git a/src/packages/client/src/runtime/query.ts b/src/packages/client/src/runtime/query.ts
@@ -138,8 +138,6 @@ ${indent(this.children.map(String).join('\n'), tab)}
         const fieldType = fieldError.error.field.outputType
           .type as DMMF.OutputType
 
-        console.log(fieldError)
-
         fieldType.fields
           .filter((field) =>
             fieldError.error.type === 'emptyInclude'
@@ -240,6 +238,7 @@ ${fieldErrors
         callsite,
         originalMethod: originalMethod || queryName,
         showColors: errorFormat && errorFormat === 'pretty',
+        isValidationError: true,
       })
 
       let printJsonArgs: PrintJsonWithErrorsArgs = {

diff --git a/src/packages/client/src/runtime/utils/printStack.ts b/src/packages/client/src/runtime/utils/printStack.ts
@@ -16,10 +16,11 @@ function renderN(n: number, max: number): string {
 export interface ErrorArgs {
   callsite?: string
   originalMethod: string
-  onUs?: boolean // is this on us?
+  onUs?: boolean // is this on us or is it a user error?
   showColors?: boolean
   renderPathRelative?: boolean
   printFullStack?: boolean
+  isValidationError?: boolean
 }
 
 export interface PrintStackResult {
@@ -36,6 +37,7 @@ export const printStack = ({
   showColors,
   renderPathRelative,
   printFullStack,
+  isValidationError,
 }: ErrorArgs): PrintStackResult => {
   const lastErrorHeight = 20
   let callsiteStr = ':'
@@ -133,7 +135,7 @@ export const printStack = ({
                     : chalk.dim('  ' + l),
                 )
                 .join('\n')
-            if (!match) {
+            if (!match && !isValidationError) {
               prevLines += '\n\n'
             }
             afterLines = ')'

diff --git a/src/packages/sdk/package.json b/src/packages/sdk/package.json
@@ -20,7 +20,7 @@
     "scripts"
   ],
   "prisma": {
-    "version": "ea035543e59571161e00ccd4063f5638283bfba7"
+    "version": "cbf44d96ec1c1a6584e0a1be9463b8bf65d12b0d"
   },
   "devDependencies": {
     "@types/jest": "25.2.3",