fix: pass env to Node-API and remove patchJest (#7581)

prisma · Jun 11, 2021 · f284cc5 · f284cc5
1 parent 4f4ff65
commit f284cc5
Show file tree

Hide file tree

Showing 13 changed files with 89 additions and 121 deletions.
diff --git a/src/packages/cli/package.json b/src/packages/cli/package.json
@@ -125,7 +125,7 @@
     "precommit": "lint-staged"
   },
   "dependencies": {
-    "@prisma/engines": "2.25.0-14.89926e7ecbebb89657ae2b56ab3454364ad7b5c5"
+    "@prisma/engines": "2.25.0-24.d580c0e2929f7d38e35a3ee8584e8daf7ffdfacd"
   },
   "lint-staged": {
     "*.ts": [

diff --git a/src/packages/client/helpers/patchJest.js b/src/packages/client/helpers/patchJest.js
diff --git a/src/packages/client/package.json b/src/packages/client/package.json
@@ -37,7 +37,7 @@
   "bugs": "https://github.com/prisma/prisma/issues",
   "scripts": {
     "build": "node helpers/build.js",
-    "test": "node helpers/patchJest.js && jest --forceExit",
+    "test": "jest --forceExit",
     "format": "prettier --write .",
     "lint": "eslint --cache --fix --ext .ts .",
     "lint-ci": "eslint --ext .ts .",
@@ -59,7 +59,7 @@
   "devDependencies": {
     "@prisma/debug": "workspace:*",
     "@prisma/engine-core": "workspace:*",
-    "@prisma/engines": "2.25.0-14.89926e7ecbebb89657ae2b56ab3454364ad7b5c5",
+    "@prisma/engines": "2.25.0-24.d580c0e2929f7d38e35a3ee8584e8daf7ffdfacd",
     "@prisma/fetch-engine": "workspace:*",
     "@prisma/generator-helper": "workspace:*",
     "@prisma/get-platform": "workspace:*",
@@ -103,7 +103,6 @@
     "pluralize": "8.0.0",
     "prettier": "2.3.1",
     "replace-string": "3.1.0",
-    "resolve-from": "5.0.0",
     "rimraf": "3.0.2",
     "rollup": "2.51.1",
     "rollup-plugin-dts": "3.0.2",
@@ -127,7 +126,7 @@
     }
   },
   "dependencies": {
-    "@prisma/engines-version": "2.25.0-14.89926e7ecbebb89657ae2b56ab3454364ad7b5c5"
+    "@prisma/engines-version": "2.25.0-24.d580c0e2929f7d38e35a3ee8584e8daf7ffdfacd"
   },
   "lint-staged": {
     "*.ts": [

diff --git a/src/packages/engine-core/package.json b/src/packages/engine-core/package.json
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@prisma/debug": "workspace:*",
-    "@prisma/engines": "2.25.0-14.89926e7ecbebb89657ae2b56ab3454364ad7b5c5",
+    "@prisma/engines": "2.25.0-24.d580c0e2929f7d38e35a3ee8584e8daf7ffdfacd",
     "@prisma/generator-helper": "workspace:*",
     "@prisma/get-platform": "workspace:*",
     "chalk": "^4.0.0",

diff --git a/src/packages/engine-core/src/NAPIEngine.ts b/src/packages/engine-core/src/NAPIEngine.ts
@@ -188,6 +188,7 @@ You may have to run ${chalk.greenBright(
           this.engine = new this.QueryEngine(
             {
               datamodel: this.datamodel,
+              env: process.env,
               logQueries: this.config.logQueries ?? false,
               ignoreEnvVarErrors: false,
               datasourceOverrides: this.datasourceOverrides,
@@ -359,6 +360,7 @@ You may have to run ${chalk.greenBright(
       datamodel: this.datamodel,
       datasourceOverrides: this.datasourceOverrides,
       ignoreEnvVarErrors: true,
+      env: process.env,
     })
   }
   version(forceRun?: boolean): string {

diff --git a/src/packages/engine-core/src/napi-types.ts b/src/packages/engine-core/src/napi-types.ts
@@ -43,6 +43,7 @@ export type QueryEngineConfig = {
   logQueries: boolean
   ignoreEnvVarErrors: boolean
   datasourceOverrides?: Record<string, string>
+  env: NodeJS.ProcessEnv | Record<string, string>
   logLevel: QueryEngineLogLevel
   telemetry?: QueryEngineTelemetry
 }
@@ -70,6 +71,7 @@ export type GetConfigOptions = {
   datamodel: string
   ignoreEnvVarErrors: boolean
   datasourceOverrides: Record<string, string>
+  env: NodeJS.ProcessEnv | Record<string, string>
 }
 export type GetDMMFOptions = {
   datamodel: string

diff --git a/src/packages/fetch-engine/package.json b/src/packages/fetch-engine/package.json
@@ -14,7 +14,7 @@
   ],
   "bugs": "https://github.com/prisma/prisma/issues",
   "devDependencies": {
-    "@prisma/engines-version": "2.25.0-14.89926e7ecbebb89657ae2b56ab3454364ad7b5c5",
+    "@prisma/engines-version": "2.25.0-24.d580c0e2929f7d38e35a3ee8584e8daf7ffdfacd",
     "@types/find-cache-dir": "3.2.0",
     "@types/jest": "26.0.23",
     "@types/node": "12.20.15",

diff --git a/src/packages/migrate/package.json b/src/packages/migrate/package.json
@@ -16,7 +16,7 @@
     "version": "latest"
   },
   "devDependencies": {
-    "@prisma/engines-version": "2.25.0-14.89926e7ecbebb89657ae2b56ab3454364ad7b5c5",
+    "@prisma/engines-version": "2.25.0-24.d580c0e2929f7d38e35a3ee8584e8daf7ffdfacd",
     "@prisma/generator-helper": "workspace:*",
     "@prisma/sdk": "workspace:*",
     "@types/diff": "4.0.2",

diff --git a/src/packages/migrate/src/__tests__/rpc.test.ts b/src/packages/migrate/src/__tests__/rpc.test.ts
@@ -27,17 +27,12 @@ it('evaluateDataLoss - schema-only-sqlite', async () => {
   })
 
   await expect(result).resolves.toMatchInlineSnapshot(`
-          Object {
-            migrationSteps: Array [
-              CREATE TABLE "Blog" (
-              "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-              "viewCount20" INTEGER NOT NULL
-          ),
-            ],
-            unexecutableSteps: Array [],
-            warnings: Array [],
-          }
-        `)
+Object {
+  migrationSteps: 1,
+  unexecutableSteps: Array [],
+  warnings: Array [],
+}
+`)
   migrate.stop()
 })
 
@@ -53,12 +48,12 @@ it('evaluateDataLoss - existing-db-1-migration', async () => {
   })
 
   await expect(result).resolves.toMatchInlineSnapshot(`
-          Object {
-            migrationSteps: Array [],
-            unexecutableSteps: Array [],
-            warnings: Array [],
-          }
-        `)
+Object {
+  migrationSteps: 0,
+  unexecutableSteps: Array [],
+  warnings: Array [],
+}
+`)
   migrate.stop()
 })
 
@@ -414,13 +409,18 @@ it('devDiagnostic - reset because drift', async () => {
     migrationsDirectoryPath: migrate.migrationsDirectoryPath,
   })
   await expect(result).resolves.toMatchInlineSnapshot(`
-          Object {
-            action: Object {
-              reason: Drift detected: Your database schema is not in sync with your migration history.,
-              tag: reset,
-            },
-          }
-        `)
+Object {
+  action: Object {
+    reason: Drift detected: Your database schema is not in sync with your migration history.
+
+[+] Added tables
+  - Blog
+  - _Migration
+,
+    tag: reset,
+  },
+}
+`)
 
   migrate.stop()
 })
diff --git a/src/packages/sdk/package.json b/src/packages/sdk/package.json
@@ -18,7 +18,7 @@
     "format": "prettier --write .",
     "lint": "eslint --cache --fix --ext .ts .",
     "lint-ci": "eslint --ext .ts .",
-    "test": "node ./scripts/patchJest && jest",
+    "test": "jest --verbose --forceExit",
     "precommit": "lint-staged"
   },
   "files": [
@@ -48,7 +48,7 @@
   "dependencies": {
     "@prisma/debug": "workspace:*",
     "@prisma/engine-core": "workspace:*",
-    "@prisma/engines": "2.25.0-14.89926e7ecbebb89657ae2b56ab3454364ad7b5c5",
+    "@prisma/engines": "2.25.0-24.d580c0e2929f7d38e35a3ee8584e8daf7ffdfacd",
     "@prisma/fetch-engine": "workspace:*",
     "@prisma/generator-helper": "workspace:*",
     "@prisma/get-platform": "workspace:*",
@@ -69,7 +69,6 @@
     "node-fetch": "2.6.1",
     "p-map": "^4.0.0",
     "read-pkg-up": "^7.0.1",
-    "resolve-from": "^5.0.0",
     "resolve-pkg": "^2.0.0",
     "rimraf": "^3.0.2",
     "shell-quote": "^1.7.2",

diff --git a/src/packages/sdk/scripts/patchJest.js b/src/packages/sdk/scripts/patchJest.js
diff --git a/src/packages/sdk/src/engine-commands/getConfig.ts b/src/packages/sdk/src/engine-commands/getConfig.ts
@@ -74,6 +74,7 @@ async function getConfigNAPI(
       datamodel: options.datamodel,
       datasourceOverrides: {},
       ignoreEnvVarErrors: options.ignoreEnvVarErrors ?? false,
+      env: process.env,
     })
   } catch (e) {
     let error