Update prisma monorepo to v3 (major) (#6490)

keystonejs · Sep 20, 2021 · ca48072 · ca48072
1 parent 0e9994b
commit ca48072
Show file tree

Hide file tree

Showing 39 changed files with 185 additions and 208 deletions.
diff --git a/.changeset/poor-pens-shout.md b/.changeset/poor-pens-shout.md
@@ -0,0 +1,8 @@
+---
+'@keystone-next/keystone': major
+'@keystone-next/prisma-utils': major
+---
+
+Updated Prisma package dependencies to `3.0.2`. See the [Prisma release notes](https://github.com/prisma/prisma/releases/tag/3.0.1) for full details of the changes.
+
+Note that Keystone continues to use the "binary" query engine, rather than the new "node-API" query engine, which is now the Prisma default. We are still performing tests to ensure that the node-API query engine will work well with Keystone.
diff --git a/.changeset/small-teachers-remain.md b/.changeset/small-teachers-remain.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': major
+---
+
+Removed `filters.postgresql.Json` export from `@keystone-next/keystone/types`. Note this is unrelated to the `json` field type. The `json` field type did not have filters and still does not.
diff --git a/examples-staging/assets-cloud/schema.prisma b/examples-staging/assets-cloud/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Post {

diff --git a/examples-staging/assets-local/schema.prisma b/examples-staging/assets-local/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Post {

diff --git a/examples-staging/auth/schema.prisma b/examples-staging/auth/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model User {

diff --git a/examples-staging/basic/schema.prisma b/examples-staging/basic/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model User {

diff --git a/examples-staging/ecommerce/schema.prisma b/examples-staging/ecommerce/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model User {

diff --git a/examples-staging/embedded-nextjs/schema.prisma b/examples-staging/embedded-nextjs/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Post {

diff --git a/examples-staging/graphql-api-endpoint/schema.prisma b/examples-staging/graphql-api-endpoint/schema.prisma
@@ -7,8 +7,9 @@ datasource postgresql {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model User {

diff --git a/examples-staging/roles/schema.prisma b/examples-staging/roles/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Todo {

diff --git a/examples-staging/sandbox/schema.prisma b/examples-staging/sandbox/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Todo {

diff --git a/examples/blog/schema.prisma b/examples/blog/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Post {

diff --git a/examples/custom-admin-ui-logo/schema.prisma b/examples/custom-admin-ui-logo/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Task {

diff --git a/examples/custom-admin-ui-navigation/schema.prisma b/examples/custom-admin-ui-navigation/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Task {

diff --git a/examples/custom-admin-ui-pages/schema.prisma b/examples/custom-admin-ui-pages/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Task {

diff --git a/examples/custom-field-view/schema.prisma b/examples/custom-field-view/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Task {

diff --git a/examples/custom-field/schema.prisma b/examples/custom-field/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Post {

diff --git a/examples/default-values/schema.prisma b/examples/default-values/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Task {

diff --git a/examples/document-field/schema.prisma b/examples/document-field/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Post {

diff --git a/examples/extend-graphql-schema/schema.prisma b/examples/extend-graphql-schema/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Post {

diff --git a/examples/json/schema.prisma b/examples/json/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Package {

diff --git a/examples/task-manager/schema.prisma b/examples/task-manager/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Task {

diff --git a/examples/testing/schema.prisma b/examples/testing/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Task {

diff --git a/examples/virtual-field/schema.prisma b/examples/virtual-field/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Post {

diff --git a/examples/with-auth/schema.prisma b/examples/with-auth/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Task {

diff --git a/packages/keystone/package.json b/packages/keystone/package.json
@@ -49,9 +49,9 @@
     "@keystone-ui/toast": "^4.0.3",
     "@keystone-ui/tooltip": "^4.0.2",
     "@preconstruct/next": "^3.0.0",
-    "@prisma/client": "2.30.3",
-    "@prisma/migrate": "2.30.3",
-    "@prisma/sdk": "2.30.3",
+    "@prisma/client": "3.0.2",
+    "@prisma/migrate": "3.0.2",
+    "@prisma/sdk": "3.0.2",
     "@sindresorhus/slugify": "^1.1.2",
     "@types/apollo-upload-client": "14.1.0",
     "@types/babel__core": "^7.1.16",
@@ -111,7 +111,7 @@
     "pirates": "^4.0.1",
     "pluralize": "^8.0.0",
     "prettier": "^2.4.0",
-    "prisma": "2.30.3",
+    "prisma": "3.0.2",
     "prompts": "^2.4.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/packages/keystone/src/fields/types/json/tests/test-fixtures.ts b/packages/keystone/src/fields/types/json/tests/test-fixtures.ts
@@ -1,4 +1,5 @@
 import { json } from '..';
+import { KeystoneContext } from '../../../../types';
 
 export const name = 'Json';
 export const typeFunction = json;
@@ -13,14 +14,14 @@ export const fieldName = 'testField';
 
 export const getTestFields = () => ({ testField: json() });
 
-export const initItems = () => {
+export const initItems = (_: any, context: KeystoneContext) => {
   return [
     { name: 'a', testField: { a: [] } },
     { name: 'b', testField: { b: 'string' } },
     { name: 'c', testField: { c: 42 } },
     { name: 'd', testField: { d: { i: 25 } } },
     { name: 'e', testField: { e: null } },
-    { name: 'f', testField: null },
+    { name: 'f', testField: context.prisma.DbNull },
     { name: 'g' },
   ];
 };

diff --git a/packages/keystone/src/lib/core/prisma-schema.ts b/packages/keystone/src/lib/core/prisma-schema.ts
@@ -211,6 +211,7 @@ datasource ${provider} {
 generator client {
   provider = "prisma-client-js"
   output = "${clientDir}"${prismaFlags}
+  engineType = "binary"
 }
 \n`;
   for (const [listKey, { resolvedDbFields }] of Object.entries(lists)) {

diff --git a/packages/keystone/src/scripts/tests/fixtures/basic-project/schema.prisma b/packages/keystone/src/scripts/tests/fixtures/basic-project/schema.prisma
@@ -7,8 +7,9 @@ datasource sqlite {
 }
 
 generator client {
-  provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
+  provider   = "prisma-client-js"
+  output     = "node_modules/.prisma/client"
+  engineType = "binary"
 }
 
 model Todo {

diff --git a/packages/keystone/src/scripts/tests/migrations.test.ts b/packages/keystone/src/scripts/tests/migrations.test.ts
@@ -56,9 +56,7 @@ async function getGeneratedMigration(
   const migrations: {
     migration_name: string;
     finished_at: string;
-  }[] = await prismaClient.$queryRaw(
-    'SELECT migration_name,finished_at FROM _prisma_migrations ORDER BY finished_at DESC'
-  );
+  }[] = await prismaClient.$queryRaw`SELECT migration_name,finished_at FROM _prisma_migrations ORDER BY finished_at DESC`;
   await prismaClient.$disconnect();
   expect(migrations).toHaveLength(expectedNumberOfMigrations);
   expect(migrations.every(x => !!x.finished_at)).toBeTruthy();