prisma · ankur-arch · Jul 31, 2024 · Aug 1, 2024 · Aug 1, 2024 · Aug 1, 2024
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,6 +6,7 @@
   },
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "spellright.language": ["en"],
-  "spellright.documentTypes": ["markdown", "typescript", "typescriptreact"],
-  "tailwindCSS.experimental.classRegex": [["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]]
+  "spellright.documentTypes": ["markdown"],
+  "tailwindCSS.experimental.classRegex": [["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]],
+  "prisma.fileWatcher": false
 }
diff --git a/.yarn/releases/yarn-4.3.1.cjs b/.yarn/releases/yarn-4.3.1.cjs
diff --git a/apps/web/test/lib/checkDurationLimits.test.ts b/apps/web/test/lib/checkDurationLimits.test.ts
@@ -1,4 +1,4 @@
-import prismaMock from "../../../../tests/libs/__mocks__/prismaMock";
+import prisma from "../../../../tests/libs/__mocks__/prismaMock";
 
 import { describe, expect, it } from "vitest";
 
@@ -19,19 +19,19 @@ const MOCK_DATA: MockData = {
 // Path: apps/web/test/lib/checkDurationLimits.ts
 describe("Check Duration Limits Tests", () => {
   it("Should return no errors if limit is not reached", async () => {
-    prismaMock.$queryRaw.mockResolvedValue([{ totalMinutes: 0 }]);
+    prisma.$queryRawTyped.mockResolvedValue([{ totalMinutes: 0 }]);
     await expect(
       checkDurationLimits({ PER_DAY: 60 }, MOCK_DATA.startDate, MOCK_DATA.id)
     ).resolves.toBeTruthy();
   });
   it("Should throw an error if limit is reached", async () => {
-    prismaMock.$queryRaw.mockResolvedValue([{ totalMinutes: 60 }]);
+    prisma.$queryRawTyped.mockResolvedValue([{ totalMinutes: 60 }]);
     await expect(
       checkDurationLimits({ PER_DAY: 60 }, MOCK_DATA.startDate, MOCK_DATA.id)
     ).rejects.toThrowError();
   });
   it("Should pass with multiple duration limits", async () => {
-    prismaMock.$queryRaw.mockResolvedValue([{ totalMinutes: 30 }]);
+    prisma.$queryRawTyped.mockResolvedValue([{ totalMinutes: 30 }]);
     await expect(
       checkDurationLimits(
         {
@@ -44,7 +44,7 @@ describe("Check Duration Limits Tests", () => {
     ).resolves.toBeTruthy();
   });
   it("Should pass with multiple duration limits with one undefined", async () => {
-    prismaMock.$queryRaw.mockResolvedValue([{ totalMinutes: 30 }]);
+    prisma.$queryRawTyped.mockResolvedValue([{ totalMinutes: 30 }]);
     await expect(
       checkDurationLimits(
         {
@@ -57,7 +57,7 @@ describe("Check Duration Limits Tests", () => {
     ).resolves.toBeTruthy();
   });
   it("Should return no errors if limit is not reached with multiple bookings", async () => {
-    prismaMock.$queryRaw.mockResolvedValue([{ totalMinutes: 60 }]);
+    prisma.$queryRawTyped.mockResolvedValue([{ totalMinutes: 60 }]);
     await expect(
       checkDurationLimits(
         {
@@ -70,7 +70,7 @@ describe("Check Duration Limits Tests", () => {
     ).resolves.toBeTruthy();
   });
   it("Should throw an error if one of the limit is reached with multiple bookings", async () => {
-    prismaMock.$queryRaw.mockResolvedValue([{ totalMinutes: 90 }]);
+    prisma.$queryRawTyped.mockResolvedValue([{ totalMinutes: 90 }]);
     await expect(
       checkDurationLimits(
         {
@@ -87,7 +87,7 @@ describe("Check Duration Limits Tests", () => {
 // Path: apps/web/test/lib/checkDurationLimits.ts
 describe("Check Duration Limit Tests", () => {
   it("Should return no busyTimes and no error if limit is not reached", async () => {
-    prismaMock.$queryRaw.mockResolvedValue([{ totalMinutes: 60 }]);
+    prisma.$queryRawTyped.mockResolvedValue([{ totalMinutes: 60 }]);
     await expect(
       checkDurationLimit({
         key: "PER_DAY",

diff --git a/example-apps/credential-sync/package.json b/example-apps/credential-sync/package.json
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@calcom/atoms": "*",
-    "@prisma/client": "5.4.2",
+    "@prisma/client": "5.18.0-integration-feat-typed-sql.1",
     "next": "14.0.4",
-    "prisma": "^5.7.1",
+    "prisma": "^5.18.0-integration-feat-typed-sql.1",
     "react": "^18",
     "react-dom": "^18"
   },

diff --git a/packages/features/bookings/lib/handleNewBooking/test/booking-limits.test.ts b/packages/features/bookings/lib/handleNewBooking/test/booking-limits.test.ts
@@ -5,7 +5,7 @@
  * see: https://github.com/calcom/cal.com/pull/10480
  *      https://github.com/calcom/cal.com/pull/10968
  */
-import prismock from "../../../../../../tests/libs/__mocks__/prisma";
+import prisma from "../../../../../../tests/libs/__mocks__/prismaMock";
 
 import {
   TestData,
@@ -244,7 +244,7 @@ describe("handleNewBooking", () => {
             body: mockBookingData,
           });
 
-          vi.spyOn(prismock, "$queryRaw").mockResolvedValue([{ totalMinutes: yearlyDurationLimit }]);
+          vi.spyOn(prisma, "$queryRawTyped").mockResolvedValue([{ totalMinutes: yearlyDurationLimit }]);
 
           await expect(async () => await handleNewBooking(req)).rejects.toThrowError(
             "duration_limit_reached"
@@ -270,7 +270,7 @@ describe("handleNewBooking", () => {
             body: mockBookingDataFollowingYear,
           });
 
-          vi.spyOn(prismock, "$queryRaw").mockResolvedValue([{ totalMinutes: 0 }]);
+          vi.spyOn(prisma, "$queryRawTyped").mockResolvedValue([{ totalMinutes: 0 }]);
 
           const createdBooking = await handleNewBooking(reqFollowingYear);
 

diff --git a/packages/lib/apps/getInstallCountPerApp.ts b/packages/lib/apps/getInstallCountPerApp.ts
@@ -1,23 +1,8 @@
-import { z } from "zod";
-
-import prisma from "@calcom/prisma";
+import prisma, { SQL } from "@calcom/prisma";
 
 const getInstallCountPerApp = async () => {
-  const mostPopularApps = z.array(z.object({ appId: z.string(), installCount: z.number() })).parse(
-    await prisma.$queryRaw`
-    SELECT
-      c."appId",
-      COUNT(*)::integer AS "installCount"
-    FROM
-      "Credential" c
-    WHERE
-      c."appId" IS NOT NULL
-    GROUP BY
-      c."appId"
-    ORDER BY
-      "installCount" DESC
-    `
-  );
+  const mostPopularApps = await prisma.$queryRawTyped(SQL.queryForMostPopularApps());
+
   return mostPopularApps.reduce((acc, { appId, installCount }) => {
     acc[appId] = installCount;
     return acc;

diff --git a/packages/lib/server/queries/booking/index.ts b/packages/lib/server/queries/booking/index.ts
@@ -1,4 +1,4 @@
-import prisma from "@calcom/prisma";
+import prisma, { SQL } from "@calcom/prisma";
 
 export const getTotalBookingDuration = async ({
   eventId,
@@ -11,14 +11,9 @@ export const getTotalBookingDuration = async ({
 }) => {
   // Aggregates the total booking time for a given event in a given time period
   // FIXME: bookings that overlap on one side will never be counted
-  const [totalBookingTime] = await prisma.$queryRaw<[{ totalMinutes: number | null }]>`
-    SELECT SUM(EXTRACT(EPOCH FROM ("endTime" - "startTime")) / 60) as "totalMinutes"
-    FROM "Booking"
-    WHERE "status" = 'accepted'
-      AND "eventTypeId" = ${eventId}
-      AND "startTime" >= ${startDate}
-      AND "endTime" <= ${endDate};
-  `;
+  const [totalBookingTime] = await prisma.$queryRawTyped(
+    SQL.queryForTotalBookingTime(eventId, startDate, endDate)
+  );
 
   return totalBookingTime.totalMinutes ?? 0;
 };
diff --git a/packages/platform/examples/base/package.json b/packages/platform/examples/base/package.json
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@calcom/atoms": "*",
-    "@prisma/client": "5.4.2",
+    "@prisma/client": "5.19.0",
     "next": "14.0.4",
-    "prisma": "^5.7.1",
+    "prisma": "5.19.0",
     "react": "^18",
     "react-dom": "^18",
     "react-select": "^5.8.0"

diff --git a/packages/platform/examples/base/prisma/schema.prisma b/packages/platform/examples/base/prisma/schema.prisma
@@ -23,4 +23,4 @@ model User {
   createdAt DateTime @default(now())
   updatedAt DateTime @default(now())
 
-}
+}
diff --git a/packages/prisma/index.ts b/packages/prisma/index.ts
@@ -2,11 +2,24 @@ import type { Prisma } from "@prisma/client";
 import { PrismaClient as PrismaClientWithoutExtension } from "@prisma/client";
 import { withAccelerate } from "@prisma/extension-accelerate";
 
+import {
+  queryForMostPopularApps,
+  queryForTotalBookingTime,
+  queryForTotalMembers,
+  queryHealthCheck,
+} from "../../node_modules/.prisma/client/sql";
 import { bookingIdempotencyKeyExtension } from "./extensions/booking-idempotency-key";
 import { excludePendingPaymentsExtension } from "./extensions/exclude-pending-payment-teams";
 import { usageTrackingExtention } from "./extensions/usage-tracking";
 import { bookingReferenceMiddleware } from "./middleware";
 
+export const SQL = {
+  queryForMostPopularApps,
+  queryForTotalBookingTime,
+  queryForTotalMembers,
+  queryHealthCheck,
+};
+
 const prismaOptions: Prisma.PrismaClientOptions = {};
 
 const globalForPrisma = global as unknown as {

diff --git a/packages/prisma/is-prisma-available-check.ts b/packages/prisma/is-prisma-available-check.ts
@@ -1,10 +1,10 @@
 import { Prisma } from "@prisma/client";
 
-import prisma from ".";
+import prisma, { SQL } from "@calcom/prisma";
 
 export async function isPrismaAvailableCheck() {
   try {
-    await prisma.$queryRaw`SELECT 1`;
+    await prisma.$queryRawTyped(SQL.queryHealthCheck());
     return true;
   } catch (e: unknown) {
     if (e instanceof Prisma.PrismaClientInitializationError) {

diff --git a/packages/prisma/package.json b/packages/prisma/package.json
@@ -14,7 +14,7 @@
     "db-studio": "yarn prisma studio",
     "db-up": "docker compose up -d || docker-compose up -d",
     "dx": "yarn db-setup",
-    "generate-schemas": "prisma generate && prisma format",
+    "generate-schemas": "prisma generate --sql && prisma format",
     "post-install": "yarn generate-schemas",
     "seed-app-store": "ts-node --transpile-only ./seed-app-store.ts",
     "delete-app": "ts-node --transpile-only ./delete-app.ts",
@@ -25,15 +25,20 @@
   },
   "dependencies": {
     "@calcom/lib": "*",
-    "@prisma/client": "^5.4.2",
+    "@prisma/client": "5.19.0",
     "@prisma/extension-accelerate": "^0.6.2",
-    "@prisma/generator-helper": "^5.4.2",
-    "prisma": "^5.4.2",
+    "@prisma/generator-helper": "5.19.0",
+    "prisma": "5.19.0",
     "prisma-kysely": "^1.7.1",
     "ts-node": "^10.9.1",
     "zod": "^3.22.4",
     "zod-prisma": "^0.5.4"
   },
+  "overrides": {
+    "@prisma/client": "5.19.0",
+    "@prisma/generator-helper": "5.19.0",
+    "prisma": "5.19.0"
+  },
   "main": "index.ts",
   "types": "index.d.ts",
   "files": [

diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
@@ -9,7 +9,7 @@ datasource db {
 
 generator client {
   provider        = "prisma-client-js"
-  previewFeatures = ["views"]
+  previewFeatures = ["views", "typedSql"]
 }
 
 generator zod {

diff --git a/packages/prisma/sql/queryForMostPopularApps.sql b/packages/prisma/sql/queryForMostPopularApps.sql
@@ -0,0 +1,11 @@
+SELECT
+      c."appId",
+      COUNT(*)::integer AS "installCount"
+    FROM
+      "Credential" c
+    WHERE
+      c."appId" IS NOT NULL
+    GROUP BY
+      c."appId"
+    ORDER BY
+      "installCount" DESC;
diff --git a/packages/prisma/sql/queryForTotalBookingTime.sql b/packages/prisma/sql/queryForTotalBookingTime.sql
@@ -0,0 +1,9 @@
+SELECT
+  SUM(EXTRACT(EPOCH FROM ("endTime" - "startTime")) / 60) AS "totalMinutes"
+FROM
+  "Booking"
+WHERE
+  "status" = 'accepted'
+  AND "eventTypeId" = $1
+  AND "startTime" >= $2
+  AND "endTime" <= $3;
diff --git a/packages/prisma/sql/queryForTotalMembers.sql b/packages/prisma/sql/queryForTotalMembers.sql
@@ -0,0 +1,3 @@
+SELECT COUNT(DISTINCT "userId")::integer
+FROM "Membership"
+WHERE "teamId" = ANY($1::int[])
diff --git a/packages/prisma/sql/queryHealthCheck.sql b/packages/prisma/sql/queryHealthCheck.sql
@@ -0,0 +1 @@
+select 1 as one;
diff --git a/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts b/packages/trpc/server/routers/viewer/availability/team/listTeamAvailability.handler.ts
@@ -1,11 +1,9 @@
-import { Prisma } from "@prisma/client";
-
 import type { Dayjs } from "@calcom/dayjs";
 import dayjs from "@calcom/dayjs";
 import type { DateRange } from "@calcom/lib/date-ranges";
 import { buildDateRanges } from "@calcom/lib/date-ranges";
 import { UserRepository } from "@calcom/lib/server/repository/user";
-import { prisma } from "@calcom/prisma";
+import prisma, { SQL } from "@calcom/prisma";
 
 import { TRPCError } from "@trpc/server";
 
@@ -156,11 +154,7 @@ async function getInfoForAllTeams({ ctx, input }: GetOptions) {
 
   // Get total team count across all teams the user is in (for pagination)
 
-  const totalTeamMembers = await prisma.$queryRaw<
-    {
-      count: number;
-    }[]
-  >`SELECT COUNT(DISTINCT "userId")::integer from "Membership" WHERE "teamId" IN (${Prisma.join(teamIds)})`;
+  const totalTeamMembers = await prisma.$queryRawTyped(SQL.queryForTotalMembers(teamIds));
 
   return {
     teamMembers,

diff --git a/turbo.json b/turbo.json
@@ -143,8 +143,12 @@
     },
     "post-install": {
       "dependsOn": [],
-      "outputs": ["../../node_modules/@prisma/client/**", "../../node_modules/@prisma/admin-client/**"],
-      "inputs": ["./schema.prisma", "./prisma/schema.prisma"],
+      "outputs": [
+        "../../node_modules/@prisma/client/**",
+        "../../node_modules/@prisma/admin-client/**",
+        "../../node_modules/.prisma/client/sql/**"
+      ],
+      "inputs": ["./schema.prisma", "./prisma/schema.prisma", "./prisma/sql"],
       "env": ["PRISMA_GENERATE_DATAPROXY"]
     },
     "@calcom/prisma#post-install": {