@pi-r/mysql 0.10.3 → 0.11.1

package/client/index.js

@@ -97,13 +97,16 @@ function setCredential(item) {
     }
     const config = this.getPoolConfig("mysql", password);
     if (config) {
-        const { max, idle, queue_max, timeout } = config;
+        const { max, idle, idle_max, queue_max, timeout } = config;
         if (max > 0) {
             credential.connectionLimit ??= max;
         }
         if (idle >= 0) {
             credential.idleTimeout ??= idle;
         }
+        if (idle_max >= 0) {
+            credential.maxIdle ??= idle_max;
+        }
         if (queue_max >= 0) {
             credential.queueLimit ??= queue_max;
         }
@@ -122,7 +125,7 @@ function setCredential(item) {
         .parent = POOL_STATE;
 }
 async function executeQuery(item, options) {
-    return (await executeBatchQuery.call(this, [item], options))[0] || [];
+    return (await executeBatchQuery.call(this, [item], options)).at(0) || [];
 }
 async function executeBatchQuery(batch, options = '', outResult) {
     const length = batch.length;
@@ -173,16 +176,11 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             catch (err) {
                 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:
-                        close = pool.closeable;
-                        break;
+                if ((0, types_1.isErrorCode)(err, 'ER_ACCESS_DENIED_ERROR', 'ER_DBACCESS_DENIED_ERROR', 'ER_SPECIFIC_ACCESS_DENIED_ERROR', 'ER_ACCESS_DENIED_NO_PASSWORD_ERROR')) {
+                    close = 1;
+                }
+                else {
+                    close = pool.closeable;
                 }
                 if (close) {
                     await pool.detach(true);
@@ -208,10 +206,30 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (this.host?.username) {
         this.applyCommand(...batch);
     }
-    for (let i = 0, mysql2Client, mysql2Credential; i < length; ++i) {
+    for (let i = 0, mysql2Client, mysql2Credential, statement; i < length; ++i) {
         const item = batch[i];
-        const { source, query, params, ignoreCache } = item;
+        const { source, params, ignoreCache } = item;
         const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mysql", 'options', mysql2Credential || item.credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
+        let query = item.query, prepared = false;
+        if (typeof item.preparedStatement === 'boolean') {
+            if (item.preparedStatement) {
+                if (query) {
+                    statement = query;
+                }
+                else {
+                    query = statement;
+                }
+                prepared = true;
+            }
+            else if (statement) {
+                mysqlClient?.unprepare(statement);
+                statement = undefined;
+            }
+        }
+        else if (!query && statement) {
+            query = statement;
+            prepared = true;
+        }
         let credential, error;
         if (streamRow) {
             if (mysql2Credential) {
@@ -241,7 +259,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         item.transactionState = 1;
         const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
         let queryString = '';
-        if (caching && ignoreCache !== true && !streamRow) {
+        if (caching && ignoreCache !== true && !prepared && !streamRow) {
             queryString = Db.asString(query, true) + '_' + Db.asString(params, true);
             if (ignoreCache !== 1) {
                 const result = this.getQueryResult(source, DbPool.sanitize(credential), queryString, cacheValue);
@@ -285,8 +303,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         mysql2Credential = credential;
                     }
                     commandType = this.commandType.SELECT;
-                    client
-                        .query(query, params)
+                    client[prepared && connectOnce && !parallel ? 'execute' : 'query'](query, params)
                         .on('result', row => {
                         if (processRow) {
                             const err = processRow(row);
@@ -317,7 +334,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         mysqlClient = undefined;
                     }
                     commandType = this.commandType.SELECT;
-                    const [rows] = await client.query(query, params);
+                    const [rows] = await client[prepared && connectOnce && !parallel ? 'execute' : 'query'](query, params);
                     this.add(item, 4);
                     if ((0, types_1.isArray)(rows)) {
                         const [row1, row2] = rows;

package/client/pool.js

@@ -4,7 +4,7 @@ const util_1 = require("@e-mc/db/util");
 const DbPool = require('@e-mc/db/pool');
 const POOL_ACTIVE = new WeakSet();
 class MySQLPool extends DbPool {
-    static CACHE_UNUSED = ['connectTimeout', 'queueLimit', 'waitForConnections', 'connectionLimit', 'maxIdle', 'idleTimeout', 'enableKeepAlive', 'keepAliveInitialDelay', 'Promise'];
+    static CACHE_UNUSED = ['connectTimeout', 'queueLimit', 'waitForConnections', 'connectionLimit', 'maxIdle', 'idleTimeout', 'enableKeepAlive', 'keepAliveInitialDelay', 'Promise', 'gracefulEnd'];
     static CACHE_IGNORE = ['authPlugins', 'authSwitchHandler', 'stream', 'infileStreamFactory'];
     static asString(credential) {
         if ((credential.host || credential.socketPath) && credential.user) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mysql",
-  "version": "0.10.3",
+  "version": "0.11.1",
   "description": "MySQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.12.7",
-    "@e-mc/types": "^0.12.7",
-    "mysql2": "^3.14.5"
+    "@e-mc/db": "^0.13.5",
+    "@e-mc/types": "^0.13.5",
+    "mysql2": "^3.16.0"
   }
 }

package/types/index.d.ts

@@ -7,6 +7,7 @@ import type { PoolOptions, QueryOptions } from 'mysql2/promise';
 
 export interface MySQLDataSource<T = unknown> extends DbDataSource<string | QueryOptions, unknown, unknown, MySQLCredential, string>, ExecuteAction<T> {
     source: "mysql";
+    preparedStatement?: boolean;
 }
 
 export type MySQLCredential = PoolOptions & ServerAuth;