fix: setQueryTimeout for mysql2DriverDialect

aws · Feb 3, 2025 · 3e99bf0 · 3e99bf0
1 parent 2aa927f
commit 3e99bf0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/common/lib/mysql_client_wrapper.ts b/common/lib/mysql_client_wrapper.ts
@@ -47,7 +47,7 @@ export class MySQLClientWrapper implements ClientWrapper {
   }
 
   query(sql: any): Promise<any> {
-    this.driverDialect.setQueryTimeout(this.properties, sql);
+    this.driverDialect.setQueryTimeout(this.properties);
     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);
-    if (timeout && !sql[MySQL2DriverDialect.QUERY_TIMEOUT_PROPERTY_NAME]) {
-      sql[MySQL2DriverDialect.QUERY_TIMEOUT_PROPERTY_NAME] = timeout;
+  setQueryTimeout(props: Map<string, any>, wrapperQueryTimeout?: any) {
+    const timeout = wrapperQueryTimeout ?? props.get(WrapperProperties.WRAPPER_QUERY_TIMEOUT.name);
+    if (timeout) {
+      props.set(MySQL2DriverDialect.QUERY_TIMEOUT_PROPERTY_NAME, timeout);
     }
   }
 

diff --git a/pg/lib/dialect/node_postgres_driver_dialect.ts b/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);