@pi-r/mariadb 0.2.3 → 0.3.0

package/client/index.js

@@ -1,6 +1,7 @@
 "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 mariadb = require("mariadb");
 const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
@@ -109,7 +110,6 @@ function setCredential(item) {
         }
         const poolKey = getPoolKey(credential);
         if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const { createPool } = require("mariadb" /* STRINGS.PACKAGE_NAME */);
             const config = this.getPoolConfig("mariadb" /* STRINGS.MODULE_NAME */, password);
             if (config) {
                 const { max, idle } = config;
@@ -120,7 +120,7 @@ function setCredential(item) {
                     credential.idleTimeout ?? (credential.idleTimeout = idle);
                 }
             }
-            new MariaDBPool(createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+            new MariaDBPool(mariadb.createPool(removeUUIDKey(credential)), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
         }
         else {
             pool.add(item);
@@ -137,7 +137,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("mariadb" /* STRINGS.PACKAGE_NAME */);
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -203,7 +202,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
         }
         if (!client) {
-            clients.push(client = await db.createConnection(removeUUIDKey(mariaDBCredential || credential)));
+            clients.push(client = await mariadb.createConnection(removeUUIDKey(mariaDBCredential || credential)));
         }
         if (connectOnce) {
             if (!parallel) {
@@ -306,16 +305,16 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     }
                 }
                 else {
-                    let rows = await client.query(query, params);
+                    const rows = await client.query(query, params);
                     this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
                     if ((0, types_1.isArray)(rows)) {
-                        if (rows.length === 2 && Array.isArray(rows[0]) && !Array.isArray(rows[1]) && isOkPacket(rows[1])) {
-                            rows = rows[0];
+                        const [row1, row2] = rows;
+                        if (rows.length === 2 && Array.isArray(row1) && !Array.isArray(row2) && isOkPacket(row2)) {
+                            resolve(row1);
                         }
-                        else if (isOkPacket(rows[0])) {
-                            rows = [];
+                        else {
+                            resolve(!isOkPacket(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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mariadb",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "MariaDB 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.3",
-    "@e-mc/types": "^0.5.3",
+    "@e-mc/db": "^0.6.0",
+    "@e-mc/types": "^0.6.0",
     "mariadb": "^3.2.0"
   }
 }