@pi-r/mariadb 0.6.4 → 0.6.6

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2024 An Pham
 
 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,7 +1,10 @@
-### @pi-r/mariadb
+# @pi-r/mariadb
 
-https://e-mc.readthedocs.io/en/latest/db/mariadb.html
+## Documentation
 
-### LICENSE
+- [E-mc](https://e-mc.readthedocs.io/en/latest/db/mariadb.html)
+- [squared](https://squared.readthedocs.io)
+
+## LICENSE
 
 MIT

package/client/index.d.ts

@@ -0,0 +1,7 @@
+import type { IDbSourceClient } from '@e-mc/db/types';
+
+import type { MariaDBDataSource } from '../types';
+
+declare const MariaDB: IDbSourceClient<MariaDBDataSource>;
+
+export = MariaDB;

package/client/index.js

@@ -1,5 +1,4 @@
 "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");
@@ -101,7 +100,7 @@ function setCredential(item) {
         errors.push('user');
     }
     if (errors.length) {
-        throw (0, types_1.errorMessage)("mariadb" /* STRINGS.MODULE_NAME */, 'Not defined - ' + errors.join(' | '));
+        throw (0, types_1.errorMessage)("mariadb", 'Not defined - ' + errors.join(' | '));
     }
     const usePool = item.usePool;
     if (!usePool) {
@@ -121,7 +120,7 @@ function setCredential(item) {
             return;
         }
     }
-    const config = this.getPoolConfig("mariadb" /* STRINGS.MODULE_NAME */, password);
+    const config = this.getPoolConfig("mariadb", password);
     if (config) {
         const { min, max, idle, queue_idle, timeout, socket_timeout } = config;
         if (min >= 0) {
@@ -180,17 +179,17 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (!parallel) {
         outResult || (outResult = new Array(length));
     }
-    const caching = this.hasCache("mariadb" /* STRINGS.MODULE_NAME */, sessionKey);
+    const caching = this.hasCache("mariadb", sessionKey);
     const tasks = new Array(length);
     const clients = [];
     const pools = [];
     let mariaDBPool, mariaDBClient, mariaDBCredential, onceCredential = connectOnce ? batch[0].credential : undefined;
     const getConnection = async (item, credential) => {
-        item.transactionState = 64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState = 64;
         let client;
         if (mariaDBPool) {
             pools.push(client = await mariaDBPool.getConnection());
-            item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+            item.transactionState &= ~64;
             POOL_ACTIVE.add(credential);
             return client;
         }
@@ -235,7 +234,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             mariaDBCredential = credential;
         }
-        item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState &= ~64;
         return client;
     };
     if (this.host?.username) {
@@ -245,8 +244,8 @@ async function executeBatchQuery(batch, options = '', outResult) {
         const item = batch[i];
         const { source, query, params, ignoreCache } = item;
         let credential = mariaDBCredential || onceCredential, error;
-        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mariadb" /* STRINGS.MODULE_NAME */, 'options', null, item.credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
-        if (!(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 */))) {
+        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mariadb", 'options', null, item.credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
+        if (!(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;
@@ -262,7 +261,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             continue;
         }
-        item.transactionState = 1 /* DB_TRANSACTION.ACTIVE */;
+        item.transactionState = 1;
         const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
         let queryString = '';
         if (caching && ignoreCache !== true && !streamRow) {
@@ -276,7 +275,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) {
@@ -327,13 +326,13 @@ 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);
                     }
                 }
                 else {
                     const rows = await client.query(query, params);
-                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                    this.add(item, 4);
                     if ((0, types_1.isArray)(rows)) {
                         const [row1, row2] = rows;
                         if (rows.length === 2 && Array.isArray(row1) && !Array.isArray(row2) && isOkPacket(row2)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mariadb",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "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.8.4",
-    "@e-mc/types": "^0.8.4",
-    "mariadb": "^3.2.3"
+    "@e-mc/db": "^0.8.7",
+    "@e-mc/types": "^0.8.7",
+    "mariadb": "^3.3.0"
   }
 }