From 3ff43520eb86ca4f3f30666a21fd46d2883ac8da Mon Sep 17 00:00:00 2001 From: zomars Date: Wed, 20 Jul 2022 13:17:23 -0600 Subject: [PATCH] Bump prisma to v4.1 --- apps/console | 2 +- packages/lib/package.json | 2 +- packages/prisma/package.json | 4 ++-- packages/prisma/schema.prisma | 34 ++++++++++++++++----------------- yarn.lock | 36 +++++++++++++++++------------------ 5 files changed, 38 insertions(+), 40 deletions(-) diff --git a/apps/console b/apps/console index 5127b5be0f..a26db083fa 160000 --- a/apps/console +++ b/apps/console @@ -1 +1 @@ -Subproject commit 5127b5be0ff4c2c4bb1f54839ae87900f56ece2d +Subproject commit a26db083faaa79a40f96dddac888ba2c2bea921e diff --git a/packages/lib/package.json b/packages/lib/package.json index a98a9bf83c..89f2f0e4c2 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@calcom/dayjs": "*", - "@prisma/client": "^4.0.0", + "@prisma/client": "^4.1.0", "bcryptjs": "^2.4.3", "ical.js": "^1.4.0", "ics": "^2.31.0", diff --git a/packages/prisma/package.json b/packages/prisma/package.json index 40292fcf0b..c0fd7502bc 100644 --- a/packages/prisma/package.json +++ b/packages/prisma/package.json @@ -21,14 +21,14 @@ }, "devDependencies": { "npm-run-all": "^4.1.5", - "prisma": "^4.0.0", + "prisma": "^4.1.0", "ts-node": "^10.6.0", "zod": "^3.16.0", "zod-prisma": "^0.5.4" }, "dependencies": { "@calcom/lib": "*", - "@prisma/client": "^4.0.0" + "@prisma/client": "^4.1.0" }, "main": "index.ts", "types": "index.d.ts", diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 2b2cfee779..6e1ea1a6b5 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -19,14 +19,14 @@ generator zod { } enum SchedulingType { - ROUND_ROBIN @map("roundRobin") - COLLECTIVE @map("collective") + ROUND_ROBIN @map("roundRobin") + COLLECTIVE @map("collective") } enum PeriodType { - UNLIMITED @map("unlimited") - ROLLING @map("rolling") - RANGE @map("range") + UNLIMITED @map("unlimited") + ROLLING @map("rolling") + RANGE @map("range") } model EventType { @@ -185,7 +185,6 @@ model User { workflows Workflow[] routingForms App_RoutingForms_Form[] @relation("routing-form") - @@map(name: "users") } @@ -253,10 +252,10 @@ model Attendee { } enum BookingStatus { - CANCELLED @map("cancelled") - ACCEPTED @map("accepted") - REJECTED @map("rejected") - PENDING @map("pending") + CANCELLED @map("cancelled") + ACCEPTED @map("accepted") + REJECTED @map("rejected") + PENDING @map("pending") } model DailyEventReference { @@ -335,10 +334,10 @@ model SelectedCalendar { } enum EventTypeCustomInputType { - TEXT @map("text") - TEXTLONG @map("textLong") - NUMBER @map("number") - BOOL @map("bool") + TEXT @map("text") + TEXTLONG @map("textLong") + NUMBER @map("number") + BOOL @map("bool") } model EventTypeCustomInput { @@ -552,7 +551,6 @@ model WorkflowStep { emailSubject String? template WorkflowTemplates @default(REMINDER) workflowReminders WorkflowReminder[] - } model Workflow { @@ -576,9 +574,9 @@ model WorkflowsOnEventTypes { } enum TimeUnit { - DAY @map("day") - HOUR @map("hour") - MINUTE @map("minute") + DAY @map("day") + HOUR @map("hour") + MINUTE @map("minute") } model WorkflowReminder { diff --git a/yarn.lock b/yarn.lock index c08cd40941..6385afb5ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2560,12 +2560,12 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== -"@prisma/client@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.0.0.tgz#ed2f46930a1da0d8ae88d7965485973576b04270" - integrity sha512-g1h2OGoRo7anBVQ9Cw3gsbjwPtvf7i0pkGxKeZICtwkvE5CZXW+xZF4FZdmrViYkKaAShbISL0teNpu9ecpf4g== +"@prisma/client@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.1.0.tgz#7c5341b2276c083821e432536ff97d8cc8f8b936" + integrity sha512-MvfPGAd42vHTiCYxwS6N+2U3F+ukoJ48D2QRnX1zSPJHBkh1CBtshl75daKzvVfgQwSouzSQeugKDej5di+E/g== dependencies: - "@prisma/engines-version" "3.16.0-49.da41d2bb3406da22087b849f0e911199ba4fbf11" + "@prisma/engines-version" "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8" "@prisma/debug@3.15.2": version "3.15.2" @@ -2585,15 +2585,15 @@ ms "2.1.3" strip-ansi "6.0.1" -"@prisma/engines-version@3.16.0-49.da41d2bb3406da22087b849f0e911199ba4fbf11": - version "3.16.0-49.da41d2bb3406da22087b849f0e911199ba4fbf11" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-3.16.0-49.da41d2bb3406da22087b849f0e911199ba4fbf11.tgz#4b5efe5eee2feef12910e4627a572cd96ed83236" - integrity sha512-PiZhdD624SrYEjyLboI0X7OugNbxUzDJx9v/6ldTKuqNDVUCmRH/Z00XwDi/dgM4FlqOSO+YiUsSiSKjxxG8cw== +"@prisma/engines-version@4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8": + version "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8.tgz#ce00e6377126e491a8b1e0e2039c97e2924bd6d9" + integrity sha512-cRRJwpHFGFJZvtHbY3GZjMffNBEjjZk68ztn+S2hDgPCGB4H66IK26roK94GJxBodSehwRJ0wGyebC2GoIH1JQ== -"@prisma/engines@3.16.0-49.da41d2bb3406da22087b849f0e911199ba4fbf11": - version "3.16.0-49.da41d2bb3406da22087b849f0e911199ba4fbf11" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-3.16.0-49.da41d2bb3406da22087b849f0e911199ba4fbf11.tgz#82f0018153cffa05d61422f9c0c7b0479b180f75" - integrity sha512-u/rG4lDHALolWBLr3yebZ+N2qImp3SDMcu7bHNJuRDaYvYEXy/MqfNRNEgd9GoPsXL3gofYf0VzJf2AmCG3YVw== +"@prisma/engines@4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.1.0.tgz#da8002d4b75c92e3fd564ba5b0bd04847ffb3c4c" + integrity sha512-quqHXD3P83NBLVtRlts4SgKHmqgA8GMiyDTJ7af03Wg0gl6F5t65mBYvIuwmD+52vHm42JtIsp/fAO9YIV0JBA== "@prisma/generator-helper@^3.13.0": version "3.15.2" @@ -13988,12 +13988,12 @@ prisma-field-encryption@^1.4.0-beta.2: object-path "^0.11.8" zod "^3.15.1" -prisma@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.0.0.tgz#4ddb8fcd4f64d33aff8c198a6986dcce66dc8152" - integrity sha512-Dtsar03XpCBkcEb2ooGWO/WcgblDTLzGhPcustbehwlFXuTMliMDRzXsfygsgYwQoZnAUKRd1rhpvBNEUziOVw== +prisma@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.1.0.tgz#5d43597f0f2603a4a75d9586346c74110d8e221f" + integrity sha512-iwqpAT6In1uvMSwQAM3PqmaBdhh2OaQ/2t+n3RjpW4vAKP3R7E1T34FZUU4zGOWtMWm5dt0sPThQkT/h87r6gw== dependencies: - "@prisma/engines" "3.16.0-49.da41d2bb3406da22087b849f0e911199ba4fbf11" + "@prisma/engines" "4.1.0" prismjs@^1.27.0: version "1.28.0"