@pi-r/mysql 0.2.2 → 0.2.5

package/client/index.js

@@ -21,9 +21,25 @@ class MySQLPool extends DbPool {
     }
 }
 const POOL_STATE = {};
+const POOL_UNUSED = ['ssl', 'connectTimeout', 'queueLimit', 'waitForConnections', 'connectionLimit', 'maxIdle', 'idleTimeout', 'enableKeepAlive', 'keepAliveInitialDelay'];
 function removePoolProperties(credential) {
-    if (!credential.uuidKey && ('ssl' in credential || 'connectionLimit' in credential || 'queueLimit' in credential || 'waitForConnections' in credential || 'enableKeepAlive' in credential || 'keepAliveInitialDelay' in credential || 'connectTimeout' in credential)) {
-        return { ...credential, ssl: (0, types_1.isObject)(credential.ssl) ? true : undefined, connectionLimit: undefined, queueLimit: undefined, waitForConnections: undefined, enableKeepAlive: undefined, keepAliveInitialDelay: undefined, connectTimeout: undefined };
+    if (!credential.uuidKey) {
+        let result;
+        for (let i = 0, length = POOL_UNUSED.length; i < length; ++i) {
+            const attr = POOL_UNUSED[i];
+            if (attr in credential) {
+                result || (result = { ...credential });
+                if (attr === 'ssl' && (0, types_1.isObject)(result[attr])) {
+                    result[attr] = true;
+                }
+                else {
+                    delete result[attr];
+                }
+            }
+        }
+        if (result) {
+            return result;
+        }
     }
     return credential;
 }
@@ -31,7 +47,6 @@ function removeUUIDKey(credential) {
     if ('uuidKey' in credential) {
         credential = { ...credential };
         delete credential.uuidKey;
-        return credential;
     }
     return credential;
 }
@@ -81,10 +96,13 @@ function setCredential(item) {
             const { createPool } = require("mysql2/promise" /* STRINGS.PACKAGE_NAME */);
             const config = this.getPoolConfig("mysql" /* STRINGS.MODULE_NAME */, password);
             if (config) {
-                const { max, queue_max } = config;
+                const { max, idle, queue_max } = config;
                 if (max > 0) {
                     credential.connectionLimit ?? (credential.connectionLimit = max);
                 }
+                if (idle >= 0) {
+                    credential.idleTimeout ?? (credential.idleTimeout = idle);
+                }
                 if (queue_max >= 0) {
                     credential.queueLimit ?? (credential.queueLimit = queue_max);
                 }
@@ -153,6 +171,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 let close;
                 switch (err instanceof Error && err.code) {
                     case 'ER_ACCESS_DENIED_ERROR':
+                    case 'ER_DBACCESS_DENIED_ERROR':
+                    case 'ER_SPECIFIC_ACCESS_DENIED_ERROR':
+                    case 'ER_ACCESS_DENIED_NO_PASSWORD_ERROR':
                         close = 1;
                         break;
                     default:
@@ -261,7 +282,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     commandType = this.commandType.SELECT;
                     client
                         .query(query, params)
-                        .on('error', err => error || (error = err))
                         .on('result', row => {
                         if (processRow) {
                             const err = processRow(row);
@@ -275,13 +295,14 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         }
                         rows.push(row);
                     })
+                        .on('error', err => error || (error = err))
                         .on('end', () => {
                         if (error && this.handleFail(error, item, { errorQuery, commandType })) {
                             reject(error);
                         }
                         else {
                             this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
-                            resolve(!error ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : rows);
+                            resolve(!error ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : rows.length ? rows : null);
                         }
                     });
                 }
@@ -291,9 +312,18 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         mysqlClient = undefined;
                     }
                     commandType = this.commandType.SELECT;
-                    const [rows] = await client.query(query, params);
+                    let [rows] = await client.query(query, params);
                     this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
-                    resolve(Array.isArray(rows) && !rows.some(row => row.constructor.name === 'OkPacket') ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
+                    if (Array.isArray(rows)) {
+                        if (rows.length === 2 && Array.isArray(rows[0]) && !Array.isArray(rows[0])) {
+                            rows = rows[0];
+                        }
+                        rows = rows.filter(row => Array.isArray(row) || !('affectedRows' in row && 'fieldCount' in row && 'serverStatus' in row));
+                        resolve((0, types_1.isArray)(rows) ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
+                    }
+                    else {
+                        resolve(null);
+                    }
                 }
             }
             catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mysql",
-  "version": "0.2.2",
+  "version": "0.2.5",
   "description": "MySQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -23,6 +23,6 @@
   "dependencies": {
     "@e-mc/db": "^0.5.3",
     "@e-mc/types": "^0.5.3",
-    "mysql2": "^3.3.1"
+    "mysql2": "^3.5.2"
   }
 }

package/types/index.d.ts

@@ -12,4 +12,4 @@ export interface MySQLDataSource<T = unknown> extends DbDataSource<string | Quer
 
 export interface MySQLCredential extends ServerAuth, Omit<PoolOptions, "ssl"> {
     ssl?: boolean | string | SecureContextOptions & { rejectUnauthorized?: boolean };
-}
+}