test: update unit and integration tests

Author: karenc-bq

common/lib/client_wrapper.ts

@@ -21,7 +21,7 @@ export interface ClientWrapper {
   readonly hostInfo: HostInfo;
   readonly properties: Map<string, any>;
 
-  query(sql: string): Promise<any>;
+  query(sql: any): Promise<any>;
 
   end(): Promise<void>;
 

common/lib/mysql_client_wrapper.ts

@@ -39,7 +39,7 @@ export class MySQLClientWrapper implements ClientWrapper {
     this.properties = properties;
   }
 
-  query(sql: string): Promise<any> {
+  query(sql: any): Promise<any> {
     return this.client?.query(sql);
   }
 

common/lib/pg_client_wrapper.ts

@@ -38,8 +38,8 @@ export class PgClientWrapper implements ClientWrapper {
     this.properties = properties;
   }
 
-  query(sql: string): Promise<any> {
-    return this.client.query(sql);
+  query(sql: any): Promise<any> {
+    return this.client?.query(sql);
   }
 
   end(): Promise<void> {

mysql/lib/dialect/mysql2_driver_dialect.ts

@@ -16,7 +16,6 @@
 
 import { DriverDialect } from "../../../common/lib/driver_dialect/driver_dialect";
 import { ClientWrapper } from "../../../common/lib/client_wrapper";
-import { ClientUtils } from "../../../common/lib/utils/client_utils";
 import { createConnection, PoolOptions } from "mysql2/promise";
 import { WrapperProperties } from "../../../common/lib/wrapper_property";
 import { AwsPoolConfig } from "../../../common/lib/aws_pool_config";
@@ -32,8 +31,8 @@ export class MySQL2DriverDialect implements DriverDialect {
     return this.dialectName;
   }
 
-  connect(hostInfo: HostInfo, props: Map<string, any>): Promise<ClientWrapper> {
-    const targetClient = createConnection(WrapperProperties.removeWrapperProperties(props));
+  async connect(hostInfo: HostInfo, props: Map<string, any>): Promise<ClientWrapper> {
+    const targetClient = await createConnection(WrapperProperties.removeWrapperProperties(props));
     return Promise.resolve(new MySQLClientWrapper(targetClient, hostInfo, props));
   }
 

mysql/lib/dialect/mysql_database_dialect.ts

@@ -17,9 +17,7 @@
 import { DatabaseDialect, DatabaseType } from "../../../common/lib/database_dialect/database_dialect";
 import { HostListProviderService } from "../../../common/lib/host_list_provider_service";
 import { HostListProvider } from "../../../common/lib/host_list_provider/host_list_provider";
-import {
-  ConnectionStringHostListProvider
-} from "../../../common/lib/host_list_provider/connection_string_host_list_provider";
+import { ConnectionStringHostListProvider } from "../../../common/lib/host_list_provider/connection_string_host_list_provider";
 import { AwsWrapperError } from "../../../common/lib/utils/errors";
 import { DatabaseDialectCodes } from "../../../common/lib/database_dialect/database_dialect_codes";
 import { TransactionIsolationLevel } from "../../../common/lib/utils/transaction_isolation_level";

pg/lib/client.ts

@@ -62,6 +62,9 @@ export class AwsPGClient extends AwsClient {
         throw new AwsWrapperError(Messages.get("HostInfo.noHostParameter"));
       }
       const result: ClientWrapper = await this.pluginManager.connect(hostInfo, this.properties, true);
+      result.client.on("error", (error: any) => {
+        this.emit("error", error);
+      });
       await this.pluginService.setCurrentClient(result, result.hostInfo);
       await this.internalPostConnect();
     });

pg/lib/dialect/node_postgres_driver_dialect.ts

@@ -33,9 +33,6 @@ export class NodePostgresDriverDialect implements DriverDialect {
 
   async connect(hostInfo: HostInfo, props: Map<string, any>): Promise<ClientWrapper> {
     const targetClient = new Client(WrapperProperties.removeWrapperProperties(props));
-    targetClient.on("error", (error: any) => {
-      // targetClient.emit("error", error);
-    });
     await targetClient.connect();
     return Promise.resolve(new PgClientWrapper(targetClient, hostInfo, props));
   }

pg/lib/dialect/pg_database_dialect.ts

@@ -17,9 +17,7 @@
 import { DatabaseDialect, DatabaseType } from "../../../common/lib/database_dialect/database_dialect";
 import { HostListProviderService } from "../../../common/lib/host_list_provider_service";
 import { HostListProvider } from "../../../common/lib/host_list_provider/host_list_provider";
-import {
-  ConnectionStringHostListProvider
-} from "../../../common/lib/host_list_provider/connection_string_host_list_provider";
+import { ConnectionStringHostListProvider } from "../../../common/lib/host_list_provider/connection_string_host_list_provider";
 import { AwsWrapperError } from "../../../common/lib/utils/errors";
 import { DatabaseDialectCodes } from "../../../common/lib/database_dialect/database_dialect_codes";
 import { TransactionIsolationLevel } from "../../../common/lib/utils/transaction_isolation_level";

pg/lib/pg_pool_client.ts

@@ -18,6 +18,7 @@ import { Pool, PoolClient, PoolConfig } from "pg";
 import { AwsPoolClient } from "../../common/lib/aws_pool_client";
 import { Messages } from "../../common/lib/utils/messages";
 import { AwsWrapperError } from "../../common/lib/utils/errors";
+import { logger } from "../../common/logutils";
 
 export class AwsPgPoolClient implements AwsPoolClient {
   targetPool: Pool;
@@ -26,7 +27,7 @@ export class AwsPgPoolClient implements AwsPoolClient {
     this.targetPool = new Pool(props);
     this.targetPool.on("connect", (_client: PoolClient) => {
       _client.on("error", (err: Error) => {
-        console.log(err);
+        logger.debug(err);
       });
     });
   }

tests/unit/database_dialect.test.ts

@@ -34,6 +34,7 @@ import { RdsMultiAZPgDatabaseDialect } from "../../pg/lib/dialect/rds_multi_az_p
 import { DatabaseDialectManager } from "../../common/lib/database_dialect/database_dialect_manager";
 import { NodePostgresDriverDialect } from "../../pg/lib/dialect/node_postgres_driver_dialect";
 import { mock } from "ts-mockito";
+import { PgClientWrapper } from "../../common/lib/pg_client_wrapper";
 
 const LOCALHOST = "localhost";
 const RDS_DATABASE = "database-1.xyz.us-east-2.rds.amazonaws.com";
@@ -189,17 +190,13 @@ class MockTargetClient {
     this.expectedResultSet = expectedResultSet;
   }
 
-  query(sql: any) {
+  query(sql: string) {
     if (this.expectedInputs.includes(sql)) {
       return Promise.resolve(this.expectedResultSet);
     }
 
     return Promise.reject(new Error("Unsupported query"));
   }
-
-  promise() {
-    return this;
-  }
 }
 
 describe("test database dialects", () => {
@@ -272,11 +269,7 @@ describe("test database dialects", () => {
       hostAvailabilityStrategy: new SimpleHostAvailabilityStrategy()
     }).build();
 
-    const mockClientWrapper: ClientWrapper = {
-      client: mockTargetClient,
-      hostInfo: currentHostInfo,
-      properties: new Map<string, any>()
-    };
+    const mockClientWrapper: ClientWrapper = new PgClientWrapper(mockTargetClient, currentHostInfo, new Map<string, any>());
     const pluginService = new PluginService(
       pluginServiceManagerContainer,
       mockClient,