fix: setQueryTimeout for mysql2DriverDialect (#393)

aws · Feb 6, 2025 · acc06d6 · acc06d6
1 parent 09f4931
commit acc06d6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/common/lib/client_wrapper.ts b/common/lib/client_wrapper.ts
@@ -22,7 +22,7 @@ export interface ClientWrapper {
   readonly properties: Map<string, any>;
   readonly id: string;
 
-  query(sql: any): Promise<any>;
+  query(sql: string): Promise<any>;
 
   end(): Promise<void>;
 

diff --git a/common/lib/mysql_client_wrapper.ts b/common/lib/mysql_client_wrapper.ts
@@ -46,9 +46,10 @@ export class MySQLClientWrapper implements ClientWrapper {
     this.id = uniqueId("MySQLClient_");
   }
 
-  query(sql: any): Promise<any> {
-    this.driverDialect.setQueryTimeout(this.properties, sql);
-    return this.client?.query(sql);
+  query(sql: string): Promise<any> {
+    const query = { sql: sql };
+    this.driverDialect.setQueryTimeout(this.properties, query);
+    return this.client?.query(query);
   }
 
   async queryWithTimeout(sql: string): Promise<any> {

diff --git a/common/lib/pg_client_wrapper.ts b/common/lib/pg_client_wrapper.ts
@@ -41,7 +41,7 @@ export class PgClientWrapper implements ClientWrapper {
     this.id = uniqueId("PgClient_");
   }
 
-  query(sql: any): Promise<any> {
+  query(sql: string): Promise<any> {
     return this.client?.query(sql);
   }
 

diff --git a/common/lib/pool_client_wrapper.ts b/common/lib/pool_client_wrapper.ts
@@ -38,7 +38,7 @@ export class PoolClientWrapper implements ClientWrapper {
     return this.end();
   }
 
-  query(sql: any): Promise<any> {
+  query(sql: string): Promise<any> {
     return this.client?.query(sql);
   }
 

diff --git a/mysql/lib/dialect/mysql2_driver_dialect.ts b/mysql/lib/dialect/mysql2_driver_dialect.ts
@@ -68,10 +68,10 @@ export class MySQL2DriverDialect implements DriverDialect {
     }
   }
 
-  setQueryTimeout(props: Map<string, any>, sql?: any, wrapperConnectTimeout?: any) {
-    const timeout = wrapperConnectTimeout ?? props.get(WrapperProperties.WRAPPER_QUERY_TIMEOUT.name);
+  setQueryTimeout(props: Map<string, any>, sql?: any, wrapperQueryTimeout?: any) {
+    const timeout = wrapperQueryTimeout ?? 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);
     }
   }
 

diff --git a/mysql/lib/dialect/mysql_database_dialect.ts b/mysql/lib/dialect/mysql_database_dialect.ts
@@ -120,7 +120,7 @@ export class MySQLDatabaseDialect implements DatabaseDialect {
     try {
       return await ClientUtils.queryWithTimeout(
         targetClient
-          .query({ sql: "SELECT 1" })
+          .query("SELECT 1")
           .then(() => {
             return true;
           })