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-07-09 20:30:45 +01:00
parent ccb5605b58
commit c37d105dee
264 changed files with 2389 additions and 3743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/package-shared/functions/backend/db/addDbEntry.js
Vendored
+6 -11
View File
@@ -37,12 +37,6 @@ function addDbEntry(_a) {
label: "isMaster",
});
}
const DB_CONN = isMaster
? global.DSQL_DB_CONN
: global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
const DB_RO_CONN = isMaster
? global.DSQL_DB_CONN
: global.DSQL_READ_ONLY_DB_CONN || global.DSQL_DB_CONN;
let newData = lodash_1.default.cloneDeep(data);
if (newData) {
newData = (0, purge_default_fields_1.default)(newData);
@@ -55,7 +49,9 @@ function addDbEntry(_a) {
typeof duplicateColumnName === "string" &&
newData) {
const checkDuplicateQuery = `SELECT * FROM ${isMaster ? "" : `\`${dbFullName}\`.`}\`${tableName}\` WHERE \`${duplicateColumnName}\`=?`;
const duplicateValue = yield (0, conn_db_handler_1.default)(DB_RO_CONN, checkDuplicateQuery, [duplicateColumnValue]);
const duplicateValue = yield (0, conn_db_handler_1.default)(null, checkDuplicateQuery, [
duplicateColumnValue,
]);
if ((duplicateValue === null || duplicateValue === void 0 ? void 0 : duplicateValue[0]) && !update) {
return {
success: false,
@@ -78,7 +74,7 @@ function addDbEntry(_a) {
}
}
function generateQuery(data) {
var _a, _b, _c;
var _a, _b;
const dataKeys = Object.keys(data);
let insertKeysArray = [];
let insertValuesArray = [];
@@ -131,7 +127,6 @@ function addDbEntry(_a) {
}
catch (error) {
console.log("DSQL: Error in parsing data keys =>", error.message);
(_c = global.ERROR_CALLBACK) === null || _c === void 0 ? void 0 : _c.call(global, `Error parsing Data Keys`, error);
continue;
}
}
@@ -149,7 +144,7 @@ function addDbEntry(_a) {
if (newData) {
const { insertKeysArray, insertValuesArray, queryValuesArray } = generateQuery(newData);
const query = `INSERT INTO ${isMaster && !dbFullName ? "" : `\`${dbFullName}\`.`}\`${tableName}\` (${insertKeysArray.join(",")}) VALUES (${insertValuesArray.map(() => "?").join(",")})`;
const newInsert = yield (0, conn_db_handler_1.default)(DB_CONN, query, queryValuesArray, debug);
const newInsert = yield (0, conn_db_handler_1.default)(null, query, queryValuesArray, debug);
return {
success: Boolean(newInsert === null || newInsert === void 0 ? void 0 : newInsert.insertId),
payload: newInsert,
@@ -177,7 +172,7 @@ function addDbEntry(_a) {
.join(",")}`;
console.log("query", query);
console.log("batchQueryValuesArray", batchQueryValuesArray);
const newInsert = yield (0, conn_db_handler_1.default)(DB_CONN, query, batchQueryValuesArray.flat(), debug);
const newInsert = yield (0, conn_db_handler_1.default)(null, query, batchQueryValuesArray.flat(), debug);
if (debug) {
(0, debug_log_1.default)({
log: newInsert,
dist/package-shared/functions/backend/db/deleteDbEntry.js
Vendored
+2 -6
View File
@@ -21,21 +21,17 @@ const conn_db_handler_1 = __importDefault(require("../../../utils/db/conn-db-han
*/
function deleteDbEntry(_a) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, dbFullName, tableName, identifierColumnName, identifierValue, forceLocal, }) {
var _b;
try {
const isMaster = forceLocal
? true
: (0, check_if_is_master_1.default)({ dbContext, dbFullName });
const DB_CONN = isMaster
? global.DSQL_DB_CONN
: global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
/**
* Execution
*
* @description
*/
const query = `DELETE FROM ${isMaster && !dbFullName ? "" : `\`${dbFullName}\`.`}\`${tableName}\` WHERE \`${identifierColumnName.toString()}\`=?`;
const deletedEntry = yield (0, conn_db_handler_1.default)(DB_CONN, query, [
const deletedEntry = yield (0, conn_db_handler_1.default)(null, query, [
identifierValue,
]);
/**
@@ -44,7 +40,7 @@ function deleteDbEntry(_a) {
return deletedEntry;
}
catch (error) {
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Deleting Entry`, error);
console.log("Error Deleting Entry =>", error.message);
return null;
}
});
dist/package-shared/functions/backend/db/runQuery.d.ts
Vendored
+1 -2
View File
@@ -8,7 +8,6 @@ type Param = {
dbSchema?: import("../../../types").DSQL_DatabaseSchemaType;
queryValuesArray?: (string | number)[];
tableName?: string;
forceLocal?: boolean;
};
type Return = {
result: any;
@@ -17,5 +16,5 @@ type Return = {
/**
* # Run DSQL users queries
*/
export default function runQuery({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, debug, dbContext, forceLocal, }: Param): Promise<Return>;
export default function runQuery({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, debug, dbContext, }: Param): Promise<Return>;
export {};
dist/package-shared/functions/backend/db/runQuery.js
Vendored
+7 -10
View File
@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.DbContextsArray = void 0;
exports.default = runQuery;
const fullAccessDbHandler_1 = __importDefault(require("../fullAccessDbHandler"));
const varReadOnlyDatabaseDbHandler_1 = __importDefault(require("../varReadOnlyDatabaseDbHandler"));
const dbHandler_1 = __importDefault(require("../dbHandler"));
const serverError_1 = __importDefault(require("../serverError"));
const addDbEntry_1 = __importDefault(require("./addDbEntry"));
const updateDbEntry_1 = __importDefault(require("./updateDbEntry"));
@@ -26,7 +26,7 @@ exports.DbContextsArray = ["Master", "Dsql User"];
* # Run DSQL users queries
*/
function runQuery(_a) {
return __awaiter(this, arguments, void 0, function* ({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, debug, dbContext, forceLocal, }) {
return __awaiter(this, arguments, void 0, function* ({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, debug, dbContext, }) {
/**
* Declare variables
*
@@ -60,7 +60,7 @@ function runQuery(_a) {
try {
if (typeof query === "string") {
const formattedQuery = (0, trim_sql_1.default)(query);
if (debug && global.DSQL_USE_LOCAL) {
if (debug) {
console.log("runQuery:formattedQuery", formattedQuery);
}
/**
@@ -72,11 +72,9 @@ function runQuery(_a) {
throw new Error("Wrong Input!");
}
if (readOnly) {
result = yield (0, varReadOnlyDatabaseDbHandler_1.default)({
queryString: formattedQuery,
queryValuesArray: queryValuesArray === null || queryValuesArray === void 0 ? void 0 : queryValuesArray.map((vl) => String(vl)),
tableSchema,
forceLocal,
result = yield (0, dbHandler_1.default)({
query: formattedQuery,
values: queryValuesArray === null || queryValuesArray === void 0 ? void 0 : queryValuesArray.map((vl) => String(vl)),
});
}
else {
@@ -84,7 +82,6 @@ function runQuery(_a) {
queryString: formattedQuery,
queryValuesArray: queryValuesArray === null || queryValuesArray === void 0 ? void 0 : queryValuesArray.map((vl) => String(vl)),
tableSchema,
forceLocal,
});
}
}
@@ -144,7 +141,7 @@ function runQuery(_a) {
component: "functions/backend/runQuery",
message: err.message,
});
if (debug && global.DSQL_USE_LOCAL) {
if (debug) {
console.log("runQuery:error", err.message);
}
result = null;
dist/package-shared/functions/backend/db/updateDbEntry.js
Vendored
+1 -4
View File
@@ -40,9 +40,6 @@ function updateDbEntry(_a) {
const isMaster = forceLocal
? true
: (0, check_if_is_master_1.default)({ dbContext, dbFullName });
const DB_CONN = isMaster
? global.DSQL_DB_CONN
: global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
////////////////////////////////////////
////////////////////////////////////////
////////////////////////////////////////
@@ -128,7 +125,7 @@ function updateDbEntry(_a) {
////////////////////////////////////////
const query = `UPDATE ${isMaster && !dbFullName ? "" : `\`${dbFullName}\`.`}\`${tableName}\` SET ${updateKeyValueArray.join(",")} WHERE \`${identifierColumnName}\`=?`;
updateValues.push(identifierValue);
const updatedEntry = yield (0, conn_db_handler_1.default)(DB_CONN, query, updateValues);
const updatedEntry = yield (0, conn_db_handler_1.default)(null, query, updateValues);
/**
* Return statement
*/