Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Prisma's Node-API query engine #6920

Merged
merged 16 commits into from
Nov 22, 2021
Merged

Use Prisma's Node-API query engine #6920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
13b47a1
Use Prisma's Node-API query engine
emmatown Nov 11, 2021
7454b8f
Update schemas
emmatown Nov 11, 2021
e51135d
Fix a thing
emmatown Nov 11, 2021
cedb385
Try a thing
emmatown Nov 12, 2021
4a853c8
Try another thing
emmatown Nov 12, 2021
187166c
Merge branch 'main' into try-using-prisma-engine-type-library
emmatown Nov 12, 2021
f701132
Fix things
emmatown Nov 12, 2021
26fa6d9
Try a thing
emmatown Nov 12, 2021
041e83a
Fix a thing
emmatown Nov 12, 2021
9f84214
Fix things
emmatown Nov 12, 2021
99429f2
Fix a thing
emmatown Nov 12, 2021
b31658e
Add parallel test
emmatown Nov 12, 2021
e82ba00
Changesets
emmatown Nov 12, 2021
52a5023
Merge branch 'main' into try-using-prisma-engine-type-library
emmatown Nov 12, 2021
7a7ad6a
Try a thing to make CI fail
emmatown Nov 14, 2021
ae05af5
Revert "Try a thing to make CI fail"
emmatown Nov 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/short-berries-shout.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
5 changes: 5 additions & 0 deletions .changeset/ten-bags-arrive.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystone-next/keystone': patch
---

Fixed doing multiple writes at the same time on SQLite causing an timeout immediately.
5 changes: 2 additions & 3 deletions examples-staging/assets-cloud/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples-staging/assets-local/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples-staging/auth/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples-staging/basic/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples-staging/ecommerce/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples-staging/embedded-nextjs/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples-staging/graphql-api-endpoint/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples-staging/roles/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples-staging/sandbox/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/blog/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/custom-admin-ui-logo/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/custom-admin-ui-navigation/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/custom-admin-ui-pages/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/custom-field-view/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/custom-field/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/default-values/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/document-field/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/extend-graphql-schema-graphql-ts/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/extend-graphql-schema-nexus/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/extend-graphql-schema/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/json/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/rest-api/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/task-manager/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/testing/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/virtual-field/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions examples/with-auth/schema.prisma
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 4 additions & 1 deletion packages/keystone/src/lib/core/graphql-errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 1 addition & 3 deletions packages/keystone/src/lib/core/graphql-schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { GraphQLNamedType, GraphQLSchema } from 'graphql';
import { DatabaseProvider } from '../../types';
import { graphql } from '../..';
import { InitialisedList } from './types-for-lists';

Expand All @@ -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>>;
Expand All @@ -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;
}),
Expand Down
Loading