feat(client): orderBy for composite types (#12004)

.github/workflows/test.yml

@@ -106,7 +106,7 @@ jobs:
   # CLIENT (without types test)
   #
   client:
-    timeout-minutes: 25
+    timeout-minutes: 35
     runs-on: ${{ matrix.os }}
 
     needs: detect_jobs_to_run

packages/cli/package.json

@@ -67,9 +67,9 @@
   "devDependencies": {
     "@prisma/client": "workspace:*",
     "@prisma/debug": "workspace:*",
-    "@prisma/fetch-engine": "3.11.0-11.5b3bbd566d0f91cb9f74187bfdb7c490a6a4e825",
+    "@prisma/fetch-engine": "3.11.0-12.9907684a5845cbb6a7aa712fa21fe75455b9b6f6",
     "@prisma/generator-helper": "workspace:*",
-    "@prisma/get-platform": "3.11.0-11.5b3bbd566d0f91cb9f74187bfdb7c490a6a4e825",
+    "@prisma/get-platform": "3.11.0-12.9907684a5845cbb6a7aa712fa21fe75455b9b6f6",
     "@prisma/migrate": "workspace:*",
     "@prisma/sdk": "workspace:*",
     "@prisma/studio": "0.458.0",
@@ -118,7 +118,7 @@
     "preinstall": "node scripts/preinstall-entry.js"
   },
   "dependencies": {
-    "@prisma/engines": "3.11.0-11.5b3bbd566d0f91cb9f74187bfdb7c490a6a4e825"
+    "@prisma/engines": "3.11.0-12.9907684a5845cbb6a7aa712fa21fe75455b9b6f6"
   },
   "sideEffects": false
 }

packages/client/.gitignore

@@ -5,4 +5,5 @@
 
 pnpm-lock.yaml
 *.tsbuildinfo
+junit.xml
 .DS_Store

packages/client/package.json

@@ -63,10 +63,10 @@
     "@opentelemetry/api": "1.0.3",
     "@prisma/debug": "workspace:*",
     "@prisma/engine-core": "workspace:*",
-    "@prisma/engines": "3.11.0-11.5b3bbd566d0f91cb9f74187bfdb7c490a6a4e825",
-    "@prisma/fetch-engine": "3.11.0-11.5b3bbd566d0f91cb9f74187bfdb7c490a6a4e825",
+    "@prisma/engines": "3.11.0-12.9907684a5845cbb6a7aa712fa21fe75455b9b6f6",
+    "@prisma/fetch-engine": "3.11.0-12.9907684a5845cbb6a7aa712fa21fe75455b9b6f6",
     "@prisma/generator-helper": "workspace:*",
-    "@prisma/get-platform": "3.11.0-11.5b3bbd566d0f91cb9f74187bfdb7c490a6a4e825",
+    "@prisma/get-platform": "3.11.0-12.9907684a5845cbb6a7aa712fa21fe75455b9b6f6",
     "@prisma/migrate": "workspace:*",
     "@prisma/sdk": "workspace:*",
     "@timsuchanek/copy": "1.4.5",
@@ -121,7 +121,7 @@
     }
   },
   "dependencies": {
-    "@prisma/engines-version": "3.11.0-11.5b3bbd566d0f91cb9f74187bfdb7c490a6a4e825"
+    "@prisma/engines-version": "3.11.0-12.9907684a5845cbb6a7aa712fa21fe75455b9b6f6"
   },
   "sideEffects": false
 }

packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentOptionalPropDataA.ts

@@ -0,0 +1,15 @@
+export function commentOptionalPropDataA(id: string) {
+  return {
+    id: id,
+    country: 'France',
+    content: {
+      set: {
+        text: 'Hello World',
+        upvotes: {
+          vote: true,
+          userId: '10',
+        },
+      },
+    },
+  }
+}

packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentOptionalPropDataB.ts

@@ -0,0 +1,19 @@
+export function commentOptionalPropDataB(id: string) {
+  return {
+    id: id,
+    country: 'France',
+    content: {
+      text: 'Goodbye World',
+      upvotes: [
+        {
+          vote: false,
+          userId: '11',
+        },
+        {
+          vote: true,
+          userId: '12',
+        },
+      ],
+    },
+  }
+}

packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentRequiredListDataA.ts

@@ -0,0 +1,15 @@
+export function commentRequiredListDataA(id: string) {
+  return {
+    id: id,
+    country: 'France',
+    contents: {
+      set: {
+        text: 'Hello World',
+        upvotes: {
+          vote: true,
+          userId: '10',
+        },
+      },
+    },
+  }
+}

packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentRequiredListDataB.ts

@@ -0,0 +1,24 @@
+export function commentRequiredListDataB(id: string) {
+  return {
+    id: id,
+    country: 'France',
+    contents: {
+      set: [
+        {
+          text: 'Goodbye World',
+          upvotes: {
+            vote: false,
+            userId: '11',
+          },
+        },
+        {
+          text: 'Hello World',
+          upvotes: {
+            vote: true,
+            userId: '10',
+          },
+        },
+      ],
+    },
+  }
+}

packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentRequiredPropDataA.ts

@@ -0,0 +1,15 @@
+export function commentRequiredPropDataA(id: string) {
+  return {
+    id: id,
+    country: 'France',
+    content: {
+      set: {
+        text: 'Hello World',
+        upvotes: {
+          vote: true,
+          userId: '10',
+        },
+      },
+    },
+  }
+}

packages/client/src/__tests__/integration/happy/composites-mongo/__helpers__/build-data/commentRequiredPropDataB.ts

@@ -0,0 +1,19 @@
+export function commentRequiredPropDataB(id: string) {
+  return {
+    id: id,
+    country: 'France',
+    content: {
+      text: 'Goodbye World',
+      upvotes: [
+        {
+          vote: false,
+          userId: '11',
+        },
+        {
+          vote: true,
+          userId: '12',
+        },
+      ],
+    },
+  }
+}

packages/client/src/__tests__/integration/happy/composites-mongo/aggregate/list.ts

@@ -0,0 +1,61 @@
+import { getTestClient } from '../../../../../utils/getTestClient'
+
+const describeIf = (condition: boolean) => (condition ? describe : describe.skip)
+
+let PrismaClient, prisma
+
+const id = '6ccccccccccccccccccccccc'
+
+/**
+ * Test aggregate operations on list composite fields
+ */
+describeIf(!process.env.TEST_SKIP_MONGODB)('aggregate > list', () => {
+  beforeAll(async () => {
+    PrismaClient = await getTestClient('../')
+    prisma = new PrismaClient()
+  })
+
+  beforeEach(async () => {
+    await prisma.commentRequiredList.deleteMany({ where: { id } })
+    await prisma.commentRequiredList.create({
+      data: {
+        id,
+        country: 'France',
+        contents: {
+          set: {
+            text: 'Hello World',
+            upvotes: {
+              vote: true,
+              userId: '10',
+            },
+          },
+        },
+      },
+    })
+  })
+
+  afterEach(async () => {
+    await prisma.$disconnect()
+  })
+
+  /**
+   * Simple aggregate
+   */
+  test('simple', async () => {
+    const comment = await prisma.commentRequiredList.aggregate({
+      where: { id },
+      orderBy: {
+        contents: {
+          _count: 'asc',
+        },
+      },
+      _count: true,
+    })
+
+    expect(comment).toMatchInlineSnapshot(`
+      Object {
+        _count: 1,
+      }
+    `)
+  })
+})

packages/client/src/__tests__/integration/happy/composites-mongo/aggregate/optional.ts

@@ -0,0 +1,63 @@
+import { getTestClient } from '../../../../../utils/getTestClient'
+
+const describeIf = (condition: boolean) => (condition ? describe : describe.skip)
+
+let PrismaClient, prisma
+
+const id = '4ccccccccccccccccccccccc'
+
+/**
+ * Test aggregate operations on optional composite fields
+ */
+describeIf(!process.env.TEST_SKIP_MONGODB)('aggregate > optional', () => {
+  beforeAll(async () => {
+    PrismaClient = await getTestClient('../')
+    prisma = new PrismaClient()
+  })
+
+  beforeEach(async () => {
+    await prisma.commentOptionalProp.deleteMany({ where: { id } })
+    await prisma.commentOptionalProp.create({
+      data: {
+        id,
+        country: 'France',
+        content: {
+          set: {
+            text: 'Hello World',
+            upvotes: {
+              vote: true,
+              userId: '10',
+            },
+          },
+        },
+      },
+    })
+  })
+
+  afterEach(async () => {
+    await prisma.$disconnect()
+  })
+
+  /**
+   * Simple aggregate
+   */
+  test('aggregate', async () => {
+    const comment = await prisma.commentOptionalProp.aggregate({
+      where: { id },
+      orderBy: {
+        content: {
+          upvotes: {
+            _count: 'desc',
+          },
+        },
+      },
+      _count: true,
+    })
+
+    expect(comment).toMatchInlineSnapshot(`
+      Object {
+        _count: 1,
+      }
+    `)
+  })
+})

packages/client/src/__tests__/integration/happy/composites-mongo/aggregate/required.ts

@@ -0,0 +1,63 @@
+import { getTestClient } from '../../../../../utils/getTestClient'
+
+const describeIf = (condition: boolean) => (condition ? describe : describe.skip)
+
+let PrismaClient, prisma
+
+const id = '5ccccccccccccccccccccccc'
+
+/**
+ * Test aggregate operations on required composite fields
+ */
+describeIf(!process.env.TEST_SKIP_MONGODB)('aggregate > required', () => {
+  beforeAll(async () => {
+    PrismaClient = await getTestClient('../')
+    prisma = new PrismaClient()
+  })
+
+  beforeEach(async () => {
+    await prisma.commentRequiredProp.deleteMany({ where: { id } })
+    await prisma.commentRequiredProp.create({
+      data: {
+        id,
+        country: 'France',
+        content: {
+          set: {
+            text: 'Hello World',
+            upvotes: {
+              vote: true,
+              userId: '10',
+            },
+          },
+        },
+      },
+    })
+  })
+
+  afterEach(async () => {
+    await prisma.$disconnect()
+  })
+
+  /**
+   * Simple aggregate
+   */
+  test('aggregate', async () => {
+    const comment = await prisma.commentRequiredProp.aggregate({
+      where: { id },
+      orderBy: {
+        content: {
+          upvotes: {
+            _count: 'desc',
+          },
+        },
+      },
+      _count: true,
+    })
+
+    expect(comment).toMatchInlineSnapshot(`
+      Object {
+        _count: 1,
+      }
+    `)
+  })
+})