fix(client): version. Closes #696

src/packages/client/src/generation/TSClient.ts

@@ -69,9 +69,6 @@ const {
 const path = require('path')
 const debug = debugLib('prisma-client')
 
-debug("Client Version ${clientVersion}")
-debug("Engine Version ${engineVersion}")
-
 /**
  * Prisma Client JS version: ${clientVersion}
  * Query Engine version: ${engineVersion}
@@ -268,6 +265,7 @@ export class TSClient implements Generatable {
       relativePath: path.relative(outputDir, schemaDir),
       internalDatasources: datasources,
       clientVersion: this.options.clientVersion,
+      engineVersion: this.options.engineVersion,
     }
 
     return `${commonCodeJS(this.options)}

src/packages/client/src/runtime/getPrismaClient.ts

@@ -136,6 +136,7 @@ export interface GetPrismaClientOptions {
   dirname: string
   internalDatasources: InternalDatasource[]
   clientVersion?: string
+  engineVersion?: string
 }
 
 // TODO: We **may** be able to get real types. However, we have both a bootstrapping
@@ -307,7 +308,20 @@ export function getPrismaClient(config: GetPrismaClientOptions): any {
       if (this.connectionPromise) {
         return this.connectionPromise
       }
-      this.connectionPromise = this.engine.start()
+      this.connectionPromise = (async () => {
+        await this.engine.start()
+
+        let { engineVersion, clientVersion } = config
+        if (
+          this.engineConfig.prismaPath ||
+          process.env.QUERY_ENGINE_BINARY_PATH ||
+          !engineVersion
+        ) {
+          engineVersion = await this.engine.version()
+        }
+        debug(`Client Version ${clientVersion}`)
+        debug(`Engine Version ${engineVersion}`)
+      })()
       return this.connectionPromise
     }
     /**

src/packages/engine-core/package.json

@@ -39,6 +39,7 @@
     "bent": "^7.1.2",
     "chalk": "^3.0.0",
     "cross-fetch": "^3.0.4",
+    "execa": "^4.0.2",
     "fast-json-stringify": "^2.0.0",
     "get-stream": "^5.1.0",
     "indent-string": "^4.0.0",

src/packages/engine-core/src/NodeEngine.ts

@@ -23,6 +23,7 @@ import { spawn, ChildProcessWithoutNullStreams } from 'child_process'
 import byline from './byline'
 import { H1Client } from './h1client'
 import pRetry from 'p-retry'
+import execa from 'execa'
 
 const debug = debugLib('engine')
 const exists = promisify(fs.exists)
@@ -724,6 +725,18 @@ ${this.lastErrorLog.fields.file}:${this.lastErrorLog.fields.line}:${this.lastErr
     })
   }
 
+  async version() {
+    const prismaPath = await this.getPrismaPath()
+
+    const result = await execa(prismaPath, ['--version'], {
+      env: {
+        ...process.env,
+      },
+    })
+
+    return result.stdout
+  }
+
   async request<T>(query: string): Promise<T> {
     await this.start()