fix(client): cleanup

prisma · Jun 19, 2020 · 859b015 · 859b015
1 parent ac7167a
commit 859b015
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/packages/client/src/__tests__/runtime-tests/blog-env-postgresql/index.js b/src/packages/client/src/__tests__/runtime-tests/blog-env-postgresql/index.js
@@ -89,6 +89,16 @@ module.exports = async () => {
     ],
   })
 
+  // Make sure we're not leaking connection strings in node_modules
+  const internalDatasources = [
+    {
+      name: 'db',
+      connectorType: 'postgresql',
+    },
+  ]
+
+  assert.deepEqual(prisma.internalDatasources, internalDatasources)
+
   if (!prismaVersion || !prismaVersion.client) {
     throw new Error(`prismaVersion missing: ${JSON.stringify(prismaVersion)}`)
   }

diff --git a/src/packages/client/src/generation/TSClient.ts b/src/packages/client/src/generation/TSClient.ts
@@ -27,6 +27,7 @@ import {
 import { uniqueBy } from '../runtime/utils/uniqueBy'
 import { GetPrismaClientOptions } from '../runtime/getPrismaClient'
 import klona from 'klona'
+import { omit } from '../omit'
 
 const tab = 2
 
@@ -263,7 +264,7 @@ export class TSClient implements Generatable {
       generator,
       sqliteDatasourceOverrides,
       relativePath: path.relative(outputDir, schemaDir),
-      internalDatasources: datasources,
+      internalDatasources: datasources.map((d) => omit(d, ['url'])),
       clientVersion: this.options.clientVersion,
       engineVersion: this.options.engineVersion,
     }

diff --git a/src/packages/client/src/runtime/getPrismaClient.ts b/src/packages/client/src/runtime/getPrismaClient.ts
@@ -137,7 +137,7 @@ export interface GetPrismaClientOptions {
   sqliteDatasourceOverrides?: DatasourceOverwrite[]
   relativePath: string
   dirname: string
-  internalDatasources: InternalDatasource[]
+  internalDatasources: Omit<InternalDatasource, 'url'>[]
   clientVersion?: string
   engineVersion?: string
 }
@@ -153,7 +153,7 @@ export function getPrismaClient(config: GetPrismaClientOptions): any {
     connectionPromise?: Promise<any>
     disconnectionPromise?: Promise<any>
     engineConfig: EngineConfig
-    internalDatasources: InternalDatasource[]
+    internalDatasources: Omit<InternalDatasource, 'url'>[]
     private errorFormat: ErrorFormat
     private measurePerformance: boolean
     private hooks?: Hooks