Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby
2025-08-05 15:27:07 +01:00
parent 43a741f9ac
commit eb98148533
23 changed files with 84 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/package-shared/utils/backend/grabDbSSL.d.ts
Vendored
+4 -1
View File
@@ -1,4 +1,7 @@
import type { ConnectionConfig } from "mariadb";
type Return = ConnectionConfig["ssl"] | undefined;
/**
* # Grab SSL
*/
export default function grabDbSSL(): any;
export default function grabDbSSL(): Return;
export {};
dist/package-shared/utils/backend/grabDbSSL.js
Vendored
-1
View File
@@ -7,7 +7,6 @@ exports.default = grabDbSSL;
const fs_1 = __importDefault(require("fs"));
const grab_dir_names_1 = __importDefault(require("./names/grab-dir-names"));
const path_1 = __importDefault(require("path"));
// type Return = ConnectionConfig["ssl"] | undefined;
/**
* # Grab SSL
*/
dist/package-shared/utils/db/conn-db-handler.js
Vendored
+2 -2
View File
@@ -42,7 +42,7 @@ values, debug) {
throw new Error("Query String Required!");
let queryErrorArray = [];
if (typeof query == "string") {
const results = (yield finalConnection.query(trimQuery(query), values));
const [results] = yield finalConnection.query(trimQuery(query), values);
if (debug) {
(0, debug_log_1.default)({
log: results,
@@ -61,7 +61,7 @@ values, debug) {
currentQueryError.sql = queryObj.query;
currentQueryError.sqlValues = queryObj.values;
const queryObjRes = yield finalConnection.query(trimQuery(queryObj.query), queryObj.values);
const results = queryObjRes;
const results = queryObjRes[0];
if (debug) {
(0, debug_log_1.default)({
log: results,
dist/package-shared/utils/grab-dsql-connection-config.d.ts
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
import { ConnectionConfig } from "mariadb";
import { DsqlConnectionParam } from "../types";
import serverlessMysql from "serverless-mysql";
/**
* # Grab General CONNECTION for DSQL
*/
export default function grabDSQLConnectionConfig(param?: DsqlConnectionParam): serverlessMysql.Config;
export default function grabDSQLConnectionConfig(param?: DsqlConnectionParam): ConnectionConfig;
dist/package-shared/utils/grab-dsql-connection-config.js
Vendored
+5 -26
View File
@@ -5,35 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = grabDSQLConnectionConfig;
const grabDbSSL_1 = __importDefault(require("./backend/grabDbSSL"));
const lodash_1 = __importDefault(require("lodash"));
/**
* # Grab General CONNECTION for DSQL
*/
function grabDSQLConnectionConfig(param) {
const CONN_TIMEOUT = 10000;
const config = {
config: {
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_USERNAME,
password: process.env.DSQL_DB_PASSWORD,
database: (param === null || param === void 0 ? void 0 : param.database) ||
((param === null || param === void 0 ? void 0 : param.noDb) ? undefined : process.env.DSQL_DB_NAME),
port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined,
charset: "utf8mb4",
ssl: (0, grabDbSSL_1.default)(),
connectTimeout: CONN_TIMEOUT,
dateStrings: true,
compress: true,
decimalNumbers: true,
// supportBigNumbers: true,
// bigNumberStrings: false,
// bigIntAsNumber: true,
// metaAsArray: true,
// socketTimeout: CONN_TIMEOUT,
// ...param?.config,
},
};
return lodash_1.default.merge(config, param === null || param === void 0 ? void 0 : param.config);
const config = Object.assign({ host: process.env.DSQL_DB_HOST, user: process.env.DSQL_DB_USERNAME, password: process.env.DSQL_DB_PASSWORD, database: (param === null || param === void 0 ? void 0 : param.database) ||
((param === null || param === void 0 ? void 0 : param.noDb) ? undefined : process.env.DSQL_DB_NAME), port: process.env.DSQL_DB_PORT
? Number(process.env.DSQL_DB_PORT)
: undefined, charset: "utf8mb4", ssl: (0, grabDbSSL_1.default)(), bigIntAsNumber: true, supportBigNumbers: true, bigNumberStrings: false, dateStrings: true, metaAsArray: true, socketTimeout: CONN_TIMEOUT, connectTimeout: CONN_TIMEOUT, compress: true }, param === null || param === void 0 ? void 0 : param.config);
return config;
}
dist/package-shared/utils/grab-dsql-connection.d.ts
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
import { Connection } from "mariadb";
import { DsqlConnectionParam } from "../types";
import { ServerlessMysql } from "serverless-mysql";
/**
* # Grab General CONNECTION for DSQL
*/
export default function grabDSQLConnection(param?: DsqlConnectionParam): Promise<ServerlessMysql>;
export default function grabDSQLConnection(param?: DsqlConnectionParam): Promise<Connection>;
dist/package-shared/utils/grab-dsql-connection.js
Vendored
+2 -3
View File
@@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = grabDSQLConnection;
const mariadb_1 = __importDefault(require("mariadb"));
const grab_dsql_connection_config_1 = __importDefault(require("./grab-dsql-connection-config"));
const serverless_mysql_1 = __importDefault(require("serverless-mysql"));
/**
* # Grab General CONNECTION for DSQL
*/
@@ -22,8 +22,7 @@ function grabDSQLConnection(param) {
return __awaiter(this, void 0, void 0, function* () {
const config = (0, grab_dsql_connection_config_1.default)(param);
try {
const sql = (0, serverless_mysql_1.default)(config);
return sql;
return yield mariadb_1.default.createConnection(config);
}
catch (error) {
console.log(`Error Grabbing DSQL Connection =>`, config);