Updates
This commit is contained in:
@@ -101,6 +101,8 @@ export default async function apiGet<
|
||||
message: error.message,
|
||||
});
|
||||
|
||||
global.ERROR_CALLBACK?.(`API Get Error`, error as Error);
|
||||
|
||||
if (debug && global.DSQL_USE_LOCAL) {
|
||||
console.log("apiGet:error", error.message);
|
||||
}
|
||||
|
||||
@@ -94,6 +94,8 @@ export default async function apiPost({
|
||||
message: error.message,
|
||||
});
|
||||
|
||||
global.ERROR_CALLBACK?.(`API Post Error`, error as Error);
|
||||
|
||||
return {
|
||||
success: false,
|
||||
payload: results,
|
||||
|
||||
@@ -139,6 +139,8 @@ export default async function googleLogin({
|
||||
message: error.message,
|
||||
});
|
||||
|
||||
global.ERROR_CALLBACK?.(`Google Login Error`, error as Error);
|
||||
|
||||
loginFailureReason = error;
|
||||
|
||||
isUserValid = false;
|
||||
|
||||
@@ -271,6 +271,8 @@ export default async function handleSocialDb({
|
||||
error.message
|
||||
);
|
||||
|
||||
global.ERROR_CALLBACK?.(`Handle Social DB Error`, error as Error);
|
||||
|
||||
return {
|
||||
success: false,
|
||||
payload: null,
|
||||
|
||||
@@ -132,6 +132,11 @@ export default async function addAdminUserOnLogin({
|
||||
);
|
||||
}
|
||||
} catch (error: any) {
|
||||
global.ERROR_CALLBACK?.(
|
||||
`Add Admin User On Login Error`,
|
||||
error as Error
|
||||
);
|
||||
|
||||
serverError({
|
||||
component: "addAdminUserOnLogin",
|
||||
message: error.message,
|
||||
|
||||
@@ -22,6 +22,10 @@ export const initAuthFiles = () => {
|
||||
return true;
|
||||
} catch (error: any) {
|
||||
console.log(`Error initializing Auth Files: ${error.message}`);
|
||||
global.ERROR_CALLBACK?.(
|
||||
`Error Initializing Auth Files`,
|
||||
error as Error
|
||||
);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -170,6 +170,7 @@ export default async function addDbEntry({
|
||||
}
|
||||
} catch (error: any) {
|
||||
console.log("DSQL: Error in parsing data keys =>", error.message);
|
||||
global.ERROR_CALLBACK?.(`Error parsing Data Keys`, error as Error);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,6 +54,7 @@ export default async function deleteDbEntry({
|
||||
*/
|
||||
return deletedEntry;
|
||||
} catch (error) {
|
||||
global.ERROR_CALLBACK?.(`Error Deleting Entry`, error as Error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,6 +49,8 @@ export default async function dbHandler(...args: any[]) {
|
||||
|
||||
results = null;
|
||||
|
||||
global.ERROR_CALLBACK?.(`DB Handler Error`, error as Error);
|
||||
|
||||
serverError({
|
||||
component: "dbHandler",
|
||||
message: error.message,
|
||||
|
||||
@@ -41,6 +41,8 @@ export default async function fullAccessDbHandler({
|
||||
} catch (error: any) {
|
||||
////////////////////////////////////////
|
||||
|
||||
global.ERROR_CALLBACK?.(`Full Access DB Handler Error`, error as Error);
|
||||
|
||||
serverError({
|
||||
component: "fullAccessDbHandler",
|
||||
message: error.message,
|
||||
|
||||
@@ -26,6 +26,11 @@ export default function grabUserSchemaData({
|
||||
message: error.message,
|
||||
});
|
||||
|
||||
global.ERROR_CALLBACK?.(
|
||||
`Error Grabbing User Schema Data`,
|
||||
error as Error
|
||||
);
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,6 +33,8 @@ export default function setUserSchemaData({
|
||||
message: error.message,
|
||||
});
|
||||
|
||||
global.ERROR_CALLBACK?.(`Error Setting User Schema`, error as Error);
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,7 +65,10 @@ export default async function updateUsersTableSchema({
|
||||
|
||||
return `Done!`;
|
||||
} catch (error: any) {
|
||||
console.log(`addUsersTableToDb.ts ERROR: ${error.message}`);
|
||||
global.ERROR_CALLBACK?.(
|
||||
`Error Updating User Table Schema`,
|
||||
error as Error
|
||||
);
|
||||
|
||||
serverError({
|
||||
component: "addUsersTableToDb",
|
||||
|
||||
@@ -55,6 +55,9 @@ export default async function varDatabaseDbHandler({
|
||||
database,
|
||||
error
|
||||
);
|
||||
|
||||
global.ERROR_CALLBACK?.(`VarDb Handler Error`, error as Error);
|
||||
|
||||
serverError({
|
||||
component: "varDatabaseDbHandler/lines-52-53",
|
||||
message: error.message,
|
||||
|
||||
@@ -34,6 +34,8 @@ export default async function varReadOnlyDatabaseDbHandler({
|
||||
noMail: true,
|
||||
});
|
||||
|
||||
global.ERROR_CALLBACK?.(`VarReadOnlyDB Handler Error`, error as Error);
|
||||
|
||||
return error.message;
|
||||
} finally {
|
||||
DB_CONN?.end();
|
||||
|
||||
@@ -52,6 +52,7 @@ export default function decrypt({
|
||||
return decrypted;
|
||||
} catch (error: any) {
|
||||
console.log("Error in decrypting =>", error.message);
|
||||
global.ERROR_CALLBACK?.(`Error Decrypting data`, error as Error);
|
||||
return encryptedString;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,6 +53,7 @@ export default function encrypt({
|
||||
return encrypted;
|
||||
} catch (error: any) {
|
||||
console.log("Error in encrypting =>", error.message);
|
||||
global.ERROR_CALLBACK?.(`Error Encrypting Data`, error as Error);
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,12 +10,10 @@ type Param<T extends { [key: string]: any } = { [key: string]: any }> = {
|
||||
dbFullName?: string;
|
||||
};
|
||||
|
||||
type Return =
|
||||
| {
|
||||
string: string;
|
||||
values: string[];
|
||||
}
|
||||
| undefined;
|
||||
type Return = {
|
||||
string: string;
|
||||
values: string[];
|
||||
};
|
||||
|
||||
/**
|
||||
* # SQL Query Generator
|
||||
@@ -24,9 +22,7 @@ type Return =
|
||||
export default function sqlGenerator<
|
||||
T extends { [key: string]: any } = { [key: string]: any }
|
||||
>({ tableName, genObject, dbFullName }: Param<T>): Return {
|
||||
if (!genObject) return undefined;
|
||||
|
||||
const finalQuery = genObject.query ? genObject.query : undefined;
|
||||
const finalQuery = genObject?.query ? genObject.query : undefined;
|
||||
|
||||
const queryKeys = finalQuery ? Object.keys(finalQuery) : undefined;
|
||||
|
||||
@@ -109,7 +105,7 @@ export default function sqlGenerator<
|
||||
return genSqlSrchStr({
|
||||
queryObj: newSubQueryObj,
|
||||
field: _field,
|
||||
join: genObject.join,
|
||||
join: genObject?.join,
|
||||
});
|
||||
});
|
||||
|
||||
@@ -120,7 +116,7 @@ export default function sqlGenerator<
|
||||
);
|
||||
}
|
||||
|
||||
return genSqlSrchStr({ queryObj, field, join: genObject.join });
|
||||
return genSqlSrchStr({ queryObj, field, join: genObject?.join });
|
||||
});
|
||||
|
||||
function generateJoinStr(
|
||||
@@ -162,7 +158,7 @@ export default function sqlGenerator<
|
||||
|
||||
let queryString = (() => {
|
||||
let str = "SELECT";
|
||||
if (genObject.selectFields?.[0]) {
|
||||
if (genObject?.selectFields?.[0]) {
|
||||
if (genObject.join) {
|
||||
str += ` ${genObject.selectFields
|
||||
?.map((fld) => `${finalDbName}${tableName}.${fld}`)
|
||||
@@ -171,15 +167,14 @@ export default function sqlGenerator<
|
||||
str += ` ${genObject.selectFields?.join(",")}`;
|
||||
}
|
||||
} else {
|
||||
if (genObject.join) {
|
||||
if (genObject?.join) {
|
||||
str += ` ${finalDbName}${tableName}.*`;
|
||||
} else {
|
||||
str += " *";
|
||||
}
|
||||
}
|
||||
|
||||
if (genObject.join) {
|
||||
/** @type {string[]} */
|
||||
if (genObject?.join) {
|
||||
const existingJoinTableNames: string[] = [tableName];
|
||||
|
||||
str +=
|
||||
@@ -219,7 +214,7 @@ export default function sqlGenerator<
|
||||
|
||||
str += ` FROM ${finalDbName}${tableName}`;
|
||||
|
||||
if (genObject.join) {
|
||||
if (genObject?.join) {
|
||||
str +=
|
||||
" " +
|
||||
genObject.join
|
||||
@@ -262,18 +257,18 @@ export default function sqlGenerator<
|
||||
|
||||
if (sqlSearhString?.[0] && sqlSearhString.find((str) => str)) {
|
||||
const stringOperator = genObject?.searchOperator || "AND";
|
||||
queryString += ` WHERE ${sqlSearhString.join(` ${stringOperator} `)} `;
|
||||
queryString += ` WHERE ${sqlSearhString.join(` ${stringOperator} `)}`;
|
||||
}
|
||||
|
||||
if (genObject.order)
|
||||
if (genObject?.order)
|
||||
queryString += ` ORDER BY ${
|
||||
genObject.join
|
||||
? `${finalDbName}${tableName}.${String(genObject.order.field)}`
|
||||
: String(genObject.order.field)
|
||||
} ${genObject.order.strategy}`;
|
||||
|
||||
if (genObject.limit) queryString += ` LIMIT ${genObject.limit}`;
|
||||
if (genObject.offset) queryString += ` OFFSET ${genObject.offset}`;
|
||||
if (genObject?.limit) queryString += ` LIMIT ${genObject.limit}`;
|
||||
if (genObject?.offset) queryString += ` OFFSET ${genObject.offset}`;
|
||||
|
||||
return {
|
||||
string: queryString,
|
||||
|
||||
Reference in New Issue
Block a user