mindol1004/vanillameta
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: update cockroach connections database.service

Browse Source
This commit is contained in:
손승우
2022-11-07 17:05:43 +09:00
parent 2480fa8888
commit 1752c2b6fa
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend-api/src/connection/connection.service.ts
View File

@@ -64,20 +64,22 @@ export class ConnectionService {
* @param createDatabaseDto
*/
async testConnection(createDatabaseDto: CreateDatabaseDto) {
const connectioninfo = createDatabaseDto.connectionConfig;
const url = `postgresql://${connectioninfo['user']}:${connectioninfo['password']}@${connectioninfo['host']}:${connectioninfo['port']}/${connectioninfo['database']}?sslmode=verify-full&options=--cluster%3Dvanillameta-cockroach-3010`
const engine =
createDatabaseDto.engine === 'bigquery' ? BigQueryClient : createDatabaseDto.engine;
createDatabaseDto.engine === 'cockroachdb' ? connectioninfo['connectionString'] = url : createDatabaseDto
if(createDatabaseDto.engine === 'cockroachdb') {
const connectioninfo = createDatabaseDto.connectionConfig;
const cockroach_url = `postgresql://${connectioninfo['user']}:${connectioninfo['password']}@${connectioninfo['host']}:${connectioninfo['port']}/${connectioninfo['database']}?sslmode=verify-full&options=--cluster%3Dvanillameta-cockroach-3010`
connectioninfo['connectionString'] = cockroach_url
}
const connectionConfig = {
client: engine,
connection: createDatabaseDto.connectionConfig,
useNullAsDefault: true,
};
console.log(connectionConfig)
// createDatabaseDto.connectionConfig = JSON.stringify(connectionConfig);
// console.log(createDatabaseDto)

9
backend-api/src/database/database.service.ts
View File

@@ -36,9 +36,12 @@ export class DatabaseService {
* @param createDatabaseDto
*/
async create(createDatabaseDto: CreateDatabaseDto) {
const connectioninfo = createDatabaseDto.connectionConfig;
const url = `postgresql://${connectioninfo['user']}:${connectioninfo['password']}@${connectioninfo['host']}:${connectioninfo['port']}/${connectioninfo['database']}?sslmode=verify-full&options=--cluster%3Dvanillameta-cockroach-3010`
createDatabaseDto.engine === 'cockroachdb' ? connectioninfo['connectionString'] = url : createDatabaseDto
if(createDatabaseDto.engine === 'cockroachdb') {
const connectioninfo = createDatabaseDto.connectionConfig;
const cockroach_url = `postgresql://${connectioninfo['user']}:${connectioninfo['password']}@${connectioninfo['host']}:${connectioninfo['port']}/${connectioninfo['database']}?sslmode=verify-full&options=--cluster%3Dvanillameta-cockroach-3010`
connectioninfo['connectionString'] = cockroach_url
}
const databaseDto = Database.toDto(createDatabaseDto);
const connectionConfig = {