Use Prisma's Node-API query engine (keystonejs#6920)

rajneeshaggarwal · Nov 22, 2021 · 82539fa · 82539fa
1 parent bbedee8
commit 82539fa
Show file tree

Hide file tree

Showing 47 changed files with 220 additions and 175 deletions.
diff --git a/.changeset/short-berries-shout.md b/.changeset/short-berries-shout.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': major
+---
+
+Keystone now uses Prisma's Node-API Query Engine instead of the Binary Query Engine. This should improve the performance of operations using Prisma. See https://www.prisma.io/docs/concepts/components/prisma-engines/query-engine for more details.
diff --git a/.changeset/ten-bags-arrive.md b/.changeset/ten-bags-arrive.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': patch
+---
+
+Fixed doing multiple writes at the same time on SQLite causing an timeout immediately.
diff --git a/examples-staging/assets-cloud/schema.prisma b/examples-staging/assets-cloud/schema.prisma
@@ -7,9 +7,8 @@ datasource sqlite {
 }
 
 generator client {
-  provider   = "prisma-client-js"
-  output     = "node_modules/.prisma/client"
-  engineType = "binary"
+  provider = "prisma-client-js"
+  output   = "node_modules/.prisma/client"
 }
 
 model Post {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/packages/keystone/src/lib/core/graphql-errors.ts b/packages/keystone/src/lib/core/graphql-errors.ts
@@ -50,7 +50,10 @@ export const resolverError = (things: { error: Error; tag: string }[]) => {
 };
 
 export const relationshipError = (things: { error: Error; tag: string }[]) => {
-  const s = things.map(t => `  - ${t.tag}: ${t.error.message}`).join('\n');
+  const s = things
+    .map(t => `  - ${t.tag}: ${t.error.message}`)
+    .sort()
+    .join('\n');
   return new ApolloError(
     `An error occured while resolving relationship fields.\n${s}`,
     'KS_RELATIONSHIP_ERROR',

diff --git a/packages/keystone/src/lib/core/graphql-schema.ts b/packages/keystone/src/lib/core/graphql-schema.ts
@@ -1,5 +1,4 @@
 import { GraphQLNamedType, GraphQLSchema } from 'graphql';
-import { DatabaseProvider } from '../../types';
 import { graphql } from '../..';
 import { InitialisedList } from './types-for-lists';
 
@@ -8,7 +7,6 @@ import { getQueriesForList } from './queries';
 
 export function getGraphQLSchema(
   lists: Record<string, InitialisedList>,
-  provider: DatabaseProvider,
   extraFields: {
     mutation: Record<string, graphql.Field<unknown, any, graphql.OutputType, string>>;
     query: Record<string, graphql.Field<unknown, any, graphql.OutputType, string>>;
@@ -30,7 +28,7 @@ export function getGraphQLSchema(
     fields: Object.assign(
       {},
       ...Object.values(lists).map(list => {
-        const { mutations, updateManyInput } = getMutationsForList(list, provider);
+        const { mutations, updateManyInput } = getMutationsForList(list);
         updateManyByList[list.listKey] = updateManyInput;
         return mutations;
       }),