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-06 06:37:43 +01:00
parent 689f885d9d
commit a1e56bb1b0
27 changed files with 163 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/package-shared/functions/backend/db/addDbEntry.d.ts
Vendored
+3 -1
View File
@@ -1,5 +1,6 @@
import { DbContextsArray } from "./runQuery";
import { APIResponseObject, DSQL_TableSchemaType, PostInsertReturn } from "../../../types";
import { ConnectionConfig } from "mariadb";
export type AddDbEntryParam<T extends {
[k: string]: any;
} = any, K extends string = string> = {
@@ -21,10 +22,11 @@ export type AddDbEntryParam<T extends {
encryptionSalt?: string;
forceLocal?: boolean;
debug?: boolean;
dbConfig?: ConnectionConfig;
};
/**
* Add a db Entry Function
*/
export default function addDbEntry<T extends {
[k: string]: any;
} = any, K extends string = string>({ dbContext, paradigm, dbFullName, tableName, data, batchData, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, debug, }: AddDbEntryParam<T, K>): Promise<APIResponseObject<PostInsertReturn>>;
} = any, K extends string = string>({ dbContext, paradigm, dbFullName, tableName, data, batchData, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, debug, dbConfig, }: AddDbEntryParam<T, K>): Promise<APIResponseObject<PostInsertReturn>>;
dist/package-shared/functions/backend/db/addDbEntry.js
Vendored
+20 -6
View File
@@ -24,7 +24,7 @@ const grab_parsed_value_1 = __importDefault(require("./grab-parsed-value"));
* Add a db Entry Function
*/
function addDbEntry(_a) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, data, batchData, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, debug, }) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, data, batchData, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, debug, dbConfig, }) {
const isMaster = forceLocal
? true
: (0, check_if_is_master_1.default)({ dbContext, dbFullName });
@@ -47,9 +47,10 @@ 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)(null, checkDuplicateQuery, [
duplicateColumnValue,
]);
const duplicateValue = yield (0, conn_db_handler_1.default)({
query: checkDuplicateQuery,
values: [duplicateColumnValue],
});
if ((duplicateValue === null || duplicateValue === void 0 ? void 0 : duplicateValue[0]) && !update) {
return {
success: false,
@@ -68,6 +69,9 @@ function addDbEntry(_a) {
encryptionSalt,
identifierColumnName: duplicateColumnName,
identifierValue: duplicateColumnValue || "",
dbConfig,
debug,
forceLocal,
});
}
}
@@ -138,7 +142,12 @@ function addDbEntry(_a) {
const { insertKeysArray, insertValuesArray, queryValuesArray } = generateQuery(newData);
const query = `INSERT INTO ${isMaster && !dbFullName ? "" : `\`${dbFullName}\`.`}\`${tableName}\` (${insertKeysArray.join(",")}) VALUES (${grabQueryValuesString(insertValuesArray)})`;
const finalQueryValues = grabFinalQueryValuesArr(queryValuesArray);
const newInsert = yield (0, conn_db_handler_1.default)(null, query, finalQueryValues, debug);
const newInsert = yield (0, conn_db_handler_1.default)({
query,
values: finalQueryValues,
debug,
dsqlConnOpts: { config: dbConfig },
});
return {
success: Boolean(newInsert === null || newInsert === void 0 ? void 0 : newInsert.insertId),
payload: newInsert,
@@ -165,7 +174,12 @@ function addDbEntry(_a) {
.map((vl) => `(${grabQueryValuesString(vl)})`)
.join(",")}`;
const finalQueryValues = grabFinalQueryValuesArr(batchQueryValuesArray.flat());
const newInsert = yield (0, conn_db_handler_1.default)(null, query, finalQueryValues, debug);
const newInsert = yield (0, conn_db_handler_1.default)({
query,
values: finalQueryValues,
debug,
dsqlConnOpts: { config: dbConfig },
});
if (debug) {
(0, debug_log_1.default)({
log: newInsert,
dist/package-shared/functions/backend/db/deleteDbEntry.js
Vendored
+4 -3
View File
@@ -31,9 +31,10 @@ function deleteDbEntry(_a) {
* @description
*/
const query = `DELETE FROM ${isMaster && !dbFullName ? "" : `\`${dbFullName}\`.`}\`${tableName}\` WHERE \`${identifierColumnName.toString()}\`=?`;
const deletedEntry = yield (0, conn_db_handler_1.default)(null, query, [
identifierValue,
]);
const deletedEntry = yield (0, conn_db_handler_1.default)({
query,
values: [identifierValue],
});
/**
* Return statement
*/
dist/package-shared/functions/backend/db/updateDbEntry.d.ts
Vendored
+3 -1
View File
@@ -1,5 +1,6 @@
import { DbContextsArray } from "./runQuery";
import { APIResponseObject, DSQL_TableSchemaType, PostInsertReturn } from "../../../types";
import { ConnectionConfig } from "mariadb";
type Param<T extends {
[k: string]: any;
} = any> = {
@@ -14,6 +15,7 @@ type Param<T extends {
identifierValue: string | number;
forceLocal?: boolean;
debug?: boolean;
dbConfig?: ConnectionConfig;
};
/**
* # Update DB Function
@@ -21,5 +23,5 @@ type Param<T extends {
*/
export default function updateDbEntry<T extends {
[k: string]: any;
} = any>({ dbContext, dbFullName, tableName, data, tableSchema, identifierColumnName, identifierValue, encryptionKey, encryptionSalt, forceLocal, debug, }: Param<T>): Promise<APIResponseObject<PostInsertReturn>>;
} = any>({ dbContext, dbFullName, tableName, data, tableSchema, identifierColumnName, identifierValue, encryptionKey, encryptionSalt, forceLocal, debug, dbConfig, }: Param<T>): Promise<APIResponseObject<PostInsertReturn>>;
export {};
dist/package-shared/functions/backend/db/updateDbEntry.js
Vendored
+6 -2
View File
@@ -23,7 +23,7 @@ const grab_parsed_value_1 = __importDefault(require("./grab-parsed-value"));
* @description
*/
function updateDbEntry(_a) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, dbFullName, tableName, data, tableSchema, identifierColumnName, identifierValue, encryptionKey, encryptionSalt, forceLocal, debug, }) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, dbFullName, tableName, data, tableSchema, identifierColumnName, identifierValue, encryptionKey, encryptionSalt, forceLocal, debug, dbConfig, }) {
var _b, _c;
/**
* Check if data is valid
@@ -97,7 +97,11 @@ 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)(null, query, updateValues);
const updatedEntry = yield (0, conn_db_handler_1.default)({
query,
values: updateValues,
dsqlConnOpts: { config: dbConfig },
});
/**
* Return statement
*/
dist/package-shared/functions/backend/fullAccessDbHandler.js
Vendored
+4 -1
View File
@@ -33,7 +33,10 @@ function fullAccessDbHandler(_a) {
* @description Fetch data from db if no cache
*/
try {
results = yield (0, conn_db_handler_1.default)(null, queryString, queryValuesArray);
results = yield (0, conn_db_handler_1.default)({
query: queryString,
values: queryValuesArray,
});
////////////////////////////////////////
}
catch (error) {
dist/package-shared/functions/backend/su-db-handler.js
Vendored
+1 -1
View File
@@ -42,7 +42,7 @@ function suDbHandler(_a) {
// bigNumberStrings: false,
// dateStrings: true,
// });
const results = yield (0, conn_db_handler_1.default)(connection, query);
const results = yield (0, conn_db_handler_1.default)({ conn: connection, query });
return results;
});
}
dist/package-shared/functions/backend/user-db-handler.js
Vendored
+1 -1
View File
@@ -34,7 +34,7 @@ function userDbHandler(_a) {
bigIntAsNumber: true,
metaAsArray: true,
});
const results = yield (0, conn_db_handler_1.default)(connection, query);
const results = yield (0, conn_db_handler_1.default)({ conn: connection, query });
if (Array.isArray(results)) {
const parsedDbResults = results.map((res) => parseResultObject(res));
return parsedDbResults;
dist/package-shared/types/index.d.ts
Vendored
+1
View File
@@ -1267,6 +1267,7 @@ export type DsqlCrudParam<T extends {
dbFullName?: string;
dbName?: string;
tableSchema?: DSQL_TableSchemaType;
dbConfig?: ConnectionConfig;
};
export type ErrorCallback = (title: string, error: Error, data?: any) => void;
export interface MariaDBUser {
dist/package-shared/utils/backend/import-mariadb-database.js
Vendored
+3 -1
View File
@@ -26,7 +26,9 @@ function importMariadbDatabase(_a) {
const finalMariadbUser = mariadbUser || process.env.DSQL_DB_USERNAME;
const finalMariadbHost = mariadbHost || process.env.DSQL_DB_HOST;
const finalMariadbPass = mariadbPass || process.env.DSQL_DB_PASSWORD;
yield (0, conn_db_handler_1.default)(null, `CREATE DATABASE IF NOT EXISTS ${dbFullName}`);
yield (0, conn_db_handler_1.default)({
query: `CREATE DATABASE IF NOT EXISTS ${dbFullName}`,
});
const cmd = `${mysqlPath} -u ${finalMariadbUser} -h ${finalMariadbHost} -p"${finalMariadbPass}" ${dbFullName} < ${targetFilePath}`;
let execSyncOptions = {
encoding: "utf-8",
dist/package-shared/utils/data-fetching/crud-get.d.ts
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ export default function <T extends {
[key: string]: any;
} = {
[key: string]: any;
}>({ table, query, count, countOnly, dbFullName, tableSchema, }: Omit<DsqlCrudParam<T>, "action" | "data" | "sanitize">): Promise<APIResponseObject>;
}>({ table, query, count, countOnly, dbFullName, tableSchema, dbConfig, }: Omit<DsqlCrudParam<T>, "action" | "data" | "sanitize">): Promise<APIResponseObject>;
dist/package-shared/utils/data-fetching/crud-get.js
Vendored
+5 -2
View File
@@ -18,7 +18,7 @@ const conn_db_handler_1 = __importDefault(require("../db/conn-db-handler"));
const check_array_depth_1 = __importDefault(require("../check-array-depth"));
const parseDbResults_1 = __importDefault(require("../../functions/backend/parseDbResults"));
function default_1(_a) {
return __awaiter(this, arguments, void 0, function* ({ table, query, count, countOnly, dbFullName, tableSchema, }) {
return __awaiter(this, arguments, void 0, function* ({ table, query, count, countOnly, dbFullName, tableSchema, dbConfig, }) {
var _b, _c, _d, _e;
let queryObject;
queryObject = (0, sql_generator_1.default)({
@@ -54,7 +54,10 @@ function default_1(_a) {
},
];
}
const res = yield (0, conn_db_handler_1.default)(undefined, connQueries);
const res = yield (0, conn_db_handler_1.default)({
query: connQueries,
dsqlConnOpts: { config: dbConfig },
});
const parsedRes = (0, check_array_depth_1.default)(res, 2)
? (0, parseDbResults_1.default)({ unparsedResults: res[0], tableSchema })
: res[0];
dist/package-shared/utils/data-fetching/crud.js
Vendored
+8 -2
View File
@@ -20,7 +20,7 @@ const addDbEntry_1 = __importDefault(require("../../functions/backend/db/addDbEn
const updateDbEntry_1 = __importDefault(require("../../functions/backend/db/updateDbEntry"));
function dsqlCrud(params) {
return __awaiter(this, void 0, void 0, function* () {
const { action, data, table, targetValue, sanitize, targetField, targetId, dbFullName, deleteData, batchData, deleteKeyValues, debug, tableSchema, deleteKeyValuesOperator, } = params;
const { action, data, table, targetValue, sanitize, targetField, targetId, dbFullName, deleteData, batchData, deleteKeyValues, debug, tableSchema, deleteKeyValuesOperator, dbConfig, } = params;
const finalData = (sanitize ? sanitize({ data }) : data);
const finalBatchData = (sanitize ? sanitize({ batchData }) : batchData);
switch (action) {
@@ -36,6 +36,7 @@ function dsqlCrud(params) {
dbFullName,
debug,
tableSchema,
dbConfig,
});
return INSERT_RESULT;
case "update":
@@ -48,6 +49,7 @@ function dsqlCrud(params) {
identifierValue: String(targetValue || targetId),
debug,
tableSchema,
dbConfig,
});
return UPDATE_RESULT;
case "delete":
@@ -62,7 +64,11 @@ function dsqlCrud(params) {
deleteKeyValues,
deleteKeyValuesOperator,
});
const res = (yield (0, conn_db_handler_1.default)(undefined, deleteQuery === null || deleteQuery === void 0 ? void 0 : deleteQuery.query, deleteQuery === null || deleteQuery === void 0 ? void 0 : deleteQuery.values));
const res = (yield (0, conn_db_handler_1.default)({
query: deleteQuery === null || deleteQuery === void 0 ? void 0 : deleteQuery.query,
values: deleteQuery === null || deleteQuery === void 0 ? void 0 : deleteQuery.values,
dsqlConnOpts: { config: dbConfig },
}));
return {
success: Boolean(res.affectedRows),
payload: res,
dist/package-shared/utils/db/conn-db-handler.d.ts
Vendored
+18 -14
View File
@@ -1,4 +1,4 @@
import { DSQLErrorObject } from "../../types";
import { DsqlConnectionParam, DSQLErrorObject } from "../../types";
import mariadb, { ConnectionConfig } from "mariadb";
export type ConnDBHandlerQueryObject = {
query: string;
@@ -9,22 +9,26 @@ type Return<ReturnType = any> = ReturnType | ReturnType[] | null | {
errors?: DSQLErrorObject[];
config?: ConnectionConfig;
};
export type ConnectionDbHandlerParams = {
/**
* MariaDB Connection
*/
conn?: mariadb.Connection | null;
/**
* String Or `ConnDBHandlerQueryObject` Array
*/
query?: ConnDBHandlerQueryObject["query"] | ConnDBHandlerQueryObject[];
/**
* Array of Values to Sanitize and Inject
*/
values?: ConnDBHandlerQueryObject["values"];
debug?: boolean;
dsqlConnOpts?: DsqlConnectionParam;
};
/**
* # Run Query From MySQL Connection
* @description Run a query from a pre-existing MySQL/Mariadb Connection
* setup with `serverless-mysql` npm module
*/
export default function connDbHandler<ReturnType = any>(
/**
* MariaDB Connection
*/
conn?: mariadb.Connection | null,
/**
* String Or `ConnDBHandlerQueryObject` Array
*/
query?: ConnDBHandlerQueryObject["query"] | ConnDBHandlerQueryObject[],
/**
* Array of Values to Sanitize and Inject
*/
values?: ConnDBHandlerQueryObject["values"], debug?: boolean): Promise<Return<ReturnType>>;
export default function connDbHandler<ReturnType = any>({ conn, debug, query, values, dsqlConnOpts, }: ConnectionDbHandlerParams): Promise<Return<ReturnType>>;
export {};
dist/package-shared/utils/db/conn-db-handler.js
Vendored
+3 -15
View File
@@ -20,21 +20,9 @@ const grab_dsql_connection_1 = __importDefault(require("../grab-dsql-connection"
* @description Run a query from a pre-existing MySQL/Mariadb Connection
* setup with `serverless-mysql` npm module
*/
function connDbHandler(
/**
* MariaDB Connection
*/
conn,
/**
* String Or `ConnDBHandlerQueryObject` Array
*/
query,
/**
* Array of Values to Sanitize and Inject
*/
values, debug) {
return __awaiter(this, void 0, void 0, function* () {
const finalConnection = conn || (yield (0, grab_dsql_connection_1.default)());
function connDbHandler(_a) {
return __awaiter(this, arguments, void 0, function* ({ conn, debug, query, values, dsqlConnOpts, }) {
const finalConnection = conn || (yield (0, grab_dsql_connection_1.default)(dsqlConnOpts));
try {
if (!finalConnection)
throw new Error("No Connection Found!");