From a69bff866df008939d3cf1decf1f07cc0df5c7aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Galeran?= Date: Wed, 4 Aug 2021 11:01:02 +0200 Subject: [PATCH] chore(sdk): remove useless function databaseTypeToConnectorType (#8555) Closes https://github.com/prisma/prisma/issues/8261 --- packages/cli/src/Init.ts | 9 ++------- packages/migrate/src/commands/DbPull.ts | 9 ++------- packages/sdk/src/convertCredentials.ts | 21 ++------------------- packages/sdk/src/migrateEngineCommands.ts | 9 ++------- 4 files changed, 8 insertions(+), 40 deletions(-) diff --git a/packages/cli/src/Init.ts b/packages/cli/src/Init.ts index 392ed997c676..69ffa207f676 100644 --- a/packages/cli/src/Init.ts +++ b/packages/cli/src/Init.ts @@ -8,10 +8,7 @@ import { link, logger, } from '@prisma/sdk' -import { - protocolToDatabaseType, - databaseTypeToConnectorType, -} from '@prisma/sdk/dist/convertCredentials' +import { protocolToConnectorType } from '@prisma/sdk/dist/convertCredentials' import { ConnectorType } from '@prisma/generator-helper' import chalk from 'chalk' import dotenv from 'dotenv' @@ -216,9 +213,7 @@ export class Init implements Command { } } - provider = databaseTypeToConnectorType( - protocolToDatabaseType(`${args['--url'].split(':')[0]}:`), - ) + provider = protocolToConnectorType(`${args['--url'].split(':')[0]}:`) url = args['--url'] } else if (args['--datasource-provider']) { const providerLowercase = args['--datasource-provider'].toLowerCase() diff --git a/packages/migrate/src/commands/DbPull.ts b/packages/migrate/src/commands/DbPull.ts index 4e2a54ddd814..0bd9fea14e87 100644 --- a/packages/migrate/src/commands/DbPull.ts +++ b/packages/migrate/src/commands/DbPull.ts @@ -17,10 +17,7 @@ import { } from '@prisma/sdk' import { formatms } from '../utils/formatms' import fs from 'fs' -import { - protocolToDatabaseType, - databaseTypeToConnectorType, -} from '@prisma/sdk/dist/convertCredentials' +import { protocolToConnectorType } from '@prisma/sdk/dist/convertCredentials' import { printDatasources } from '../utils/printDatasources' import { removeDatasource } from '../utils/removeDatasource' import { NoSchemaFoundError } from '../utils/errors' @@ -59,9 +56,7 @@ Instead of saving the result to the filesystem, you can also print it to stdout `) private printUrlAsDatasource(url: string): string { - const provider = databaseTypeToConnectorType( - protocolToDatabaseType(`${url.split(':')[0]}:`), - ) + const provider = protocolToConnectorType(`${url.split(':')[0]}:`) return printDatasources([ { diff --git a/packages/sdk/src/convertCredentials.ts b/packages/sdk/src/convertCredentials.ts index d067b38259f7..0df40d8b1128 100644 --- a/packages/sdk/src/convertCredentials.ts +++ b/packages/sdk/src/convertCredentials.ts @@ -82,7 +82,7 @@ export function uriToCredentials( ) } - const type = protocolToDatabaseType(uri.protocol) + const type = protocolToConnectorType(uri.protocol) // needed, as the URL implementation adds empty strings const exists = (str): boolean => str && str.length > 0 @@ -161,7 +161,7 @@ function databaseTypeToProtocol(databaseType: ConnectorType): string { } } -export function protocolToDatabaseType(protocol: string): ConnectorType { +export function protocolToConnectorType(protocol: string): ConnectorType { switch (protocol) { case 'postgresql:': case 'postgres:': @@ -180,20 +180,3 @@ export function protocolToDatabaseType(protocol: string): ConnectorType { throw new Error(`Unknown database type ${protocol}`) } - -export function databaseTypeToConnectorType( - databaseType: ConnectorType, -): ConnectorType { - switch (databaseType) { - case 'postgresql': - return 'postgresql' - case 'mysql': - return 'mysql' - case 'sqlite': - return 'sqlite' - case 'sqlserver': - return 'sqlserver' - } - - throw new Error(`Mongo is not yet supported`) -} diff --git a/packages/sdk/src/migrateEngineCommands.ts b/packages/sdk/src/migrateEngineCommands.ts index 1ba27a33fe34..652c22e14617 100644 --- a/packages/sdk/src/migrateEngineCommands.ts +++ b/packages/sdk/src/migrateEngineCommands.ts @@ -4,10 +4,7 @@ import fs from 'fs' import path from 'path' import { promisify } from 'util' import { getSchemaDir } from './cli/getSchema' -import { - databaseTypeToConnectorType, - protocolToDatabaseType, -} from './convertCredentials' +import { protocolToConnectorType } from './convertCredentials' import { resolveBinary } from './resolveBinary' const exists = promisify(fs.exists) @@ -91,9 +88,7 @@ export async function canConnectToDatabase( ) } - const provider = databaseTypeToConnectorType( - protocolToDatabaseType(`${connectionString.split(':')[0]}:`), - ) + const provider = protocolToConnectorType(`${connectionString.split(':')[0]}:`) if (provider === 'sqlite') { const sqliteExists = await doesSqliteDbExist(connectionString, cwd)