Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 14 Pull requests Projects Releases 24 Packages Wiki Activity Actions

minor v1.4.0 #89

Merged
jkeffects merged 13 commits from develop into main 2025-04-16 15:01:06 +00:00
Conversation 0 Commits 13 Files changed 12 +4 -1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 68ddd4dec4 - Show all commits

5
src/helpers/dynamicQueryBuilder.ts
View file

@ -129,6 +129,7 @@ export default abstract class DynamicQueryBuilder {
conditions: Array<ConditionStructure>, conditions: Array<ConditionStructure>,
alias: string alias: string
): void { ): void {
console.log(conditions, alias);
for (const condition of conditions) { for (const condition of conditions) {
if (condition.structureType == "condition") { if (condition.structureType == "condition") {
const whereClause = this.buildConditionClause(condition, alias); const whereClause = this.buildConditionClause(condition, alias);
@ -168,7 +169,7 @@ export default abstract class DynamicQueryBuilder {
condition: ConditionStructure & { structureType: "condition" }, condition: ConditionStructure & { structureType: "condition" },
alias: string alias: string
): { query: string; parameters: Record<string, unknown> } { ): { query: string; parameters: Record<string, unknown> } {
const parameterKey = `${alias}_${condition.column}_${Math.random().toString(36).substring(2)}`; const parameterKey = `${condition.column}_${Math.random().toString(36).substring(2)}`;
let query = `${alias}.${condition.column}`; let query = `${alias}.${condition.column}`;
let parameters: Record<string, unknown> = {}; let parameters: Record<string, unknown> = {};
@ -238,6 +239,8 @@ export default abstract class DynamicQueryBuilder {
parameters[`${parameterKey}_end`] = new Date(new Date().getFullYear() - (condition.value as number), 11, 31); parameters[`${parameterKey}_end`] = new Date(new Date().getFullYear() - (condition.value as number), 11, 31);
} }
console.log(query, parameters);
return { query, parameters }; return { query, parameters };
} }