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

compatability layer

Browse source
This commit is contained in:
Julian Krauser 2025-04-15 10:09:08 +02:00
parent dbafd568dd
commit e08b7e8683
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/helpers/dynamicQueryBuilder.ts
View file

@ -2,6 +2,7 @@ import { Brackets, DataSource, NotBrackets, ObjectLiteral, SelectQueryBuilder, W
import { dataSource } from "../data-source"; import { dataSource } from "../data-source";
import { ConditionStructure, DynamicQueryStructure, FieldType, QueryResult } from "../type/dynamicQueries"; import { ConditionStructure, DynamicQueryStructure, FieldType, QueryResult } from "../type/dynamicQueries";
import { TableMeta } from "../type/tableMeta"; import { TableMeta } from "../type/tableMeta";
import { StringHelper } from "./stringHelper";
export default abstract class DynamicQueryBuilder { export default abstract class DynamicQueryBuilder {
public static allowedTables: Array<string> = [ public static allowedTables: Array<string> = [
@ -62,14 +63,15 @@ export default abstract class DynamicQueryBuilder {
count?: number; count?: number;
noLimit?: boolean; noLimit?: boolean;
}): SelectQueryBuilder<ObjectLiteral> { }): SelectQueryBuilder<ObjectLiteral> {
let affix = queryObj.id; let affix = queryObj.id ?? StringHelper.random(10);
let query = dataSource.getRepository(queryObj.table).createQueryBuilder(`${affix}_${queryObj.table}`); let query = dataSource.getRepository(queryObj.table).createQueryBuilder(`${affix}_${queryObj.table}`);
this.buildDynamicQuery(query, queryObj, affix); this.buildDynamicQuery(query, queryObj, affix);
if (queryObj.orderBy) { if (queryObj.orderBy) {
queryObj.orderBy.forEach((order) => { queryObj.orderBy.forEach((order) => {
query.addOrderBy(`${order.id}_${order.table}.${order.column}`, order.order); // compatability layer for none id (old) queries
if (order.id) query.addOrderBy(`${order.id}_${order.table}.${order.column}`, order.order);
}); });
} }
@ -114,7 +116,7 @@ export default abstract class DynamicQueryBuilder {
if (queryObject.join) { if (queryObject.join) {
for (const join of queryObject.join) { for (const join of queryObject.join) {
let subaffix = join.id; let subaffix = join.id ?? StringHelper.random(10);
query.leftJoin(`${alias}.${join.foreignColumn}`, `${subaffix}_${join.table}`); query.leftJoin(`${alias}.${join.foreignColumn}`, `${subaffix}_${join.table}`);
this.buildDynamicQuery(query, join, subaffix, depth + 1); this.buildDynamicQuery(query, join, subaffix, depth + 1);
@ -379,6 +381,7 @@ export default abstract class DynamicQueryBuilder {
count: noLimit ? total : count, count: noLimit ? total : count,
}; };
} catch (error) { } catch (error) {
console.log(error);
return { return {
stats: "error", stats: "error",
sql: error.sql, sql: error.sql,