@pi-r/mysql 0.2.6 → 0.2.8

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2023 Mile Square Park
 
 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,5 +1,7 @@
-### @pi-r/mysql
+# @pi-r/mysql
 
-### LICENSE
+PEP 402 - Forever
+
+## LICENSE
 
 MIT

package/client/index.js

@@ -89,7 +89,7 @@ function setCredential(item) {
             errors.push('user');
         }
         if (errors.length) {
-            throw (0, types_1.errorMessage)("mysql" /* STRINGS.MODULE_NAME */, 'Not defined - ' + errors.join(' | '));
+            throw (0, types_1.errorMessage)("mysql", 'Not defined - ' + errors.join(' | '));
         }
     }
     const usePool = item.usePool;
@@ -104,8 +104,8 @@ function setCredential(item) {
         }
         const poolKey = getPoolKey(credential);
         if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const { createPool } = require("mysql2/promise" /* STRINGS.PACKAGE_NAME */);
-            const config = this.getPoolConfig("mysql" /* STRINGS.MODULE_NAME */, password);
+            const { createPool } = require("mysql2/promise");
+            const config = this.getPoolConfig("mysql", password);
             if (config) {
                 const { max, idle, queue_max } = config;
                 if (max > 0) {
@@ -135,7 +135,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("mysql2/promise" /* STRINGS.PACKAGE_NAME */);
+    const db = require("mysql2/promise");
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -156,17 +156,17 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (!parallel) {
         outResult || (outResult = new Array(length));
     }
-    const caching = this.hasCache("mysql" /* STRINGS.MODULE_NAME */, sessionKey);
+    const caching = this.hasCache("mysql", sessionKey);
     const tasks = new Array(length);
     const clients = [];
     const pools = [];
     let mysqlPool, mysqlClient, mysqlCredential, onceCredential = connectOnce ? batch[0].credential : undefined;
     const getConnection = async (item, credential) => {
-        item.transactionState = 64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState = 64;
         let client;
         if (mysqlPool) {
             pools.push(client = await mysqlPool.getConnection());
-            item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+            item.transactionState &= ~64;
             return client;
         }
         const pool = item.usePool && DbPool.findKey(POOL_STATE, item.usePool, getPoolKey(credential), ...connectOnce ? [item, batch[0]] : [item]);
@@ -209,13 +209,13 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             mysqlCredential = credential;
         }
-        item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState &= ~64;
         return client;
     };
     for (let i = 0, mysql2Client, mysql2Credential; i < length; ++i) {
         const item = batch[i];
         const { source, query, params, ignoreCache } = item;
-        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mysql" /* STRINGS.MODULE_NAME */, 'options', null, mysql2Credential || item.credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
+        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mysql", 'options', null, mysql2Credential || item.credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
         let credential, error;
         if (streamRow) {
             if (mysql2Credential) {
@@ -226,7 +226,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         else if (credential = mysqlCredential || onceCredential) {
             error = null;
         }
-        if (error !== null && !(0, types_1.isPlainObject)(credential = item.credential) && (error = (0, types_1.errorMessage)(source, "Invalid credentials" /* ERR_DB.CREDENTIALS */)) || !query && (error = (0, types_1.errorMessage)(source, "Missing database query" /* ERR_DB.QUERY */))) {
+        if (error !== null && !(0, types_1.isPlainObject)(credential = item.credential) && (error = (0, types_1.errorMessage)(source, "Invalid credentials")) || !query && (error = (0, types_1.errorMessage)(source, "Missing database query"))) {
             if (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
                     tasks.length = 0;
@@ -242,7 +242,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             continue;
         }
-        item.transactionState = 1 /* DB_TRANSACTION.ACTIVE */;
+        item.transactionState = 1;
         const renewCache = ignoreCache === 0;
         const cacheValue = renewCache ? { sessionKey, renewCache } : sessionKey;
         let queryString = '';
@@ -257,7 +257,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     else {
                         outResult[i] = result;
                     }
-                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */ | 128 /* DB_TRANSACTION.CACHE */);
+                    this.add(item, 4 | 128);
                     continue;
                 }
                 if (!ignoreCache && outCacheMiss) {
@@ -281,7 +281,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 if (streamRow) {
                     const rows = [];
                     const processRow = typeof streamRow === 'function' && streamRow;
-                    const { createConnection } = require("mysql2" /* STRINGS.PACKAGE_STREAM */);
+                    const { createConnection } = require("mysql2");
                     const client = mysql2Client || createConnection(removeUUIDKey(mysql2Credential || credential));
                     clients.push(client);
                     if (connectOnce) {
@@ -312,7 +312,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                             reject(error);
                         }
                         else {
-                            this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                            this.add(item, 4);
                             resolve(!error ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : rows.length ? rows : null);
                         }
                     });
@@ -323,16 +323,16 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         mysqlClient = undefined;
                     }
                     commandType = this.commandType.SELECT;
-                    let [rows] = await client.query(query, params);
-                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                    const [rows] = await client.query(query, params);
+                    this.add(item, 4);
                     if ((0, types_1.isArray)(rows)) {
-                        if (rows.length === 2 && Array.isArray(rows[0]) && !Array.isArray(rows[1]) && isResultSetHeader(rows[1])) {
-                            rows = rows[0];
+                        const [row1, row2] = rows;
+                        if (rows.length === 2 && Array.isArray(row1) && !Array.isArray(row2) && isResultSetHeader(row2)) {
+                            resolve(row1);
                         }
-                        else if (isResultSetHeader(rows[0])) {
-                            rows = [];
+                        else {
+                            resolve(!isResultSetHeader(row1) ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
                         }
-                        resolve(rows.length ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
                     }
                     else {
                         resolve(null);
@@ -360,7 +360,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }
     return this.processRows(batch, tasks, {
         disconnect: () => {
-            clients.forEach(item => item.end(err => err && this.writeFail(["Unable to close connnection" /* ERR_DB.CONNECTION_CLOSE */, "mysql" /* STRINGS.MODULE_NAME */], err, { type: 65536 /* LOG_TYPE.DB */, fatal: false })));
+            clients.forEach(item => item.end(err => err && this.writeFail(["Unable to close connnection", "mysql"], err, { type: 65536, fatal: false })));
             pools.forEach(item => item.release());
         },
         parallel

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mysql",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "MySQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/db/mysql"
   },
   "keywords": [
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
-    "mysql2": "^3.5.2"
+    "@e-mc/db": "^0.5.4",
+    "@e-mc/types": "^0.5.4",
+    "mysql2": "^3.9.2"
   }
 }