@pi-r/mariadb 0.2.0 → 0.2.2

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,7 +47,6 @@ function removeUUIDKey(credential) {
     if ('uuidKey' in credential) {
         credential = { ...credential };
         delete credential.uuidKey;
-        return credential;
     }
     return credential;
 }
@@ -239,7 +254,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 }
             }
         }
-        if (onceCredential && parallel && !streamRow) {
+        if (onceCredential && parallel) {
             try {
                 mariaDBClient = await getConnection(item, onceCredential);
             }
@@ -283,13 +298,13 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     }
                     else {
                         this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
-                        resolve(!error ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : rows);
+                        resolve(!error ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : rows.length ? rows : null);
                     }
                 }
                 else {
                     const 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);
+                    resolve((0, types_1.isArray)(rows) ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
                 }
             }
             catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mariadb",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "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"
   }
 }