fix: setQueryTimeout for mysql2DriverDialect

common/lib/mysql_client_wrapper.ts

@@ -47,8 +47,9 @@ export class MySQLClientWrapper implements ClientWrapper {
   }
 
   query(sql: any): Promise<any> {
-    this.driverDialect.setQueryTimeout(this.properties, sql);
-    return this.client?.query(sql);
+    const query = { sql: sql };
+    this.driverDialect.setQueryTimeout(this.properties, query);
+    return this.client?.query(query);
   }
 
   async queryWithTimeout(sql: string): Promise<any> {

mysql/lib/client.ts

@@ -59,24 +59,7 @@ export class AwsMySQLClient extends AwsClient {
   }
 
   async query(options: QueryOptions, callback?: any): Promise<Query> {
-    if (!this.isConnected) {
-      await this.connect(); // client.connect is not required for MySQL clients
-      this.isConnected = true;
-    }
-    const host = this.pluginService.getCurrentHostInfo();
-    const context = this.telemetryFactory.openTelemetryContext("awsClient.query", TelemetryTraceLevel.TOP_LEVEL);
-    return await context.start(async () => {
-      return await this.pluginManager.execute(
-        host,
-        this.properties,
-        "query",
-        async () => {
-          await this.pluginService.updateState(options.sql);
-          return await ClientUtils.queryWithTimeout(this.targetClient?.client?.query(options, callback), this.properties);
-        },
-        options
-      );
-    });
+    return await this.targetClient?.client?.query(options, callback);
   }
 
   private async queryWithoutUpdate(options: QueryOptions, callback?: any): Promise<Query> {

mysql/lib/dialect/mysql2_driver_dialect.ts

@@ -71,7 +71,7 @@ export class MySQL2DriverDialect implements DriverDialect {
   setQueryTimeout(props: Map<string, any>, sql?: any, wrapperConnectTimeout?: any) {
     const timeout = wrapperConnectTimeout ?? props.get(WrapperProperties.WRAPPER_QUERY_TIMEOUT.name);
     if (timeout && !sql[MySQL2DriverDialect.QUERY_TIMEOUT_PROPERTY_NAME]) {
-      sql[MySQL2DriverDialect.QUERY_TIMEOUT_PROPERTY_NAME] = timeout;
+      sql[MySQL2DriverDialect.QUERY_TIMEOUT_PROPERTY_NAME] = Number(timeout);
     }
   }
 

mysql/lib/dialect/mysql_database_dialect.ts

@@ -118,17 +118,14 @@ export class MySQLDatabaseDialect implements DatabaseDialect {
 
   async isClientValid(targetClient: ClientWrapper): Promise<boolean> {
     try {
-      return await ClientUtils.queryWithTimeout(
-        targetClient
-          .query({ sql: "SELECT 1" })
-          .then(() => {
-            return true;
-          })
-          .catch(() => {
-            return false;
-          }),
-        targetClient.properties
-      );
+      return await targetClient
+        .query("SELECT 1")
+        .then(() => {
+          return true;
+        })
+        .catch(() => {
+          return false;
+        });
     } catch (error) {
       return false;
     }

pg/lib/dialect/node_postgres_driver_dialect.ts

@@ -71,7 +71,7 @@ export class NodePostgresDriverDialect implements DriverDialect {
     }
   }
 
-  setQueryTimeout(props: Map<string, any>, sql?: any, wrapperQueryTimeout?: any) {
+  setQueryTimeout(props: Map<string, any>, wrapperQueryTimeout?: any) {
     const timeout = wrapperQueryTimeout ?? props.get(WrapperProperties.WRAPPER_QUERY_TIMEOUT.name);
     if (timeout) {
       props.set(NodePostgresDriverDialect.QUERY_TIMEOUT_PROPERTY_NAME, timeout);