diff --git a/packages/cli/src/__tests__/commands/__snapshots__/Version.test.ts.snap b/packages/cli/src/__tests__/commands/__snapshots__/Version.test.ts.snap index 85b1a3ef64ca..988e1f316cb2 100644 --- a/packages/cli/src/__tests__/commands/__snapshots__/Version.test.ts.snap +++ b/packages/cli/src/__tests__/commands/__snapshots__/Version.test.ts.snap @@ -11,17 +11,6 @@ Default Engines Hash : ENGINE_VERSION Studio : STUDIO_VERSION `; -exports[`version version with custom binaries (Node-API) 1`] = ` -prisma : 0.0.0 -@prisma/client : Not found -Current platform : TEST_PLATFORM -Query Engine (Node-API) : libquery-engine ENGINE_VERSION (at sanitized_path/libquery_engine-TEST_PLATFORM.LIBRARY_TYPE.node, resolved by PRISMA_QUERY_ENGINE_LIBRARY) -Migration Engine : migration-engine-cli ENGINE_VERSION (at sanitized_path/migration-engine-TEST_PLATFORM, resolved by PRISMA_MIGRATION_ENGINE_BINARY) -Format Wasm : @prisma/prisma-fmt-wasm CLI_VERSION.ENGINE_VERSION -Default Engines Hash : ENGINE_VERSION -Studio : STUDIO_VERSION -`; - exports[`version basic version 1`] = ` prisma : 0.0.0 @prisma/client : Not found @@ -33,6 +22,17 @@ Default Engines Hash : ENGINE_VERSION Studio : STUDIO_VERSION `; +exports[`version version with custom binaries (Node-API) 1`] = ` +prisma : 0.0.0 +@prisma/client : Not found +Current platform : TEST_PLATFORM +Query Engine (Node-API) : libquery-engine ENGINE_VERSION (at sanitized_path/libquery_engine-TEST_PLATFORM.LIBRARY_TYPE.node, resolved by PRISMA_QUERY_ENGINE_LIBRARY) +Migration Engine : migration-engine-cli ENGINE_VERSION (at sanitized_path/migration-engine-TEST_PLATFORM, resolved by PRISMA_MIGRATION_ENGINE_BINARY) +Format Wasm : @prisma/prisma-fmt-wasm CLI_VERSION.ENGINE_VERSION +Default Engines Hash : ENGINE_VERSION +Studio : STUDIO_VERSION +`; + exports[`version version with custom binaries 1`] = ` prisma : 0.0.0 @prisma/client : Not found diff --git a/packages/client/package.json b/packages/client/package.json index 1ea3f9efd94e..4594f1753627 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -152,7 +152,7 @@ } }, "dependencies": { - "@prisma/engines-version": "4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9" + "@prisma/engines-version": "4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a" }, "sideEffects": false } diff --git a/packages/engines/package.json b/packages/engines/package.json index 001be04b4be4..f136a2717e38 100644 --- a/packages/engines/package.json +++ b/packages/engines/package.json @@ -8,7 +8,7 @@ "author": "Tim Suchanek ", "devDependencies": { "@prisma/debug": "workspace:*", - "@prisma/engines-version": "4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9", + "@prisma/engines-version": "4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a", "@prisma/fetch-engine": "workspace:*", "@prisma/get-platform": "workspace:*", "@swc/core": "1.3.32", diff --git a/packages/fetch-engine/package.json b/packages/fetch-engine/package.json index d3d7fab2e0d8..c948a5d1dc6d 100644 --- a/packages/fetch-engine/package.json +++ b/packages/fetch-engine/package.json @@ -15,7 +15,7 @@ "bugs": "https://github.com/prisma/prisma/issues", "enginesOverride": {}, "devDependencies": { - "@prisma/engines-version": "4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9", + "@prisma/engines-version": "4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a", "@swc/core": "1.3.32", "@swc/jest": "0.2.24", "@types/jest": "29.4.0", diff --git a/packages/internals/package.json b/packages/internals/package.json index 122dae132941..b195eed02dd5 100644 --- a/packages/internals/package.json +++ b/packages/internals/package.json @@ -47,7 +47,7 @@ "@prisma/fetch-engine": "workspace:*", "@prisma/generator-helper": "workspace:*", "@prisma/get-platform": "workspace:*", - "@prisma/prisma-fmt-wasm": "4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9", + "@prisma/prisma-fmt-wasm": "4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a", "archiver": "5.3.1", "arg": "5.0.2", "chalk": "4.1.2", diff --git a/packages/internals/src/engine-commands/getEngineVersion.ts b/packages/internals/src/engine-commands/getEngineVersion.ts index 655d21f5cd67..b3bfc1eb4bea 100644 --- a/packages/internals/src/engine-commands/getEngineVersion.ts +++ b/packages/internals/src/engine-commands/getEngineVersion.ts @@ -21,9 +21,11 @@ export async function getEngineVersion(enginePath?: string, binaryName?: BinaryT const QE = loadLibrary(enginePath, platformInfo) return `${BinaryType.QueryEngineLibrary} ${QE.version().commit}` } else { - const result = await execa(enginePath, ['--version']) - - return result.stdout + // E.g, when enginePath refers to "migration-engine", this returns + // `schema-engine-cli b952e556c57c90e9fe3152674d223600fba2a65d`. + // "migration-engine" will be publicly renamed as "schema-engine" in Prisma 5. + const { stdout } = await execa(enginePath, ['--version']) + return stdout.replace('schema-engine-cli', 'migration-engine-cli') } } diff --git a/packages/migrate/package.json b/packages/migrate/package.json index f0e098d72b35..eeedd686c600 100644 --- a/packages/migrate/package.json +++ b/packages/migrate/package.json @@ -17,7 +17,7 @@ "version": "latest" }, "devDependencies": { - "@prisma/engines-version": "4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9", + "@prisma/engines-version": "4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a", "@prisma/generator-helper": "workspace:*", "@prisma/internals": "workspace:*", "@swc/core": "1.3.32", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fbf88c7737db..2b289eb56a07 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -232,7 +232,7 @@ importers: '@prisma/debug': workspace:* '@prisma/engine-core': workspace:* '@prisma/engines': workspace:* - '@prisma/engines-version': 4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9 + '@prisma/engines-version': 4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a '@prisma/fetch-engine': workspace:* '@prisma/generator-helper': workspace:* '@prisma/get-platform': workspace:* @@ -300,7 +300,7 @@ importers: yo: 4.3.1 zx: 7.1.1 dependencies: - '@prisma/engines-version': 4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9 + '@prisma/engines-version': 4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a devDependencies: '@codspeed/benchmark.js-plugin': 1.0.2_benchmark@2.1.4 '@faker-js/faker': 7.6.0 @@ -460,7 +460,7 @@ importers: packages/engines: specifiers: '@prisma/debug': workspace:* - '@prisma/engines-version': 4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9 + '@prisma/engines-version': 4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a '@prisma/fetch-engine': workspace:* '@prisma/get-platform': workspace:* '@swc/core': 1.3.32 @@ -472,7 +472,7 @@ importers: typescript: 4.9.5 devDependencies: '@prisma/debug': link:../debug - '@prisma/engines-version': 4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9 + '@prisma/engines-version': 4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a '@prisma/fetch-engine': link:../fetch-engine '@prisma/get-platform': link:../get-platform '@swc/core': 1.3.32 @@ -486,7 +486,7 @@ importers: packages/fetch-engine: specifiers: '@prisma/debug': workspace:* - '@prisma/engines-version': 4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9 + '@prisma/engines-version': 4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a '@prisma/get-platform': workspace:* '@swc/core': 1.3.32 '@swc/jest': 0.2.24 @@ -532,7 +532,7 @@ importers: temp-dir: 2.0.0 tempy: 1.0.1 devDependencies: - '@prisma/engines-version': 4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9 + '@prisma/engines-version': 4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a '@swc/core': 1.3.32 '@swc/jest': 0.2.24_@swc+core@1.3.32 '@types/jest': 29.4.0 @@ -703,7 +703,7 @@ importers: '@prisma/fetch-engine': workspace:* '@prisma/generator-helper': workspace:* '@prisma/get-platform': workspace:* - '@prisma/prisma-fmt-wasm': 4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9 + '@prisma/prisma-fmt-wasm': 4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a '@swc/core': 1.2.204 '@swc/jest': 0.2.24 '@types/jest': 29.4.0 @@ -759,7 +759,7 @@ importers: '@prisma/fetch-engine': link:../fetch-engine '@prisma/generator-helper': link:../generator-helper '@prisma/get-platform': link:../get-platform - '@prisma/prisma-fmt-wasm': 4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9 + '@prisma/prisma-fmt-wasm': 4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a archiver: 5.3.1 arg: 5.0.2 chalk: 4.1.2 @@ -813,7 +813,7 @@ importers: packages/migrate: specifiers: '@prisma/debug': workspace:* - '@prisma/engines-version': 4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9 + '@prisma/engines-version': 4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a '@prisma/generator-helper': workspace:* '@prisma/get-platform': workspace:* '@prisma/internals': workspace:* @@ -867,7 +867,7 @@ importers: strip-indent: 3.0.0 ts-pattern: 4.0.5 devDependencies: - '@prisma/engines-version': 4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9 + '@prisma/engines-version': 4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a '@prisma/generator-helper': link:../generator-helper '@prisma/internals': link:../internals '@swc/core': 1.3.32 @@ -3395,8 +3395,8 @@ packages: engines: {node: '>=14'} dev: true - /@prisma/engines-version/4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9: - resolution: {integrity: sha512-KW+jzxMkWkQtyoR9L/hdXvIqXtePbkzY2LPRtW+57yijH0ARsngUn6A0AZA5TV1bmFmW0zMoRZTr7jgAEm7rIA==} + /@prisma/engines-version/4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a: + resolution: {integrity: sha512-52CL2exwNKKGHxHRDE6HiQ/8Aypn23HyTbMEkNgMKVQY9C01sjHiCaEHk0gNW23QdDMQFxsu6FEiqwaGrjadRw==} /@prisma/mini-proxy/0.6.4: resolution: {integrity: sha512-soUbebrPZfNg9zJCALHQAZd0E5tvcgi1zmyonHUe3Inqa6nMOGvdDWAcDUl1OHkZ22WDFpWkj5qOZTULfdNH2w==} @@ -3404,8 +3404,8 @@ packages: hasBin: true dev: true - /@prisma/prisma-fmt-wasm/4.13.0-13.a0b65ed66169fda245284840d7864e975e1bd3d9: - resolution: {integrity: sha512-32AwN6m+w614sLxxBkISHPpAPeT+8QCLtRVsEy+wFQvHLE2049dV+/WYpQE+ZFLmc5MRSBDasnJaEgMp6CEUcA==} + /@prisma/prisma-fmt-wasm/4.13.0-15.f8f78f335fd86dea323d7fbc581fdf500d745e9a: + resolution: {integrity: sha512-u003qYnUocHdgl0v7c5s0LhlQd6Z6ZgdN/dAZg9ZkL48a2OOFsJQXJnTh370HWpk8+Fd39GjepF1+nDCe5WugA==} dev: false /@prisma/studio-common/0.483.0: