@pi-r/mysql 0.2.5 → 0.2.7

package/client/index.js

@@ -50,6 +50,17 @@ function removeUUIDKey(credential) {
     }
     return credential;
 }
+function isResultSetHeader(value) {
+    const result = Array.isArray(value) ? value[0] : value;
+    if (result && !Array.isArray(result)) {
+        switch (result.constructor.name) {
+            case 'ResultSetHeader':
+            case 'OkPacket':
+                return true;
+        }
+    }
+    return false;
+}
 const getPoolKey = (credential) => (credential.host || '') + '_' + (credential.port || '3306') + (credential.user || '') + '_' + (credential.password || '') + '_' + (credential.database || '') + '_' + (credential.uri || '') + '_' + (credential.rowsAsArray ? '1' : '0');
 function setAuthentication(credential) {
     const auth = (0, util_1.parseServerAuth)(credential);
@@ -271,7 +282,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     const rows = [];
                     const processRow = typeof streamRow === 'function' && streamRow;
                     const { createConnection } = require("mysql2" /* STRINGS.PACKAGE_STREAM */);
-                    const client = mysql2Client || createConnection((mysql2Credential || credential));
+                    const client = mysql2Client || createConnection(removeUUIDKey(mysql2Credential || credential));
                     clients.push(client);
                     if (connectOnce) {
                         if (!parallel) {
@@ -312,14 +323,16 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         mysqlClient = undefined;
                     }
                     commandType = this.commandType.SELECT;
-                    let [rows] = await client.query(query, params);
+                    const [rows] = await client.query(query, params);
                     this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
-                    if (Array.isArray(rows)) {
-                        if (rows.length === 2 && Array.isArray(rows[0]) && !Array.isArray(rows[0])) {
-                            rows = rows[0];
+                    if ((0, types_1.isArray)(rows)) {
+                        const [row1, row2] = rows;
+                        if (rows.length === 2 && Array.isArray(row1) && !Array.isArray(row2) && isResultSetHeader(row2)) {
+                            resolve(row1);
+                        }
+                        else {
+                            resolve(!isResultSetHeader(row1) ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
                         }
-                        rows = rows.filter(row => Array.isArray(row) || !('affectedRows' in row && 'fieldCount' in row && 'serverStatus' in row));
-                        resolve((0, types_1.isArray)(rows) ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
                     }
                     else {
                         resolve(null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mysql",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "MySQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",