Merge pull request #255 from qianmoQ/1.22.0-SNAPSHOT

qianmoQ · web-flow · commit 2a74568614ea · 2022-08-07T14:48:46.000+08:00
1.22.0 snapshot
diff --git a/package.json b/package.json
@@ -109,7 +109,7 @@
     "cfonts": "^3.1.0",
     "chalk": "^4.1.1",
     "cross-env": "^7.0.3",
-    "electron": "16.2.0",
+    "electron": "20.0.1",
     "electron-builder": "23.0.3",
     "electron-reload": "1.5.0",
     "eslint": "7.29.0",
@@ -124,7 +124,7 @@
     "karma-jasmine-html-reporter": "^2.0.0",
     "ts-loader": "^9.2.3",
     "typescript": "^4.2.4",
-    "wait-on": "^5.3.0",
+    "wait-on": "6.0.1",
     "webpack": "5.73.0",
     "webpack-cli": "4.7.2"
   },
diff --git a/src/renderer/app/layout/layout.module.ts b/src/renderer/app/layout/layout.module.ts
@@ -25,6 +25,9 @@ import { MysqlPlugin } from "@renderer/plugin/mysql.plugin";
 import { ConfigFactory } from "@renderer/factory/config.factory";
 import { ConfigToken } from "@renderer/token/config.token";
 import { MysqlConfig } from "@renderer/config/mysql.config";
+import { ClickHouseConfig } from "@renderer/config/clickhouse.config";
+import { PostgreSQLConfig } from "@renderer/config/postgresql.config";
+import { PostgreSQLPlugin } from "@renderer/plugin/postgresql.plugin";
 
 const httpLoaderFactory = (http: HttpClient): TranslateHttpLoader =>
   new TranslateHttpLoader(http, './renderer/assets/i18n/', '.json');
@@ -57,13 +60,17 @@ const httpLoaderFactory = (http: HttpClient): TranslateHttpLoader =>
     FactoryService,
     MySQLService,
     PostgresqlService,
+    /* Plugin */
     PluginFactory,
     {provide: PluginToken, useClass: ClickHousePlugin, multi: true},
     {provide: PluginToken, useClass: ElasticsearchPlugin, multi: true},
     {provide: PluginToken, useClass: MysqlPlugin, multi: true},
+    {provide: PluginToken, useClass: PostgreSQLPlugin, multi: true},
     /* Config */
     ConfigFactory,
-    {provide: ConfigToken, useClass: MysqlConfig, multi: true}
+    {provide: ConfigToken, useClass: MysqlConfig, multi: true},
+    {provide: ConfigToken, useClass: ClickHouseConfig, multi: true},
+    {provide: ConfigToken, useClass: PostgreSQLConfig, multi: true},
   ]
 })
 export class LayoutModule {
diff --git a/src/renderer/components/database/rename/database.rename.component.ts b/src/renderer/components/database/rename/database.rename.component.ts
@@ -6,6 +6,7 @@ import { DatasourceService } from '@renderer/services/management/datasource.serv
 import { StringUtils } from '@renderer/utils/string.utils';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { DatabaseService } from '@renderer/services/management/database.service';
+import { DatabaseEnum } from "@renderer/enum/database.enum";
 
 @Component({
   selector: 'app-component-rename-database',
@@ -37,14 +38,16 @@ export class DatabaseRenameComponent extends BaseComponent implements AfterViewI
     this.checkStatus = true;
     const request = new RequestModel();
     request.config = await this.dataSourceService.getByAliasAsync(this.config.value);
-    this.databaseService.getDatabase(request, this.value)
-    .then(response => {
-      if (response.status) {
-        this.checkStatus = response.data?.columns[0]?.isSupport;
-      } else {
-        this.messageService.error(response.message);
-      }
-    });
+    if (request.config.type === DatabaseEnum.clickhosue) {
+      this.databaseService.getDatabase(request, this.value)
+        .then(response => {
+          if (response.status) {
+            this.checkStatus = response.data?.columns[0]?.isSupport;
+          } else {
+            this.messageService.error(response.message);
+          }
+        });
+    }
   }
 
   handlerValidate() {
@@ -60,15 +63,15 @@ export class DatabaseRenameComponent extends BaseComponent implements AfterViewI
     const request = new RequestModel();
     request.config = await this.dataSourceService.getByAliasAsync(this.config.value);
     this.databaseService.rename(request, this.value, this.inputValue)
-    .then(response => {
-      if (response.status) {
-        this.messageService.success(response.message);
-        this.config.status = true;
-        this.emitter.emit(this.config);
-      } else {
-        this.messageService.error(response.message);
-      }
-      this.loading.button = false;
-    });
+      .then(response => {
+        if (response.status) {
+          this.messageService.success(response.message);
+          this.config.status = true;
+          this.emitter.emit(this.config);
+        } else {
+          this.messageService.error(response.message);
+        }
+        this.loading.button = false;
+      });
   }
 }
diff --git a/src/renderer/config/base.config.ts b/src/renderer/config/base.config.ts
@@ -26,4 +26,6 @@ export interface BaseConfig {
   showCreateDatabase: string;
   showTableWithSize: string;
   getCharacterAndCollation: string;
+  // database
+  databaseRename: string;
 }
diff --git a/src/renderer/config/clickhouse.config.ts b/src/renderer/config/clickhouse.config.ts
@@ -0,0 +1,22 @@
+import { ConfigInterface } from "@renderer/interfaces/config.interface";
+import { Injectable } from "@angular/core";
+import { Factory } from "@renderer/factory";
+import { DatabaseEnum } from "@renderer/enum/database.enum";
+import { ClickhouseConfig } from "@renderer/config/plugin/clickhouse.config";
+
+@Injectable()
+export class ClickHouseConfig implements ConfigInterface {
+  private readonly config: ClickhouseConfig;
+
+  constructor() {
+    this.config = Factory.create(ClickhouseConfig);
+  }
+
+  getName(): DatabaseEnum {
+    return DatabaseEnum.clickhosue;
+  }
+
+  getStatement(key: string): string {
+    return this.config[key];
+  }
+}
diff --git a/src/renderer/config/operation.config.ts b/src/renderer/config/operation.config.ts
@@ -51,7 +51,11 @@ export class OperationConfig {
         actions: [OperationEnum.structure],
         supportedSource: [DatabaseEnum.clickhosue, DatabaseEnum.mysql]
       },
-      {type: TypeEnum.database, actions: [OperationEnum.rename], supportedSource: [DatabaseEnum.clickhosue]}
+      {
+        type: TypeEnum.database,
+        actions: [OperationEnum.rename],
+        supportedSource: [DatabaseEnum.clickhosue, DatabaseEnum.postgresql]
+      }
     ];
     opertions.push(database);
     const table = new OperationModel();
diff --git a/src/renderer/config/plugin/clickhouse.config.ts b/src/renderer/config/plugin/clickhouse.config.ts
@@ -172,4 +172,5 @@ ALTER TABLE {0} RENAME COLUMN {1} TO {2}
 ALTER TABLE {0} COMMENT COLUMN {1} '{2}'
   `;
   getCharacterAndCollation: string;
+  databaseRename = 'RENAME DATABASE `{0}` TO `{1}`';
 }
diff --git a/src/renderer/config/plugin/druid.config.ts b/src/renderer/config/plugin/druid.config.ts
@@ -35,4 +35,5 @@ export class DruidConfig implements BaseConfig {
   tableSchemaFetchAll: string;
   version = `SELECT '-' AS version`;
   getCharacterAndCollation: string;
+  databaseRename: string;
 }
diff --git a/src/renderer/config/plugin/elasticsearch.config.ts b/src/renderer/config/plugin/elasticsearch.config.ts
@@ -28,4 +28,5 @@ export class ElasticsearchConfig implements BaseConfig {
   tableSchemaFetchAll: string;
   version = `SELECT 1 AS version`;
   getCharacterAndCollation: string;
+  databaseRename: string;
 }
diff --git a/src/renderer/config/plugin/mysql.config.ts b/src/renderer/config/plugin/mysql.config.ts
@@ -130,4 +130,5 @@ ALTER TABLE {0} CHANGE COLUMN {1} {2} {3} COMMENT '{4}'
     GROUP BY CHARACTER_SET_NAME
     ORDER BY CHARACTER_SET_NAME ASC
   `;
+  databaseRename: string;
 }
diff --git a/src/renderer/config/plugin/postgresql.config.ts b/src/renderer/config/plugin/postgresql.config.ts
@@ -96,4 +96,5 @@ export class PostgresqlConfig implements BaseConfig {
   columnRename: string;
   columnAddComment: string;
   getCharacterAndCollation: string;
+  databaseRename = `ALTER DATABASE "{0}" RENAME TO "{1}"`;
 }
diff --git a/src/renderer/config/plugin/presto.config.ts b/src/renderer/config/plugin/presto.config.ts
@@ -67,4 +67,5 @@ export class PrestoConfig implements BaseConfig {
   showTableWithSize: string;
   columnRename: string;
   columnAddComment: string;
+  databaseRename: string;
 }
diff --git a/src/renderer/config/postgresql.config.ts b/src/renderer/config/postgresql.config.ts
@@ -0,0 +1,21 @@
+import { ConfigInterface } from "@renderer/interfaces/config.interface";
+import { DatabaseEnum } from "@renderer/enum/database.enum";
+import { Injectable } from "@angular/core";
+import { PostgresqlConfig } from "@renderer/config/plugin/postgresql.config";
+
+@Injectable()
+export class PostgreSQLConfig implements ConfigInterface {
+  private readonly config: PostgresqlConfig;
+
+  constructor() {
+    this.config = new PostgresqlConfig();
+  }
+
+  getName(): DatabaseEnum {
+    return DatabaseEnum.postgresql;
+  }
+
+  getStatement(key: string): string {
+    return this.config[key];
+  }
+}
diff --git a/src/renderer/plugin/postgresql.plugin.ts b/src/renderer/plugin/postgresql.plugin.ts
@@ -0,0 +1,91 @@
+import { PluginInterface } from "@renderer/interfaces/plugin.interface";
+import { DatabaseEnum } from "@renderer/enum/database.enum";
+import { Injectable } from "@angular/core";
+import { BasicService } from "@renderer/services/system/basic.service";
+import { SystemBasicModel } from "@renderer/model/system.model";
+import { RequestModel } from "@renderer/model/request.model";
+import { ResponseDataModel, ResponseModel } from "@renderer/model/response.model";
+import { StringUtils } from "@renderer/utils/string.utils";
+import { timeout, TimeoutError } from 'promise-timeout';
+
+const {Client} = require('pg');
+
+@Injectable()
+export class PostgreSQLPlugin implements PluginInterface {
+  constructor(private basicService: BasicService) {
+  }
+
+  private getConfig(): SystemBasicModel {
+    return this.basicService.get() === null ? new SystemBasicModel() : this.basicService.get();
+  }
+
+  getName(): DatabaseEnum {
+    return DatabaseEnum.postgresql;
+  }
+
+  getResponse(request: RequestModel, sql?: string): Promise<ResponseModel> {
+    const configure = request.config;
+    const start = new Date().getTime();
+    const network = this.getConfig().network * 1000;
+    const hasAuthentication = (StringUtils.isNotEmpty(configure.username) && StringUtils.isNotEmpty(configure.password));
+    let connection;
+    if (hasAuthentication) {
+      connection = new Client({
+        host: configure.host,
+        port: configure.port,
+        user: configure.username,
+        password: configure.password,
+        database: configure.database
+      });
+    } else {
+      connection = new Client({
+        host: configure.host,
+        port: configure.port,
+        database: configure.database
+      });
+    }
+    const response = new ResponseModel();
+    const responseData = new ResponseDataModel();
+    const somePromise = new Promise((resolve) => {
+      connection.connect().catch(error => {
+        response.status = false;
+        response.message = error?.message;
+        resolve(response);
+      })
+      connection.query(sql, function (error, results) {
+        if (error) {
+          response.status = false;
+          response.message = error?.message;
+          resolve(response);
+        } else {
+          responseData.headers = results?.fields;
+          responseData.columns = results?.rows;
+          const end = new Date().getTime();
+          const statistics = {
+            elapsed: end - start
+          };
+          responseData.statistics = statistics;
+          responseData.rows = results?.rowCount;
+          response.status = true;
+          response.data = responseData;
+          resolve(response);
+        }
+        connection.end();
+        console.log('Connection ', configure.host, ' is closed');
+      });
+    });
+    return timeout(somePromise, network)
+      .then((thing) => {
+        return thing;
+      })
+      .catch((err) => {
+        response.status = false;
+        if (err instanceof TimeoutError) {
+          response.message = `Promise timed out after ${this.getConfig().network} ms`;
+        } else {
+          response.message = err;
+        }
+        return response;
+      });
+  }
+}
diff --git a/src/renderer/services/forward.service.ts b/src/renderer/services/forward.service.ts
@@ -12,6 +12,7 @@ import { FactoryService } from "@renderer/services/factory.service";
 import { MySQLService } from "@renderer/services/plugin/mysql.service";
 import { PostgresqlService } from "@renderer/services/plugin/postgresql.service";
 import { PluginFactory } from "@renderer/factory/plugin.factory";
+import { ConfigFactory } from "@renderer/factory/config.factory";
 
 export class ForwardService {
   constructor(
@@ -22,7 +23,8 @@ export class ForwardService {
     protected prestoService?: PrestoService,
     protected mysqlService?: MySQLService,
     protected postgresqlService?: PostgresqlService,
-    protected pluginFactory?: PluginFactory
+    protected pluginFactory?: PluginFactory,
+    protected configFactory?: ConfigFactory
   ) {
   }
 
diff --git a/src/renderer/services/management/database.service.ts b/src/renderer/services/management/database.service.ts
@@ -10,6 +10,8 @@ import { ForwardService } from '@renderer/services/forward.service';
 import { FactoryService } from "@renderer/services/factory.service";
 import { MySQLService } from "@renderer/services/plugin/mysql.service";
 import { PostgresqlService } from "@renderer/services/plugin/postgresql.service";
+import { PluginFactory } from "@renderer/factory/plugin.factory";
+import { ConfigFactory } from "@renderer/factory/config.factory";
 
 @Injectable()
 export class DatabaseService extends ForwardService implements BaseService {
@@ -18,12 +20,14 @@ export class DatabaseService extends ForwardService implements BaseService {
               sshService: SshService,
               basicService: BasicService,
               mysqlService: MySQLService,
-              postgresqlService: PostgresqlService) {
-    super(basicService, factoryService, httpService, sshService, null, mysqlService, postgresqlService);
+              postgresqlService: PostgresqlService,
+              pluginFactory: PluginFactory,
+              configFactory: ConfigFactory) {
+    super(basicService, factoryService, httpService, sshService, null, mysqlService, postgresqlService, pluginFactory, configFactory);
   }
 
   getResponse(request: RequestModel, sql?: string): Promise<ResponseModel> {
-    return this.forward(request, sql);
+    return this.pluginFactory.createService(request.config.type).getResponse(request, sql);
   }
 
   getAll(request: RequestModel): Promise<ResponseModel> {
@@ -48,7 +52,8 @@ export class DatabaseService extends ForwardService implements BaseService {
   }
 
   rename(request: RequestModel, source: string, target: string): Promise<ResponseModel> {
-    const sql = StringUtils.format('RENAME DATABASE `{0}` TO `{1}`', [source, target]);
+    const sourceSql = this.configFactory.createConfig(request.config.type).getStatement('databaseRename');
+    const sql = StringUtils.format(sourceSql, [source, target]);
     return this.getResponse(request, sql);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,6 @@ export interface BaseConfig {`
`26`	`26`	`showCreateDatabase: string;`
`27`	`27`	`showTableWithSize: string;`
`28`	`28`	`getCharacterAndCollation: string;`
	`29`	`+ // database`
	`30`	`+ databaseRename: string;`
`29`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,4 +172,5 @@ ALTER TABLE {0} RENAME COLUMN {1} TO {2}`
`172`	`172`	`ALTER TABLE {0} COMMENT COLUMN {1} '{2}'`
`173`	`173`	`;
`174`	`174`	`getCharacterAndCollation: string;`
	`175`	+ databaseRename = 'RENAME DATABASE `{0}` TO `{1}`';
`175`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,5 @@ export class DruidConfig implements BaseConfig {`
`35`	`35`	`tableSchemaFetchAll: string;`
`36`	`36`	version = `SELECT '-' AS version`;
`37`	`37`	`getCharacterAndCollation: string;`
	`38`	`+ databaseRename: string;`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,5 @@ export class ElasticsearchConfig implements BaseConfig {`
`28`	`28`	`tableSchemaFetchAll: string;`
`29`	`29`	version = `SELECT 1 AS version`;
`30`	`30`	`getCharacterAndCollation: string;`
	`31`	`+ databaseRename: string;`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,4 +130,5 @@ ALTER TABLE {0} CHANGE COLUMN {1} {2} {3} COMMENT '{4}'`
`130`	`130`	`GROUP BY CHARACTER_SET_NAME`
`131`	`131`	`ORDER BY CHARACTER_SET_NAME ASC`
`132`	`132`	`;
	`133`	`+ databaseRename: string;`
`133`	`134`	`}`