chore: Upgrade prisma to 6.7.0 #21264

zomars · 2025-05-13T00:32:15Z

What does this PR do?

Upgades Prisma to version 6.7.0.

Most of the changes are only imports:

-import type { Prisma } from "@prisma/client";
+import type { Prisma } from "@calcom/prisma/client";

Some notable changes are:

Patches prismock library to keep unit testing passing with v6
Fixes typings across next-auth files

What do we get from upgrading?

Ability to join queries
Ability to get typed raw sql queries
It opens up the door for data residency with multiple clients
Allows us to to try the new TypeScript first prisma-client generator which should be faster for dev. To be done in a follow up.

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Are there environment variables that should be set?
What are the minimal test data to have?
What is expected (happy path) to have (input and output)?
Any other important info that could help to test that PR

Checklist

I haven't read the contributing guide
My code doesn't follow the style guidelines of this project
I haven't commented my code, particularly in hard-to-understand areas
I haven't checked if my changes generate no new warnings

Summary by mrge

Upgraded Prisma and @prisma/client to version 6.7.0, updated the Prisma schema, and refactored user type usage for better type safety and compatibility.

Dependencies
- Updated all Prisma-related packages to 6.7.0.
Refactors
- Replaced Prisma.UserArgs with Prisma.UserSelect across the codebase.
- Updated user type definitions and related code to match new Prisma patterns.
- Added new types and interfaces for users and team members.
- Updated Prisma schema output path and added primary key constraints.

Signed-off-by: Omar López <zomars@me.com>

vercel · 2025-05-13T00:33:04Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

2 Skipped Deployments

Project	Deployment	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored	Preview		Aug 12, 2025 2:58am
cal-eu	⬜️ Ignored	Preview		Aug 12, 2025 2:58am

cubic-dev-ai

mrge found 2 issues across 20 files. Review them in mrge.io

cubic-dev-ai · 2025-05-13T00:38:36Z

packages/lib/builders/CalendarEvent/builder.ts

-          id: userId,
-        },
-        ...userSelect,
+      return await prisma.user.findUniqueOrThrow({


Unnecessary use of await in return statement.

cubic-dev-ai · 2025-05-13T00:38:36Z

packages/lib/builders/CalendarEvent/builder.ts

@@ -80,7 +102,7 @@
    if (!users.length && this.eventType.userId) {
      const eventTypeUser = await this.getUserById(this.eventType.userId);
      if (!eventTypeUser) {
-        throw new Error("buildUsersFromINnerClass.eventTypeUser.notFound");
+        throw new Error("buildUsersFromInnerClass.eventTypeUser.notFound");


Fixed typo in error message from 'buildUsersFromINnerClass' to 'buildUsersFromInnerClass'.

socket-security · 2025-05-13T04:26:27Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	classnames@2.5.1

View full report

This reverts commit 47d8618.

This reverts commit a1d2e30.

Signed-off-by: Omar López <zomars@me.com>

github-actions · 2025-07-19T00:26:19Z

This PR is being marked as stale due to inactivity.

coderabbitai · 2025-07-19T00:26:25Z

Note

Other AI code review bot(s) detected

CodeRabbit has detected other AI code review bot(s) in this pull request and will avoid duplicating their findings in the review comments. This may lead to a less comprehensive review.

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing Touches

🧪 Generate unit tests

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch upgrade/prisma-6.7.0

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

CodeRabbit Commands (Invoked using PR/Issue comments)

Type @coderabbitai help to get the list of available commands.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Status, Documentation and Community

Visit our Status Page to check the current availability of CodeRabbit.
Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

zomars added 4 commits May 12, 2025 13:41

chore: Upgrade prisma to 6.7.0

6528a24

Build fixes

bee0ec7

type fixes

7ff269b

Signed-off-by: Omar López <zomars@me.com>

Merge branch 'main' into upgrade/prisma-6.7.0

e07eaa8

zomars requested review from a team as code owners May 13, 2025 00:32

github-actions bot added the ❗️ migrations contains migration files label May 13, 2025

keithwillcode added core area: core, team members only foundation labels May 13, 2025

Update schema.prisma

47d8618

dosubot bot added the ⬆️ dependencies Pull requests that update a dependency file label May 13, 2025

cubic-dev-ai bot reviewed May 13, 2025

View reviewed changes

vercel bot had a problem deploying to Preview – dev May 13, 2025 01:02 Failure

vercel bot had a problem deploying to Preview – dev May 13, 2025 01:44 Failure

Patching

a1d2e30

zomars force-pushed the upgrade/prisma-6.7.0 branch from d3c82d2 to a1d2e30 Compare May 13, 2025 04:22

vercel bot had a problem deploying to Preview – dev May 13, 2025 04:28 Failure

zomars added 4 commits May 12, 2025 21:47

Revert "Update schema.prisma"

84d20bd

This reverts commit 47d8618.

Revert "Patching"

a21dc54

This reverts commit a1d2e30.

Merge branch 'main' into upgrade/prisma-6.7.0

2672701

Revert schema changes

a0c9952

Signed-off-by: Omar López <zomars@me.com>

vercel bot had a problem deploying to Preview – dev May 13, 2025 05:40 Failure

zomars added 2 commits May 13, 2025 08:48

WIP

cb32259

Signed-off-by: Omar López <zomars@me.com>

Update getPublicEvent.ts

3d1e9c1

vercel bot had a problem deploying to Preview – dev May 13, 2025 19:34 Failure

emrysal marked this pull request as draft May 13, 2025 21:42

zomars added 2 commits May 13, 2025 18:38

Update imports

c8b852a

Signed-off-by: Omar López <zomars@me.com>

Update gitignore

111a3e3

Signed-off-by: Omar López <zomars@me.com>

vercel bot temporarily deployed to Preview – cal June 27, 2025 12:23 Inactive

vercel bot temporarily deployed to Preview – api June 27, 2025 12:23 Inactive

vercel bot deployed to Preview – dev June 27, 2025 12:45 View deployment

zomars force-pushed the upgrade/prisma-6.7.0 branch from cb7b342 to 41a1ea9 Compare July 3, 2025 01:36

zomars added 2 commits July 2, 2025 18:41

Merge branch 'main' into upgrade/prisma-6.7.0

3cf61c2

Discard changes to docs/api-reference/v2/openapi.json

d3c3022

vercel bot deployed to Preview – dev July 3, 2025 02:25 View deployment

zomars added 2 commits July 2, 2025 19:43

Update vite.config.ts

8da480f

updated platform libraries

418636c

vercel bot temporarily deployed to Preview – api July 3, 2025 03:00 Inactive

vercel bot temporarily deployed to Preview – cal July 3, 2025 03:00 Inactive

vercel bot deployed to Preview – dev July 3, 2025 03:22 View deployment

zomars added 3 commits July 2, 2025 20:53

Update get.handler.test.ts

170e461

Update get.handler.test.ts

9ccf366

Update schema.prisma

838df3e

vercel bot deployed to Preview – dev July 3, 2025 04:39 View deployment

Merge branch 'main' into upgrade/prisma-6.7.0

e589b09

vercel bot deployed to Preview – dev July 3, 2025 05:01 View deployment

Merge branch 'main' into upgrade/prisma-6.7.0

c07bead

vercel bot deployed to Preview – dev July 4, 2025 18:48 View deployment

zomars added 3 commits July 4, 2025 11:55

Discard changes to docs/api-reference/v2/openapi.json

da7667b

Update next-auth-custom-adapter.ts

e812bbf

Update team.ts

84f6fdc

vercel bot deployed to Preview – dev July 4, 2025 19:32 View deployment

github-actions bot added the Stale label Jul 19, 2025

Merge branch 'main' into upgrade/prisma-6.7.0

6f2adca

emrysal removed the Stale label Aug 12, 2025

vercel bot had a problem deploying to Preview – dev August 12, 2025 03:43 Failure

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore: Upgrade prisma to 6.7.0 #21264

chore: Upgrade prisma to 6.7.0 #21264

zomars commented May 13, 2025 •

edited

Loading

Uh oh!

vercel bot commented May 13, 2025 •

edited

Loading

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

cubic-dev-ai bot May 13, 2025

Uh oh!

cubic-dev-ai bot May 13, 2025

Uh oh!

socket-security bot commented May 13, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jul 19, 2025

Uh oh!

coderabbitai bot commented Jul 19, 2025 •

edited

Loading

Other AI code review bot(s) detected

Review skipped

Chat

Support

CodeRabbit Commands (Invoked using PR/Issue comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Status, Documentation and Community

Uh oh!

Uh oh!

chore: Upgrade prisma to 6.7.0 #21264

Are you sure you want to change the base?

chore: Upgrade prisma to 6.7.0 #21264

Conversation

zomars commented May 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Checklist

Summary by mrge

Uh oh!

vercel bot commented May 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot May 13, 2025

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot May 13, 2025

Choose a reason for hiding this comment

Uh oh!

socket-security bot commented May 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jul 19, 2025

Uh oh!

coderabbitai bot commented Jul 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Other AI code review bot(s) detected

Review skipped

Chat

Support

CodeRabbit Commands (Invoked using PR/Issue comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Status, Documentation and Community

Uh oh!

Uh oh!

zomars commented May 13, 2025 •

edited

Loading

vercel bot commented May 13, 2025 •

edited

Loading

socket-security bot commented May 13, 2025 •

edited

Loading

coderabbitai bot commented Jul 19, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)