Remove all 'useLocal' params

This commit is contained in:
Benjamin Toby
2025-01-20 09:12:43 +01:00
parent 16191975f9
commit 7d0f3e12f3
113 changed files with 164 additions and 425 deletions
+1 -23
View File
@@ -10,31 +10,9 @@ type Param = {
update?: boolean;
encryptionKey?: string;
encryptionSalt?: string;
useLocal?: boolean;
};
/**
* Add a db Entry Function
* ==============================================================================
* @description Description
* @async
*
* @param {object} params - An object containing the function parameters.
* @param {("Master" | "Dsql User")} [params.dbContext] - What is the database context? "Master"
* or "Dsql User". Defaults to "Master"
* @param {("Read Only" | "Full Access")} [params.paradigm] - What is the paradigm for "Dsql User"?
* "Read only" or "Full Access"? Defaults to "Read Only"
* @param {string} [params.dbFullName] - Database full name
* @param {string} params.tableName - Table name
* @param {any} params.data - Data to add
* @param {import("../../../types").DSQL_TableSchemaType} [params.tableSchema] - Table schema
* @param {string} [params.duplicateColumnName] - Duplicate column name
* @param {string} [params.duplicateColumnValue] - Duplicate column value
* @param {boolean} [params.update] - Update this row if it exists
* @param {string} [params.encryptionKey] - Update this row if it exists
* @param {string} [params.encryptionSalt] - Update this row if it exists
* @param {boolean} [params.useLocal]
*
* @returns {Promise<any>}
*/
export default function addDbEntry({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, useLocal, }: Param): Promise<any>;
export default function addDbEntry({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, }: Param): Promise<any>;
export {};
+3 -24
View File
@@ -23,35 +23,14 @@ const encrypt_1 = __importDefault(require("../../dsql/encrypt"));
const LOCAL_DB_HANDLER_1 = __importDefault(require("../../../utils/backend/global-db/LOCAL_DB_HANDLER"));
/**
* Add a db Entry Function
* ==============================================================================
* @description Description
* @async
*
* @param {object} params - An object containing the function parameters.
* @param {("Master" | "Dsql User")} [params.dbContext] - What is the database context? "Master"
* or "Dsql User". Defaults to "Master"
* @param {("Read Only" | "Full Access")} [params.paradigm] - What is the paradigm for "Dsql User"?
* "Read only" or "Full Access"? Defaults to "Read Only"
* @param {string} [params.dbFullName] - Database full name
* @param {string} params.tableName - Table name
* @param {any} params.data - Data to add
* @param {import("../../../types").DSQL_TableSchemaType} [params.tableSchema] - Table schema
* @param {string} [params.duplicateColumnName] - Duplicate column name
* @param {string} [params.duplicateColumnValue] - Duplicate column value
* @param {boolean} [params.update] - Update this row if it exists
* @param {string} [params.encryptionKey] - Update this row if it exists
* @param {string} [params.encryptionSalt] - Update this row if it exists
* @param {boolean} [params.useLocal]
*
* @returns {Promise<any>}
*/
function addDbEntry(_a) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, useLocal, }) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, }) {
var _b, _c;
/**
* Initialize variables
*/
const isMaster = useLocal
const isMaster = global.DSQL_USE_LOCAL
? true
: (dbContext === null || dbContext === void 0 ? void 0 : dbContext.match(/dsql.user/i))
? false
@@ -59,7 +38,7 @@ function addDbEntry(_a) {
? false
: true;
/** @type { any } */
const dbHandler = useLocal
const dbHandler = global.DSQL_USE_LOCAL
? LOCAL_DB_HANDLER_1.default
: isMaster
? DB_HANDLER_1.default
@@ -6,11 +6,10 @@ type Param = {
tableSchema?: import("../../../types").DSQL_TableSchemaType;
identifierColumnName: string;
identifierValue: string | number;
useLocal?: boolean;
};
/**
* # Delete DB Entry Function
* @description
*/
export default function deleteDbEntry({ dbContext, paradigm, dbFullName, tableName, identifierColumnName, identifierValue, useLocal, }: Param): Promise<object | null>;
export default function deleteDbEntry({ dbContext, paradigm, dbFullName, tableName, identifierColumnName, identifierValue, }: Param): Promise<object | null>;
export {};
+3 -4
View File
@@ -21,17 +21,16 @@ const LOCAL_DB_HANDLER_1 = __importDefault(require("../../../utils/backend/globa
* @description
*/
function deleteDbEntry(_a) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, identifierColumnName, identifierValue, useLocal, }) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, identifierColumnName, identifierValue, }) {
try {
const isMaster = useLocal
const isMaster = global.DSQL_USE_LOCAL
? true
: (dbContext === null || dbContext === void 0 ? void 0 : dbContext.match(/dsql.user/i))
? false
: dbFullName && !dbFullName.match(/^datasquirel$/)
? false
: true;
/** @type { (a1:any, a2?:any) => any } */
const dbHandler = useLocal
const dbHandler = global.DSQL_USE_LOCAL
? LOCAL_DB_HANDLER_1.default
: isMaster
? DB_HANDLER_1.default
+1 -2
View File
@@ -2,7 +2,6 @@ type Param = {
dbFullName: string;
query: string | any;
readOnly?: boolean;
local?: boolean;
debug?: boolean;
dbSchema?: import("../../../types").DSQL_DatabaseSchemaType;
queryValuesArray?: (string | number)[];
@@ -11,5 +10,5 @@ type Param = {
/**
* # Run DSQL users queries
*/
export default function runQuery({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, local, debug, }: Param): Promise<any>;
export default function runQuery({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, debug, }: Param): Promise<any>;
export {};
+12 -11
View File
@@ -24,7 +24,7 @@ const trim_sql_1 = __importDefault(require("../../../utils/trim-sql"));
* # Run DSQL users queries
*/
function runQuery(_a) {
return __awaiter(this, arguments, void 0, function* ({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, local, debug, }) {
return __awaiter(this, arguments, void 0, function* ({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, debug, }) {
/**
* Declare variables
*
@@ -58,7 +58,7 @@ function runQuery(_a) {
try {
if (typeof query === "string") {
const formattedQuery = (0, trim_sql_1.default)(query);
if (debug && local) {
if (debug && global.DSQL_USE_LOCAL) {
console.log("runQuery:formattedQuery", formattedQuery);
}
/**
@@ -75,7 +75,6 @@ function runQuery(_a) {
queryString: formattedQuery,
queryValuesArray: queryValuesArray === null || queryValuesArray === void 0 ? void 0 : queryValuesArray.map((vl) => String(vl)),
tableSchema,
useLocal: local,
});
}
else {
@@ -83,7 +82,6 @@ function runQuery(_a) {
queryString: formattedQuery,
queryValuesArray: queryValuesArray === null || queryValuesArray === void 0 ? void 0 : queryValuesArray.map((vl) => String(vl)),
tableSchema,
local,
});
}
}
@@ -97,7 +95,9 @@ function runQuery(_a) {
switch (action.toLowerCase()) {
case "insert":
result = yield (0, addDbEntry_1.default)({
dbContext: local ? "Master" : "Dsql User",
dbContext: global.DSQL_USE_LOCAL
? "Master"
: "Dsql User",
paradigm: "Full Access",
dbFullName: dbFullName,
tableName: table,
@@ -106,7 +106,6 @@ function runQuery(_a) {
duplicateColumnName,
duplicateColumnValue,
tableSchema,
useLocal: local,
});
if (!(result === null || result === void 0 ? void 0 : result.insertId)) {
error = new Error("Couldn't insert data");
@@ -114,7 +113,9 @@ function runQuery(_a) {
break;
case "update":
result = yield (0, updateDbEntry_1.default)({
dbContext: local ? "Master" : "Dsql User",
dbContext: global.DSQL_USE_LOCAL
? "Master"
: "Dsql User",
paradigm: "Full Access",
dbFullName: dbFullName,
tableName: table,
@@ -122,19 +123,19 @@ function runQuery(_a) {
identifierColumnName,
identifierValue,
tableSchema,
useLocal: local,
});
break;
case "delete":
result = yield (0, deleteDbEntry_1.default)({
dbContext: local ? "Master" : "Dsql User",
dbContext: global.DSQL_USE_LOCAL
? "Master"
: "Dsql User",
paradigm: "Full Access",
dbFullName: dbFullName,
tableName: table,
identifierColumnName,
identifierValue,
tableSchema,
useLocal: local,
});
break;
default:
@@ -148,7 +149,7 @@ function runQuery(_a) {
component: "functions/backend/runQuery",
message: error.message,
});
if (debug && local) {
if (debug && global.DSQL_USE_LOCAL) {
console.log("runQuery:error", error.message);
}
result = null;
@@ -9,11 +9,10 @@ type Param = {
tableSchema?: import("../../../types").DSQL_TableSchemaType;
identifierColumnName: string;
identifierValue: string | number;
useLocal?: boolean;
};
/**
* # Update DB Function
* @description
*/
export default function updateDbEntry({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, identifierColumnName, identifierValue, encryptionKey, encryptionSalt, useLocal, }: Param): Promise<object | null>;
export default function updateDbEntry({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, identifierColumnName, identifierValue, encryptionKey, encryptionSalt, }: Param): Promise<object | null>;
export {};
+3 -3
View File
@@ -24,14 +24,14 @@ const LOCAL_DB_HANDLER_1 = __importDefault(require("../../../utils/backend/globa
* @description
*/
function updateDbEntry(_a) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, identifierColumnName, identifierValue, encryptionKey, encryptionSalt, useLocal, }) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, identifierColumnName, identifierValue, encryptionKey, encryptionSalt, }) {
var _b;
/**
* Check if data is valid
*/
if (!data || !Object.keys(data).length)
return null;
const isMaster = useLocal
const isMaster = global.DSQL_USE_LOCAL
? true
: (dbContext === null || dbContext === void 0 ? void 0 : dbContext.match(/dsql.user/i))
? false
@@ -39,7 +39,7 @@ function updateDbEntry(_a) {
? false
: true;
/** @type {(a1:any, a2?:any)=> any } */
const dbHandler = useLocal
const dbHandler = global.DSQL_USE_LOCAL
? LOCAL_DB_HANDLER_1.default
: isMaster
? DB_HANDLER_1.default