@stashfin/mysql2 1.4.659 → 1.4.660

package/index.d.ts

@@ -15,11 +15,11 @@ export declare class MysqlConnector {
     insertData(tableName: string, data: Record<string, string | number>): Promise<ResultSetHeader>;
     updateData(tableName: string, data: Record<string, any>, condition: string, conditionValues?: Array<string | number>): Promise<ResultSetHeader>;
     close(): Promise<void>;
-    beginTransaction(): Promise<import("mysql2/promise").PoolConnection>;
+    beginTransaction(): Promise<any>;
     commitTransaction(connection: any): Promise<void>;
     rollbackTransaction(connection: any): Promise<void>;
     executeInTransaction<T>(callback: (connection: any) => Promise<T>): Promise<T>;
-    executeResultInTransaction(connection: any, sql: string, values?: unknown[]): Promise<ResultSetHeader>;
-    insertDataInTransaction(connection: any, tableName: string, data: Record<string, string | number>): Promise<ResultSetHeader>;
-    updateDataInTransaction(connection: any, tableName: string, data: Record<string, any>, condition: string, conditionValues?: Array<string | number>): Promise<ResultSetHeader>;
+    executeResultInTransaction(connection: any, sql: string, values?: unknown[], timeoutMs?: number): Promise<ResultSetHeader>;
+    insertDataInTransaction(connection: any, tableName: string, data: Record<string, string | number>, timeoutMs?: number): Promise<ResultSetHeader>;
+    updateDataInTransaction(connection: any, tableName: string, data: Record<string, any>, condition: string, conditionValues?: Array<string | number>, timeoutMs?: number): Promise<ResultSetHeader>;
 }

package/index.js

@@ -128,48 +128,29 @@ class MysqlConnector {
             throw error;
         }
     }
-    async executeResultInTransaction(connection, sql, values) {
-        return new Promise((resolve, reject) => {
-            connection.query(sql, values, function (err, results, fields) {
-                if (err)
-                    reject(err);
-                else
-                    resolve(results || undefined);
-            });
-        });
+    async executeResultInTransaction(connection, sql, values, timeoutMs) {
+        const options = timeoutMs ? { sql, values, timeout: timeoutMs } : sql;
+        const [result] = await connection.query(options, timeoutMs ? undefined : values);
+        return result || undefined;
     }
-    async insertDataInTransaction(connection, tableName, data) {
+    async insertDataInTransaction(connection, tableName, data, timeoutMs) {
         const keys = Object.keys(data);
         const values = Object.values(data);
         const sql = `INSERT INTO ${tableName} (${keys.join(', ')}) VALUES (${keys
             .map(() => '?')
             .join(', ')})`;
-        return new Promise((resolve, reject) => {
-            connection.query(sql, values, function (err, results, fields) {
-                if (err)
-                    reject(err);
-                else
-                    resolve(results || undefined);
-            });
-        });
+        return this.executeResultInTransaction(connection, sql, values, timeoutMs);
     }
     async updateDataInTransaction(connection, tableName, 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    data, condition, conditionValues) {
+    data, condition, conditionValues, timeoutMs) {
         const keys = Object.keys(data);
         const values = Object.values(data);
         const sql = `UPDATE ${tableName} SET ${keys
             .map((key) => `${key} = ?`)
             .join(', ')} WHERE ${condition}`;
         const finalValues = [...values, ...(conditionValues || [])];
-        return new Promise((resolve, reject) => {
-            connection.query(sql, finalValues, function (err, results, fields) {
-                if (err)
-                    reject(err);
-                else
-                    resolve(results || undefined);
-            });
-        });
+        return this.executeResultInTransaction(connection, sql, finalValues, timeoutMs);
     }
 }
 exports.MysqlConnector = MysqlConnector;

package/models/LocCustomersUpdate.d.ts

@@ -15,7 +15,7 @@ export interface LocCustomersUpdate {
     update_date?: Date;
     admin_id?: number;
     status?: number;
-    can_reload_card?: boolean;
+    can_reload_card?: number;
     max_withdrawable_amount?: number;
     minimum_request_amount?: number;
     request_amount_increment_step?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stashfin/mysql2",
-  "version": "1.4.659",
+  "version": "1.4.660",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",