From 84afd30dea966f7115991b71d7878f662aa45297 Mon Sep 17 00:00:00 2001 From: Tim Suchanek Date: Mon, 21 Dec 2020 10:46:34 +0100 Subject: [PATCH] chore: bump engines (#4749) --- src/packages/cli/package.json | 2 +- src/packages/client/package.json | 4 +- src/packages/engine-core/package.json | 2 +- src/packages/fetch-engine/package.json | 2 +- .../src/__tests__/download.test.ts | 2 +- src/packages/fetch-engine/src/getLatestTag.ts | 2 +- src/packages/migrate/package.json | 2 +- src/packages/sdk/package.json | 2 +- .../__snapshots__/engineCommands.test.ts.snap | 28 +- .../introspection/introspection.test.ts | 941 ++++++++++-------- src/pnpm-lock.yaml | 93 +- 11 files changed, 575 insertions(+), 505 deletions(-) diff --git a/src/packages/cli/package.json b/src/packages/cli/package.json index ced9ab2c7eae..8eda14288be2 100644 --- a/src/packages/cli/package.json +++ b/src/packages/cli/package.json @@ -130,7 +130,7 @@ }, "dependencies": { "@prisma/bar": "^0.0.1", - "@prisma/engines": "2.14.0-17.af950b3705ef175e85492660c621085eb7f99557" + "@prisma/engines": "2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35" }, "lint-staged": { "*.ts": [ diff --git a/src/packages/client/package.json b/src/packages/client/package.json index d4fde442a695..456213acd6b5 100644 --- a/src/packages/client/package.json +++ b/src/packages/client/package.json @@ -60,7 +60,7 @@ "devDependencies": { "@prisma/debug": "workspace:*", "@prisma/engine-core": "workspace:*", - "@prisma/engines": "2.14.0-17.af950b3705ef175e85492660c621085eb7f99557", + "@prisma/engines": "2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35", "@prisma/generator-helper": "workspace:*", "@prisma/get-platform": "workspace:*", "@prisma/migrate": "workspace:*", @@ -124,7 +124,7 @@ } }, "dependencies": { - "@prisma/engines-version": "2.14.0-17.af950b3705ef175e85492660c621085eb7f99557" + "@prisma/engines-version": "2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35" }, "lint-staged": { "*.ts": [ diff --git a/src/packages/engine-core/package.json b/src/packages/engine-core/package.json index 83207a61d3ab..bd9f5a446c36 100644 --- a/src/packages/engine-core/package.json +++ b/src/packages/engine-core/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@prisma/debug": "workspace:*", - "@prisma/engines": "2.14.0-17.af950b3705ef175e85492660c621085eb7f99557", + "@prisma/engines": "2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35", "@prisma/generator-helper": "workspace:*", "@prisma/get-platform": "workspace:*", "chalk": "^4.0.0", diff --git a/src/packages/fetch-engine/package.json b/src/packages/fetch-engine/package.json index b92aa4c4bbd0..0035b1186334 100644 --- a/src/packages/fetch-engine/package.json +++ b/src/packages/fetch-engine/package.json @@ -6,7 +6,7 @@ "license": "Apache-2.0", "author": "Tim Suchanek ", "devDependencies": { - "@prisma/engines-version": "2.14.0-17.af950b3705ef175e85492660c621085eb7f99557", + "@prisma/engines-version": "2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35", "@types/jest": "26.0.19", "@types/node": "12.19.9", "@types/node-fetch": "2.5.7", diff --git a/src/packages/fetch-engine/src/__tests__/download.test.ts b/src/packages/fetch-engine/src/__tests__/download.test.ts index 7531d6b60bc0..c144c0f1c0db 100644 --- a/src/packages/fetch-engine/src/__tests__/download.test.ts +++ b/src/packages/fetch-engine/src/__tests__/download.test.ts @@ -16,7 +16,7 @@ const CURRENT_BINARIES_HASH = enginesVersion // From npx @prisma/cli@2.6.2 -v const FIXED_BINARIES_HASH = '60c1d1e9396bf462eda7b97f8f65523bf65c9f5f' -jest.setTimeout(50000) +jest.setTimeout(60000) describe('download', () => { beforeEach(async () => { diff --git a/src/packages/fetch-engine/src/getLatestTag.ts b/src/packages/fetch-engine/src/getLatestTag.ts index 1e12c7aef22f..8f1a2a197edb 100644 --- a/src/packages/fetch-engine/src/getLatestTag.ts +++ b/src/packages/fetch-engine/src/getLatestTag.ts @@ -18,7 +18,7 @@ export async function getLatestTag(): Promise { // remove the "integration/" part branch = branch.replace(/^integration\//, '') - console.log({ branch }, 'after replace') + // console.log({ branch }, 'after replace') // first try to get the branch as it is // if it doesn't have an equivalent in the engines repo diff --git a/src/packages/migrate/package.json b/src/packages/migrate/package.json index fae53d440f59..f842695489cb 100644 --- a/src/packages/migrate/package.json +++ b/src/packages/migrate/package.json @@ -10,7 +10,7 @@ "version": "latest" }, "devDependencies": { - "@prisma/engines-version": "2.14.0-17.af950b3705ef175e85492660c621085eb7f99557", + "@prisma/engines-version": "2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35", "@prisma/generator-helper": "workspace:*", "@prisma/sdk": "workspace:*", "@types/diff": "4.0.2", diff --git a/src/packages/sdk/package.json b/src/packages/sdk/package.json index c0981adaa32e..3a4723aa9462 100644 --- a/src/packages/sdk/package.json +++ b/src/packages/sdk/package.json @@ -41,7 +41,7 @@ "dependencies": { "@prisma/debug": "workspace:*", "@prisma/engine-core": "workspace:*", - "@prisma/engines": "2.14.0-17.af950b3705ef175e85492660c621085eb7f99557", + "@prisma/engines": "2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35", "@prisma/fetch-engine": "workspace:*", "@prisma/generator-helper": "workspace:*", "@prisma/get-platform": "workspace:*", diff --git a/src/packages/sdk/src/__tests__/__snapshots__/engineCommands.test.ts.snap b/src/packages/sdk/src/__tests__/__snapshots__/engineCommands.test.ts.snap index 3effb96c5055..c0e496bdb3f1 100644 --- a/src/packages/sdk/src/__tests__/__snapshots__/engineCommands.test.ts.snap +++ b/src/packages/sdk/src/__tests__/__snapshots__/engineCommands.test.ts.snap @@ -2740,7 +2740,7 @@ Object { "isList": false, "location": "inputObjectTypes", "namespace": "prisma", - "type": "AuthorIdTitleCompoundUniqueInput", + "type": "PostAuthorIdTitleCompoundUniqueInput", }, ], "isNullable": false, @@ -3144,7 +3144,7 @@ Object { "isList": false, "location": "inputObjectTypes", "namespace": "prisma", - "type": "FirstNameLastNameCompoundUniqueInput", + "type": "User1FirstNameLastNameCompoundUniqueInput", }, ], "isNullable": false, @@ -3365,7 +3365,7 @@ Object { "isList": false, "location": "inputObjectTypes", "namespace": "prisma", - "type": "FirstNameLastNameIsAdminCompoundUniqueInput", + "type": "User2FirstNameLastNameIsAdminCompoundUniqueInput", }, ], "isNullable": false, @@ -4487,7 +4487,7 @@ Object { "name": "title", }, ], - "name": "AuthorIdTitleCompoundUniqueInput", + "name": "PostAuthorIdTitleCompoundUniqueInput", }, Object { "constraints": Object { @@ -4568,7 +4568,7 @@ Object { "name": "lastName", }, ], - "name": "FirstNameLastNameCompoundUniqueInput", + "name": "User1FirstNameLastNameCompoundUniqueInput", }, Object { "constraints": Object { @@ -4613,7 +4613,7 @@ Object { "name": "isAdmin", }, ], - "name": "FirstNameLastNameIsAdminCompoundUniqueInput", + "name": "User2FirstNameLastNameIsAdminCompoundUniqueInput", }, Object { "constraints": Object { @@ -10000,7 +10000,7 @@ Object { "isList": false, "location": "inputObjectTypes", "namespace": "prisma", - "type": "AuthorIdTitleCompoundUniqueInput", + "type": "PostAuthorIdTitleCompoundUniqueInput", }, ], "isNullable": false, @@ -10404,7 +10404,7 @@ Object { "isList": false, "location": "inputObjectTypes", "namespace": "prisma", - "type": "FirstNameLastNameCompoundUniqueInput", + "type": "User1FirstNameLastNameCompoundUniqueInput", }, ], "isNullable": false, @@ -10625,7 +10625,7 @@ Object { "isList": false, "location": "inputObjectTypes", "namespace": "prisma", - "type": "FirstNameLastNameIsAdminCompoundUniqueInput", + "type": "User2FirstNameLastNameIsAdminCompoundUniqueInput", }, ], "isNullable": false, @@ -11747,7 +11747,7 @@ Object { "name": "title", }, ], - "name": "AuthorIdTitleCompoundUniqueInput", + "name": "PostAuthorIdTitleCompoundUniqueInput", }, Object { "constraints": Object { @@ -11828,7 +11828,7 @@ Object { "name": "lastName", }, ], - "name": "FirstNameLastNameCompoundUniqueInput", + "name": "User1FirstNameLastNameCompoundUniqueInput", }, Object { "constraints": Object { @@ -11873,7 +11873,7 @@ Object { "name": "isAdmin", }, ], - "name": "FirstNameLastNameIsAdminCompoundUniqueInput", + "name": "User2FirstNameLastNameIsAdminCompoundUniqueInput", }, Object { "constraints": Object { @@ -16580,9 +16580,9 @@ Object { exports[`getDMMF big schema 1`] = `76865164`; -exports[`getDMMF chinook introspected schema 1`] = `473584`; +exports[`getDMMF chinook introspected schema 1`] = `473612`; -exports[`getDMMF chinook introspected schema connectOrCreate 1`] = `473584`; +exports[`getDMMF chinook introspected schema connectOrCreate 1`] = `473612`; exports[`getDMMF model with autoincrement should fail if mysql 1`] = ` "Schema parsing diff --git a/src/packages/sdk/src/__tests__/introspection/introspection.test.ts b/src/packages/sdk/src/__tests__/introspection/introspection.test.ts index d91c348126d7..ce2de4a48843 100644 --- a/src/packages/sdk/src/__tests__/introspection/introspection.test.ts +++ b/src/packages/sdk/src/__tests__/introspection/introspection.test.ts @@ -69,447 +69,512 @@ test('introspection basic', async () => { const description = await engine.getDatabaseDescription(schema) - expect(JSON.parse(description)).toMatchInlineSnapshot(` - Object { - "enums": Array [], - "sequences": Array [], - "tables": Array [ - Object { - "columns": Array [ - Object { - "autoIncrement": false, - "default": null, - "name": "author", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "INTEGER", - "family": "int", - "fullDataType": "INTEGER", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "content", - "tpe": Object { - "arity": "nullable", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": Object { - "DBGENERATED": "'1970-01-01 00:00:00'", - }, - "name": "createdAt", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "DATE", - "family": "dateTime", - "fullDataType": "DATE", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "kind", - "tpe": Object { - "arity": "nullable", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": Object { - "VALUE": false, - }, - "name": "published", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "BOOLEAN", - "family": "boolean", - "fullDataType": "BOOLEAN", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": Object { - "VALUE": "", - }, - "name": "title", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": Object { - "DBGENERATED": "'1970-01-01 00:00:00'", - }, - "name": "updatedAt", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "DATE", - "family": "dateTime", - "fullDataType": "DATE", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "uuid", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, - }, - ], - "foreignKeys": Array [ - Object { - "columns": Array [ - "author", - ], - "constraintName": null, - "onDeleteAction": "restrict", - "onUpdateAction": "noAction", - "referencedColumns": Array [ - "id", - ], - "referencedTable": "User", - }, - ], - "indices": Array [ - Object { - "columns": Array [ - "uuid", - ], - "name": "Post.uuid", - "tpe": "unique", - }, - ], - "name": "Post", - "primaryKey": Object { - "columns": Array [ - "uuid", - ], - "constraintName": null, - "sequence": null, - }, - }, - Object { - "columns": Array [ - Object { - "autoIncrement": false, - "default": Object { - "VALUE": 0, - }, - "name": "age", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "INTEGER", - "family": "int", - "fullDataType": "INTEGER", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": Object { - "VALUE": 0, - }, - "name": "amount", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "REAL", - "family": "decimal", - "fullDataType": "REAL", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": Object { - "VALUE": 0, - }, - "name": "balance", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "REAL", - "family": "decimal", - "fullDataType": "REAL", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": Object { - "VALUE": "", - }, - "name": "email", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, - }, - Object { - "autoIncrement": true, - "default": null, - "name": "id", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "INTEGER", - "family": "int", - "fullDataType": "INTEGER", - "nativeType": null, - }, + expect(description).toMatchInlineSnapshot(` + "SqlSchema { + tables: [ + Table { + name: \\"Post\\", + columns: [ + Column { + name: \\"author\\", + tpe: ColumnType { + data_type: \\"INTEGER\\", + full_data_type: \\"INTEGER\\", + character_maximum_length: None, + family: Int, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"content\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Nullable, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"createdAt\\", + tpe: ColumnType { + data_type: \\"DATE\\", + full_data_type: \\"DATE\\", + character_maximum_length: None, + family: DateTime, + arity: Required, + native_type: None, + }, + default: Some( + DefaultValue { + kind: DBGENERATED( + \\"\\\\'1970-01-01 00:00:00\\\\'\\", + ), + constraint_name: None, + }, + ), + auto_increment: false, + }, + Column { + name: \\"kind\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Nullable, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"published\\", + tpe: ColumnType { + data_type: \\"BOOLEAN\\", + full_data_type: \\"BOOLEAN\\", + character_maximum_length: None, + family: Boolean, + arity: Required, + native_type: None, + }, + default: Some( + DefaultValue { + kind: VALUE( + Boolean( + false, + ), + ), + constraint_name: None, + }, + ), + auto_increment: false, + }, + Column { + name: \\"title\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Required, + native_type: None, + }, + default: Some( + DefaultValue { + kind: VALUE( + String( + \\"\\", + ), + ), + constraint_name: None, + }, + ), + auto_increment: false, + }, + Column { + name: \\"updatedAt\\", + tpe: ColumnType { + data_type: \\"DATE\\", + full_data_type: \\"DATE\\", + character_maximum_length: None, + family: DateTime, + arity: Required, + native_type: None, + }, + default: Some( + DefaultValue { + kind: DBGENERATED( + \\"\\\\'1970-01-01 00:00:00\\\\'\\", + ), + constraint_name: None, + }, + ), + auto_increment: false, + }, + Column { + name: \\"uuid\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: false, + }, + ], + indices: [ + Index { + name: \\"Post.uuid\\", + columns: [ + \\"uuid\\", + ], + tpe: Unique, + }, + ], + primary_key: Some( + PrimaryKey { + columns: [ + \\"uuid\\", + ], + sequence: None, + constraint_name: None, + }, + ), + foreign_keys: [ + ForeignKey { + constraint_name: None, + columns: [ + \\"author\\", + ], + referenced_table: \\"User\\", + referenced_columns: [ + \\"id\\", + ], + on_delete_action: Restrict, + on_update_action: NoAction, + }, + ], }, - Object { - "autoIncrement": false, - "default": null, - "name": "name", - "tpe": Object { - "arity": "nullable", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, + Table { + name: \\"User\\", + columns: [ + Column { + name: \\"age\\", + tpe: ColumnType { + data_type: \\"INTEGER\\", + full_data_type: \\"INTEGER\\", + character_maximum_length: None, + family: Int, + arity: Required, + native_type: None, + }, + default: Some( + DefaultValue { + kind: VALUE( + Int( + 0, + ), + ), + constraint_name: None, + }, + ), + auto_increment: false, + }, + Column { + name: \\"amount\\", + tpe: ColumnType { + data_type: \\"REAL\\", + full_data_type: \\"REAL\\", + character_maximum_length: None, + family: Decimal, + arity: Required, + native_type: None, + }, + default: Some( + DefaultValue { + kind: VALUE( + Float( + BigDecimal(\\"0\\"), + ), + ), + constraint_name: None, + }, + ), + auto_increment: false, + }, + Column { + name: \\"balance\\", + tpe: ColumnType { + data_type: \\"REAL\\", + full_data_type: \\"REAL\\", + character_maximum_length: None, + family: Decimal, + arity: Required, + native_type: None, + }, + default: Some( + DefaultValue { + kind: VALUE( + Float( + BigDecimal(\\"0\\"), + ), + ), + constraint_name: None, + }, + ), + auto_increment: false, + }, + Column { + name: \\"email\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Required, + native_type: None, + }, + default: Some( + DefaultValue { + kind: VALUE( + String( + \\"\\", + ), + ), + constraint_name: None, + }, + ), + auto_increment: false, + }, + Column { + name: \\"id\\", + tpe: ColumnType { + data_type: \\"INTEGER\\", + full_data_type: \\"INTEGER\\", + character_maximum_length: None, + family: Int, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: true, + }, + Column { + name: \\"name\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Nullable, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"role\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Required, + native_type: None, + }, + default: Some( + DefaultValue { + kind: VALUE( + String( + \\"USER\\", + ), + ), + constraint_name: None, + }, + ), + auto_increment: false, + }, + ], + indices: [ + Index { + name: \\"User.email\\", + columns: [ + \\"email\\", + ], + tpe: Unique, + }, + Index { + name: \\"User.id\\", + columns: [ + \\"id\\", + ], + tpe: Unique, + }, + ], + primary_key: Some( + PrimaryKey { + columns: [ + \\"id\\", + ], + sequence: None, + constraint_name: None, + }, + ), + foreign_keys: [], }, - Object { - "autoIncrement": false, - "default": Object { - "VALUE": "USER", - }, - "name": "role", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, + Table { + name: \\"_Migration\\", + columns: [ + Column { + name: \\"revision\\", + tpe: ColumnType { + data_type: \\"INTEGER\\", + full_data_type: \\"INTEGER\\", + character_maximum_length: None, + family: Int, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: true, + }, + Column { + name: \\"name\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"datamodel\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"status\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"applied\\", + tpe: ColumnType { + data_type: \\"INTEGER\\", + full_data_type: \\"INTEGER\\", + character_maximum_length: None, + family: Int, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"rolled_back\\", + tpe: ColumnType { + data_type: \\"INTEGER\\", + full_data_type: \\"INTEGER\\", + character_maximum_length: None, + family: Int, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"datamodel_steps\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"database_migration\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"errors\\", + tpe: ColumnType { + data_type: \\"TEXT\\", + full_data_type: \\"TEXT\\", + character_maximum_length: None, + family: String, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"started_at\\", + tpe: ColumnType { + data_type: \\"DATE\\", + full_data_type: \\"DATE\\", + character_maximum_length: None, + family: DateTime, + arity: Required, + native_type: None, + }, + default: None, + auto_increment: false, + }, + Column { + name: \\"finished_at\\", + tpe: ColumnType { + data_type: \\"DATE\\", + full_data_type: \\"DATE\\", + character_maximum_length: None, + family: DateTime, + arity: Nullable, + native_type: None, + }, + default: None, + auto_increment: false, + }, + ], + indices: [], + primary_key: Some( + PrimaryKey { + columns: [ + \\"revision\\", + ], + sequence: None, + constraint_name: None, + }, + ), + foreign_keys: [], }, - ], - "foreignKeys": Array [], - "indices": Array [ - Object { - "columns": Array [ - "email", - ], - "name": "User.email", - "tpe": "unique", - }, - Object { - "columns": Array [ - "id", - ], - "name": "User.id", - "tpe": "unique", - }, - ], - "name": "User", - "primaryKey": Object { - "columns": Array [ - "id", - ], - "constraintName": null, - "sequence": null, - }, - }, - Object { - "columns": Array [ - Object { - "autoIncrement": true, - "default": null, - "name": "revision", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "INTEGER", - "family": "int", - "fullDataType": "INTEGER", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "name", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "datamodel", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "status", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "applied", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "INTEGER", - "family": "int", - "fullDataType": "INTEGER", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "rolled_back", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "INTEGER", - "family": "int", - "fullDataType": "INTEGER", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "datamodel_steps", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "database_migration", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "errors", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "TEXT", - "family": "string", - "fullDataType": "TEXT", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "started_at", - "tpe": Object { - "arity": "required", - "characterMaximumLength": null, - "dataType": "DATE", - "family": "dateTime", - "fullDataType": "DATE", - "nativeType": null, - }, - }, - Object { - "autoIncrement": false, - "default": null, - "name": "finished_at", - "tpe": Object { - "arity": "nullable", - "characterMaximumLength": null, - "dataType": "DATE", - "family": "dateTime", - "fullDataType": "DATE", - "nativeType": null, - }, - }, - ], - "foreignKeys": Array [], - "indices": Array [], - "name": "_Migration", - "primaryKey": Object { - "columns": Array [ - "revision", - ], - "constraintName": null, - "sequence": null, - }, - }, - ], - } + ], + enums: [], + sequences: [], + }" `) engine.stop() }) diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index 8e22481a28b0..bcd13e6f1bd4 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -45,7 +45,7 @@ importers: packages/cli: dependencies: '@prisma/bar': 0.0.1 - '@prisma/engines': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 devDependencies: '@prisma/client': 'link:../client' '@prisma/debug': 'link:../debug' @@ -100,7 +100,7 @@ importers: '@prisma/bar': ^0.0.1 '@prisma/client': 'workspace:*' '@prisma/debug': 'workspace:*' - '@prisma/engines': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 '@prisma/fetch-engine': 'workspace:*' '@prisma/generator-helper': 'workspace:*' '@prisma/get-platform': 'workspace:*' @@ -150,11 +150,11 @@ importers: ws: 7.4.1 packages/client: dependencies: - '@prisma/engines-version': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines-version': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 devDependencies: '@prisma/debug': 'link:../debug' '@prisma/engine-core': 'link:../engine-core' - '@prisma/engines': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 '@prisma/generator-helper': 'link:../generator-helper' '@prisma/get-platform': 'link:../get-platform' '@prisma/migrate': 'link:../migrate' @@ -211,8 +211,8 @@ importers: specifiers: '@prisma/debug': 'workspace:*' '@prisma/engine-core': 'workspace:*' - '@prisma/engines': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 - '@prisma/engines-version': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 + '@prisma/engines-version': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 '@prisma/generator-helper': 'workspace:*' '@prisma/get-platform': 'workspace:*' '@prisma/migrate': 'workspace:*' @@ -307,7 +307,7 @@ importers: packages/engine-core: dependencies: '@prisma/debug': 'link:../debug' - '@prisma/engines': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 '@prisma/generator-helper': 'link:../generator-helper' '@prisma/get-platform': 'link:../get-platform' chalk: 4.1.0 @@ -337,7 +337,7 @@ importers: typescript: 4.1.2 specifiers: '@prisma/debug': 'workspace:*' - '@prisma/engines': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 '@prisma/generator-helper': 'workspace:*' '@prisma/get-platform': 'workspace:*' '@types/jest': 26.0.19 @@ -384,7 +384,7 @@ importers: temp-dir: 2.0.0 tempy: 1.0.0 devDependencies: - '@prisma/engines-version': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines-version': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 '@types/jest': 26.0.19 '@types/node': 12.19.9 '@types/node-fetch': 2.5.7 @@ -405,7 +405,7 @@ importers: typescript: 4.1.2 specifiers: '@prisma/debug': 'workspace:*' - '@prisma/engines-version': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines-version': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 '@prisma/get-platform': 'workspace:*' '@types/jest': 26.0.19 '@types/node': 12.19.9 @@ -531,7 +531,7 @@ importers: strip-ansi: 6.0.0 strip-indent: 3.0.0 devDependencies: - '@prisma/engines-version': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines-version': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 '@prisma/generator-helper': 'link:../generator-helper' '@prisma/sdk': 'link:../sdk' '@types/diff': 4.0.2 @@ -564,7 +564,7 @@ importers: typescript: 4.1.2 specifiers: '@prisma/debug': 'workspace:*' - '@prisma/engines-version': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines-version': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 '@prisma/generator-helper': 'workspace:*' '@prisma/get-platform': 'workspace:*' '@prisma/sdk': 'workspace:*' @@ -610,7 +610,7 @@ importers: dependencies: '@prisma/debug': 'link:../debug' '@prisma/engine-core': 'link:../engine-core' - '@prisma/engines': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 '@prisma/fetch-engine': 'link:../fetch-engine' '@prisma/generator-helper': 'link:../generator-helper' '@prisma/get-platform': 'link:../get-platform' @@ -663,7 +663,7 @@ importers: specifiers: '@prisma/debug': 'workspace:*' '@prisma/engine-core': 'workspace:*' - '@prisma/engines': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 + '@prisma/engines': 2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35 '@prisma/fetch-engine': 'workspace:*' '@prisma/generator-helper': 'workspace:*' '@prisma/get-platform': 'workspace:*' @@ -1355,19 +1355,19 @@ packages: dev: false resolution: integrity: sha512-FVLhwVkbfhXlBhroWfIXMLi+3Jh9IEzYp+9z+MUUiw3ZsbcoAil7CN9/QIjHc4/TcCRyRfuSmT7qCnn4O+TjJw== - /@prisma/debug/2.14.0-dev.37: + /@prisma/debug/2.14.0-dev.38: dependencies: debug: 4.3.2 ms: 2.1.3 dev: true resolution: - integrity: sha512-SosC2FjgJzd9uVaGVFZE+yn9FPqk8Q6v3QiS6SDkt/c513i1T6DUlYeG20jNauOhXnJRhKUJn1Hw+XNDbu+utA== - /@prisma/engine-core/2.14.0-dev.37: + integrity: sha512-76tv2geD02EiyXhfyVrqJaDaecRRNeCQZm+hfYh17JQDIyhC+VHa9PslyK5YS8t+sqg1FtAr07/NiNQLfv69kA== + /@prisma/engine-core/2.14.0-dev.38: dependencies: - '@prisma/debug': 2.14.0-dev.37 + '@prisma/debug': 2.14.0-dev.38 '@prisma/engines': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 - '@prisma/generator-helper': 2.14.0-dev.37 - '@prisma/get-platform': 2.14.0-dev.37 + '@prisma/generator-helper': 2.14.0-dev.38 + '@prisma/get-platform': 2.14.0-dev.38 chalk: 4.1.0 execa: 5.0.0 get-stream: 6.0.0 @@ -1378,18 +1378,23 @@ packages: undici: 2.2.1 dev: true resolution: - integrity: sha512-37q6vpjipSchMLdlYx0zCBTeQfI9/rXx6WZ8biu0LzA7ELAAxspDSFI0SsKUqblZi/2PB/Uby+vlnWZDOzxzMQ== - /@prisma/engines-version/2.14.0-17.af950b3705ef175e85492660c621085eb7f99557: + integrity: sha512-EF69GjbMuF1ss8ID18qnDU2crZkmvPqz3DD3gLCZDtUeJNIxpXPeTeyNdo4U+Fl+wna4E8cZj4LNt9zy6HkODQ== + /@prisma/engines-version/2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35: resolution: - integrity: sha512-Zs1ham25bXu48Psp43/Wa6/xDLGNdasLKVXMn2Kh41lDszFxYvXFXpIirJ4vXOChIQvzmDCpsVeBHMH0pHy2Dw== + integrity: sha512-R/7grsua5no4C50aVyUSosFkASWIOFYgUMUVzdouArUdpm7tdspFhuPjpPHtsEBuHmyFPMyI8THSgp9j/dpm4A== /@prisma/engines/2.14.0-17.af950b3705ef175e85492660c621085eb7f99557: + dev: true requiresBuild: true resolution: integrity: sha512-T2gSUkRk4dJ3V2zctg6DLRqFiwMCx3LXRCrium7vQIGzry9WBEARFGfzx3QNk5GSZuucxwOaMIt/L1YEZ6zdog== - /@prisma/fetch-engine/2.14.0-dev.37: + /@prisma/engines/2.14.0-20.81138059af8122d0991cdf95f96f09319051ee35: + requiresBuild: true + resolution: + integrity: sha512-ofoeLZPeXuEyYThBLj+uFJxgSpqo19sovy9NstTQnq/BOVLTTIT3qKYm8i7Oin6VFHVL1q4KxksK/bTF6Ekqdw== + /@prisma/fetch-engine/2.14.0-dev.38: dependencies: - '@prisma/debug': 2.14.0-dev.37 - '@prisma/get-platform': 2.14.0-dev.37 + '@prisma/debug': 2.14.0-dev.38 + '@prisma/get-platform': 2.14.0-dev.38 chalk: 4.1.0 execa: 5.0.0 find-cache-dir: 3.3.1 @@ -1407,30 +1412,30 @@ packages: tempy: 1.0.0 dev: true resolution: - integrity: sha512-BZB9FkcrZVhhJY277j/vjDjOVH6iM6TY1pjFCOHzlt0xoHBV6TwjMtUCcheihIlDS9WUCXlHRP25GuMKSksHMg== - /@prisma/generator-helper/2.14.0-dev.37: + integrity: sha512-NXNUGqVksVr/eT/3iv/ojokqo8HzSrgf1a4BBoyUrsExGLGm8w56A9vJh4gsQhsHq9+GYSO2h4ei6xknAW0MIw== + /@prisma/generator-helper/2.14.0-dev.38: dependencies: - '@prisma/debug': 2.14.0-dev.37 + '@prisma/debug': 2.14.0-dev.38 '@types/cross-spawn': 6.0.2 chalk: 4.1.0 cross-spawn: 7.0.3 dev: true resolution: - integrity: sha512-fQtKoAY0toqH4+LKAxm0vGmeVaZXktqjPoakXjM5h3Vr3T70jathflGB9S/YlsK8kBhZE/OUlpWz1xtREvgc+g== - /@prisma/get-platform/2.14.0-dev.37: + integrity: sha512-7+k12xTtwUxVhzUnnbeE7UajHm9qTvVkVLw3HBtOjSlkDwi8njv0Cos59sydeza9FDpGsNFNx6GAaX7xjGcAdQ== + /@prisma/get-platform/2.14.0-dev.38: dependencies: - '@prisma/debug': 2.14.0-dev.37 + '@prisma/debug': 2.14.0-dev.38 dev: true resolution: - integrity: sha512-w5LTz2dynsVPkj4gN+EZsqb1ul2CMXfBazSN6XmYg5kmYTVQKwTq8O85dD324INVoQ0GODVSZJNZnjc39dr+Lw== - /@prisma/sdk/2.14.0-dev.37: + integrity: sha512-MUm1peQaXZgr0EjmYI7tw5nYzhDhchKFbSOyCt7EOVZeidesCRtXt2jLIWkoZwdTUz6LUzlByC5+vejoZjgd8A== + /@prisma/sdk/2.14.0-dev.38: dependencies: - '@prisma/debug': 2.14.0-dev.37 - '@prisma/engine-core': 2.14.0-dev.37 + '@prisma/debug': 2.14.0-dev.38 + '@prisma/engine-core': 2.14.0-dev.38 '@prisma/engines': 2.14.0-17.af950b3705ef175e85492660c621085eb7f99557 - '@prisma/fetch-engine': 2.14.0-dev.37 - '@prisma/generator-helper': 2.14.0-dev.37 - '@prisma/get-platform': 2.14.0-dev.37 + '@prisma/fetch-engine': 2.14.0-dev.38 + '@prisma/generator-helper': 2.14.0-dev.38 + '@prisma/get-platform': 2.14.0-dev.38 '@timsuchanek/copy': 1.4.5 archiver: 4.0.2 arg: 5.0.0 @@ -1462,10 +1467,10 @@ packages: url-parse: 1.4.7 dev: true resolution: - integrity: sha512-QWMcPoVRyTsWwvl/CG4CUxqgIA6ZcY8DFZqA5Wsy8rdwSJM3YzngvfqbxGnMYQya7UHbL5Cyz2aEKXnEGuXMhA== - /@prisma/studio-pcw/0.331.0_@prisma+sdk@2.14.0-dev.37: + integrity: sha512-sQU5FSl9Tx9CQjJ7Tdg1q79oUsBofy2JE+GV+66/yv9TR4ZvQWJeEVo6prPwgLRh9Y/pwUhttdhqPhvZ1xdoKw== + /@prisma/studio-pcw/0.331.0_@prisma+sdk@2.14.0-dev.38: dependencies: - '@prisma/sdk': 2.14.0-dev.37 + '@prisma/sdk': 2.14.0-dev.38 '@prisma/studio-types': 0.331.0 rimraf: 3.0.2 dev: true @@ -1475,9 +1480,9 @@ packages: integrity: sha512-5xl0ECzF5g2o/AHobNwPrrjpxkV2KwEmP2q1Rkr58M6M7R+NEOOc6smADSgkoLj7HLTsPlMrN/3y7ic11EVhgA== /@prisma/studio-server/0.331.0: dependencies: - '@prisma/sdk': 2.14.0-dev.37 + '@prisma/sdk': 2.14.0-dev.38 '@prisma/studio': 0.331.0 - '@prisma/studio-pcw': 0.331.0_@prisma+sdk@2.14.0-dev.37 + '@prisma/studio-pcw': 0.331.0_@prisma+sdk@2.14.0-dev.38 '@prisma/studio-types': 0.331.0 '@sentry/node': 5.15.5 checkpoint-client: 1.1.18