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

fix(deps): update engines to v2.26.0-13.a9966aa784861dee7e6b2a90950874cbaf7b4984 #7796

Merged
merged 2 commits into from
Jun 23, 2021
Merged

fix(deps): update engines to v2.26.0-13.a9966aa784861dee7e6b2a90950874cbaf7b4984 #7796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
290688c
fix(deps): update engines to v2.26.0-13.a9966aa784861dee7e6b2a9095087…
renovate-bot Jun 23, 2021
9ed4258
update snapshots
williamluke4 Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"precommit": "lint-staged"
},
"dependencies": {
"@prisma/engines": "2.26.0-7.473f96e8dcb29039719059f8e9ac32c14a63a9f6"
"@prisma/engines": "2.26.0-13.a9966aa784861dee7e6b2a90950874cbaf7b4984"
},
"lint-staged": {
"*.ts": [
Expand Down
4 changes: 2 additions & 2 deletions src/packages/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"devDependencies": {
"@prisma/debug": "workspace:*",
"@prisma/engine-core": "workspace:*",
"@prisma/engines": "2.26.0-7.473f96e8dcb29039719059f8e9ac32c14a63a9f6",
"@prisma/engines": "2.26.0-13.a9966aa784861dee7e6b2a90950874cbaf7b4984",
"@prisma/fetch-engine": "workspace:*",
"@prisma/generator-helper": "workspace:*",
"@prisma/get-platform": "workspace:*",
Expand Down Expand Up @@ -126,7 +126,7 @@
}
},
"dependencies": {
"@prisma/engines-version": "2.26.0-7.473f96e8dcb29039719059f8e9ac32c14a63a9f6"
"@prisma/engines-version": "2.26.0-13.a9966aa784861dee7e6b2a90950874cbaf7b4984"
},
"lint-staged": {
"*.ts": [
Expand Down
2 changes: 1 addition & 1 deletion src/packages/engine-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
"dependencies": {
"@prisma/debug": "workspace:*",
"@prisma/engines": "2.26.0-7.473f96e8dcb29039719059f8e9ac32c14a63a9f6",
"@prisma/engines": "2.26.0-13.a9966aa784861dee7e6b2a90950874cbaf7b4984",
"@prisma/generator-helper": "workspace:*",
"@prisma/get-platform": "workspace:*",
"chalk": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/packages/fetch-engine/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"bugs": "https://github.com/prisma/prisma/issues",
"devDependencies": {
"@prisma/engines-version": "2.26.0-7.473f96e8dcb29039719059f8e9ac32c14a63a9f6",
"@prisma/engines-version": "2.26.0-13.a9966aa784861dee7e6b2a90950874cbaf7b4984",
"@types/find-cache-dir": "3.2.0",
"@types/jest": "26.0.23",
"@types/node": "12.20.15",
Expand Down
2 changes: 1 addition & 1 deletion src/packages/migrate/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"version": "latest"
},
"devDependencies": {
"@prisma/engines-version": "2.26.0-7.473f96e8dcb29039719059f8e9ac32c14a63a9f6",
"@prisma/engines-version": "2.26.0-13.a9966aa784861dee7e6b2a90950874cbaf7b4984",
"@prisma/generator-helper": "workspace:*",
"@prisma/sdk": "workspace:*",
"@types/jest": "26.0.23",
Expand Down
2 changes: 1 addition & 1 deletion src/packages/sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"dependencies": {
"@prisma/debug": "workspace:*",
"@prisma/engine-core": "workspace:*",
"@prisma/engines": "2.26.0-7.473f96e8dcb29039719059f8e9ac32c14a63a9f6",
"@prisma/engines": "2.26.0-13.a9966aa784861dee7e6b2a90950874cbaf7b4984",
"@prisma/fetch-engine": "workspace:*",
"@prisma/generator-helper": "workspace:*",
"@prisma/get-platform": "workspace:*",
Expand Down
115 changes: 4 additions & 111 deletions src/packages/sdk/src/__tests__/__snapshots__/engineCommands.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3765,7 +3765,7 @@ Object {
"authorId",
],
"relationName": "PostToUser",
"relationOnDelete": "NONE",
"relationOnDelete": "Cascade",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be related to prisma/prisma-engines#1947 (comment)

Not sure about the other changes, could you check @williamluke4 @millsp ?

Copy link
Member

@janpio janpio Jun 23, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to double check why the relationOnDelete changed even when the preview feature is not enabled. This will affect users potentially now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pimeys gave me context that this is not used in Prisma anywhere.

I just checked the community generators, none use relationOnDelete in code as well.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think only Amplication is using it in code https://github.com/amplication/prisma-schema-dsl/blob/d7126f3ea580090bb287be34258fc13b00db6149/src/builders.ts#L169-L198

"relationToFields": Array [
"id",
],
Expand Down Expand Up @@ -3878,7 +3878,6 @@ Object {
"name": "posts",
"relationFromFields": Array [],
"relationName": "PostToUser",
"relationOnDelete": "NONE",
"relationToFields": Array [],
"type": "Post",
},
Expand Down Expand Up @@ -15852,7 +15851,7 @@ Object {
"authorId",
],
"relationName": "PostToUser",
"relationOnDelete": "NONE",
"relationOnDelete": "Cascade",
"relationToFields": Array [
"id",
],
Expand Down Expand Up @@ -15965,7 +15964,6 @@ Object {
"name": "posts",
"relationFromFields": Array [],
"relationName": "PostToUser",
"relationOnDelete": "NONE",
"relationToFields": Array [],
"type": "Post",
},
Expand Down Expand Up @@ -27901,9 +27899,9 @@ Object {

exports[`getDMMF big schema 1`] = `119480158`;

exports[`getDMMF chinook introspected schema 1`] = `842601`;
exports[`getDMMF chinook introspected schema 1`] = `842348`;

exports[`getDMMF chinook introspected schema connectOrCreate 1`] = `842601`;
exports[`getDMMF chinook introspected schema connectOrCreate 1`] = `842348`;
Comment on lines +27902 to +27904
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The size/length of a JSON stringified dmmf...

Not super useful like this to know what changed...!

prisma/src/packages/sdk/src/__tests__/engineCommands.test.ts

Lines 177 to 199 in 2226db9

test('chinook introspected schema', async () => {
const file = fs.readFileSync(
path.join(__dirname, '../../fixtures/chinook.prisma'),
'utf-8',
)
const dmmf = await getDMMF({
datamodel: file,
})
const str = JSON.stringify(dmmf)
expect(str.length).toMatchSnapshot()
})
test('chinook introspected schema connectOrCreate', async () => {
const file = fs.readFileSync(
path.join(__dirname, '../../fixtures/chinook.prisma'),
'utf-8',
)
const dmmf = await getDMMF({
datamodel: file,
})
const str = JSON.stringify(dmmf)
expect(str.length).toMatchSnapshot()
})

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The length of the stringify dmmf 😕

Copy link
Member

@janpio janpio Jun 23, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can give toMatchSnapshot() a string as single param, then it uses that to name the snapshot. But 🤷


exports[`getDMMF model with autoincrement should fail if mysql 1`] = `
"Schema parsing
Expand Down Expand Up @@ -28420,24 +28418,6 @@ Object {
"minNumFields": null,
},
"fields": Array [
Object {
"inputTypes": Array [
Object {
"isList": false,
"location": "scalar",
"type": "Int",
},
Object {
"isList": false,
"location": "inputObjectTypes",
"namespace": "prisma",
"type": "IntFieldUpdateOperationsInput",
},
],
"isNullable": false,
"isRequired": false,
"name": "id",
},
Object {
"inputTypes": Array [
Object {
Expand Down Expand Up @@ -28492,24 +28472,6 @@ Object {
"minNumFields": null,
},
"fields": Array [
Object {
"inputTypes": Array [
Object {
"isList": false,
"location": "scalar",
"type": "Int",
},
Object {
"isList": false,
"location": "inputObjectTypes",
"namespace": "prisma",
"type": "IntFieldUpdateOperationsInput",
},
],
"isNullable": false,
"isRequired": false,
"name": "id",
},
Comment on lines -28495 to -28512
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is causing this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are currently investigating

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are expected changes as this test does not have a datasource. Meaning that these operations are not supported. cc @dpetrick

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, the gh ui is a bit screwed up here. Probably due to the large size of the file. Basically, the snapshot indicated is incorrect. It is not getDMMF model with autoincrement should fail if mysql but actually getDMMF simple model

Object {
"inputTypes": Array [
Object {
Expand Down Expand Up @@ -29308,75 +29270,6 @@ Object {
],
"name": "StringFieldUpdateOperationsInput",
},
Object {
"constraints": Object {
"maxNumFields": 1,
"minNumFields": 1,
},
"fields": Array [
Object {
"inputTypes": Array [
Object {
"isList": false,
"location": "scalar",
"type": "Int",
},
],
"isNullable": false,
"isRequired": false,
"name": "set",
},
Object {
"inputTypes": Array [
Object {
"isList": false,
"location": "scalar",
"type": "Int",
},
],
"isNullable": false,
"isRequired": false,
"name": "increment",
},
Object {
"inputTypes": Array [
Object {
"isList": false,
"location": "scalar",
"type": "Int",
},
],
"isNullable": false,
"isRequired": false,
"name": "decrement",
},
Object {
"inputTypes": Array [
Object {
"isList": false,
"location": "scalar",
"type": "Int",
},
],
"isNullable": false,
"isRequired": false,
"name": "multiply",
},
Object {
"inputTypes": Array [
Object {
"isList": false,
"location": "scalar",
"type": "Int",
},
],
"isNullable": false,
"isRequired": false,
"name": "divide",
},
],
"name": "IntFieldUpdateOperationsInput",
},
williamluke4 marked this conversation as resolved.
Show resolved Hide resolved
Object {
"constraints": Object {
"maxNumFields": null,
Expand Down
8 changes: 2 additions & 6 deletions src/packages/sdk/src/__tests__/migrateEngineCommands.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ describe('canConnectToDatabase', () => {
"code": "P1001",
"message": "Can't reach database server at \`doesnotexist\`:\`5432\`

Please make sure your database server is running at \`doesnotexist\`:\`5432\`.
",
Please make sure your database server is running at \`doesnotexist\`:\`5432\`.",
}
`)
})
Expand Down Expand Up @@ -118,10 +117,7 @@ describe('createDatabase', () => {
).rejects.toThrowErrorMatchingInlineSnapshot(`
"P1001: Can't reach database server at \`doesnotexist\`:\`5432\`

Please make sure your database server is running at \`doesnotexist\`:\`5432\`.
0: sql_migration_connector::flavour::postgres::create_database
with self=PostgresFlavour { url: \\"<REDACTED>\\" }
at migration-engine/connectors/sql-migration-connector/src/flavour/postgres.rs:117"
Please make sure your database server is running at \`doesnotexist\`:\`5432\`."
Copy link
Member

@Jolg42 Jolg42 Jun 23, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These 2 changes are expected ✅

`)
})

Expand Down