@pi-r/mariadb 0.2.1 → 0.2.3

package/client/index.js

@@ -21,9 +21,25 @@ class MariaDBPool extends DbPool {
     }
 }
 const POOL_STATE = {};
+const POOL_UNUSED = ['ssl', 'connectTimeout', 'socketTimeout', 'compress', 'keepAliveDelay', 'acquireTimeout', 'connectionLimit', 'idleTimeout', 'initializationTimeout', 'minDelayValidation', 'minimumIdle', 'resetAfterUse', 'noControlAfterUse', 'leakDetectionTimeout'];
 function removePoolProperties(credential) {
-    if (!credential.uuidKey && ('ssl' in credential || 'connectionLimit' in credential || 'connectTimeout' in credential || 'idleTimeout' in credential || 'minimumIdle' in credential || 'resetAfterUse' in credential || 'noControlAfterUse' in credential)) {
-        return { ...credential, ssl: (0, types_1.isObject)(credential.ssl) ? true : undefined, connectionLimit: undefined, idleTimeout: undefined, connectTimeout: undefined, minimumIdle: undefined, resetAfterUse: undefined, noControlAfterUse: 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,10 +47,13 @@ function removeUUIDKey(credential) {
     if ('uuidKey' in credential) {
         credential = { ...credential };
         delete credential.uuidKey;
-        return credential;
     }
     return credential;
 }
+function isOkPacket(value) {
+    const result = Array.isArray(value) ? value[0] : value;
+    return !!result && !Array.isArray(result) && result.constructor.name === 'OkPacket';
+}
 const getPoolKey = (credential) => (credential.host || '') + '_' + (credential.port || '3306') + (credential.user || '') + '_' + (credential.password || '') + '_' + (credential.database || '') + '_' + (credential.rowsAsArray ? '1' : '0');
 function setAuthentication(credential) {
     const auth = (0, util_1.parseServerAuth)(credential);
@@ -252,7 +271,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         tasks[i] = new Promise(async (resolve, reject) => {
             let commandType;
             try {
-                const client = mariaDBClient || await getConnection(item, credential);
+                const client = mariaDBClient || await getConnection(item, removeUUIDKey(credential));
                 if (mariaDBClient && parallel) {
                     mariaDBClient = undefined;
                 }
@@ -287,9 +306,20 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     }
                 }
                 else {
-                    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) ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
+                    if ((0, types_1.isArray)(rows)) {
+                        if (rows.length === 2 && Array.isArray(rows[0]) && !Array.isArray(rows[1]) && isOkPacket(rows[1])) {
+                            rows = rows[0];
+                        }
+                        else if (isOkPacket(rows[0])) {
+                            rows = [];
+                        }
+                        resolve(rows.length ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
+                    }
+                    else {
+                        resolve(null);
+                    }
                 }
             }
             catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mariadb",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "MariaDB 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",
-    "mariadb": "^3.1.2"
+    "mariadb": "^3.2.0"
   }
 }