@pi-r/mysql 0.2.8 → 0.3.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Mile Square Park
+Copyright 2023 Studio Trigger
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,6 +1,6 @@
 # @pi-r/mysql
 
-PEP 402 - Forever
+PEP 402 - Forever Aina
 
 ## LICENSE
 

package/client/index.d.ts

@@ -1,8 +1,9 @@
 import type { IDb } from '@e-mc/types/lib';
-import type { MySQLCredential, MySQLDataSource } from '@e-mc/types/lib/db';
 
 import type { IDbSourceClient } from '@e-mc/db/types';
 
+import type { MySQLCredential, MySQLDataSource } from '../types';
+
 declare const MySQL: IDbSourceClient<MySQLDataSource> & {
     setAuthentication(this: IDb, credential: MySQLCredential): void;
 };

package/client/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = exports.setAuthentication = void 0;
+const main = require("mysql2");
+const mysql = require("mysql2/promise");
 const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
@@ -104,7 +106,6 @@ function setCredential(item) {
         }
         const poolKey = getPoolKey(credential);
         if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const { createPool } = require("mysql2/promise");
             const config = this.getPoolConfig("mysql", password);
             if (config) {
                 const { max, idle, queue_max } = config;
@@ -118,7 +119,7 @@ function setCredential(item) {
                     credential.queueLimit ?? (credential.queueLimit = queue_max);
                 }
             }
-            new MySQLPool(createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+            new MySQLPool(mysql.createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
         }
         else {
             pool.add(item);
@@ -135,7 +136,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("mysql2/promise");
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -201,7 +201,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
         }
         if (!client) {
-            clients.push(client = await db.createConnection(removeUUIDKey(mysqlCredential || credential)));
+            clients.push(client = await mysql.createConnection(removeUUIDKey(mysqlCredential || credential)));
         }
         if (connectOnce) {
             if (!parallel) {
@@ -281,8 +281,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 if (streamRow) {
                     const rows = [];
                     const processRow = typeof streamRow === 'function' && streamRow;
-                    const { createConnection } = require("mysql2");
-                    const client = mysql2Client || createConnection(removeUUIDKey(mysql2Credential || credential));
+                    const client = mysql2Client || main.createConnection(removeUUIDKey(mysql2Credential || credential));
                     clients.push(client);
                     if (connectOnce) {
                         if (!parallel) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mysql",
-  "version": "0.2.8",
+  "version": "0.3.2",
   "description": "MySQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.5.4",
-    "@e-mc/types": "^0.5.4",
+    "@e-mc/db": "^0.6.1",
+    "@e-mc/types": "^0.6.1",
     "mysql2": "^3.9.2"
   }
 }