caritas/nestjs-paginate
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(): fix for caritas project (removes _rel)

Browse Source
This commit is contained in:
Francesco Spilla 2024-11-25 16:33:06 +01:00
parent 5a787ddb5f
commit be9caf1fa6
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/helper.ts
View File

@ -180,22 +180,11 @@ export function fixColumnAlias(
): string { ): string {
if (isRelation) { if (isRelation) {
if (isVirtualProperty && query) { if (isVirtualProperty && query) {
return `(${query(`${alias}_${properties.propertyPath}_rel`)})` // () is needed to avoid parameter conflict return `(${query(`${alias}_${properties.propertyPath}`)})` // () is needed to avoid parameter conflict
} else if ((isVirtualProperty && !query) || properties.isNested) { } else if ((isVirtualProperty && !query) || properties.isNested) {
if (properties.propertyName.includes('.')) { return `${alias}_${properties.propertyPath}_${properties.propertyName}`
const propertyPath = properties.propertyName.split('.')
const nestedRelations = propertyPath
.slice(0, -1)
.map((v) => `${v}_rel`)
.join('_')
const nestedCol = propertyPath[propertyPath.length - 1]
return `${alias}_${properties.propertyPath}_rel_${nestedRelations}.${nestedCol}`
} else {
return `${alias}_${properties.propertyPath}_rel_${properties.propertyName}`
}
} else { } else {
return `${alias}_${properties.propertyPath}_rel.${properties.propertyName}` return `${alias}_${properties.propertyPath}.${properties.propertyName}`
} }
} else if (isVirtualProperty) { } else if (isVirtualProperty) {
return query ? `(${query(`${alias}`)})` : `${alias}_${properties.propertyName}` return query ? `(${query(`${alias}`)})` : `${alias}_${properties.propertyName}`

8
src/paginate.ts
View File

@ -155,11 +155,11 @@ function flattenWhereAndTransform<T>(
? '' ? ''
: `_${pathSplit : `_${pathSplit
.slice(0, -1) .slice(0, -1)
.map((p) => p + '_rel') .map((p) => p)
.join('_')}` .join('_')}`
const tableName = pathSplit[pathSplit.length - 1] const tableName = pathSplit[pathSplit.length - 1]
const tableAliasWithProperty = `${queryBuilder.alias}${fullPath}.${tableName}` const tableAliasWithProperty = `${queryBuilder.alias}${fullPath}.${tableName}`
const joinTableAlias = `${queryBuilder.alias}${fullPath}_${tableName}_rel` const joinTableAlias = `${queryBuilder.alias}${fullPath}_${tableName}`
const baseTableAlias = allJoinedTables[joinTableAlias] const baseTableAlias = allJoinedTables[joinTableAlias]
@ -229,11 +229,11 @@ export async function paginate<T extends ObjectLiteral>(
queryBuilder.leftJoinAndSelect( queryBuilder.leftJoinAndSelect(
`${alias ?? prefix}.${relationName}`, `${alias ?? prefix}.${relationName}`,
`${alias ?? prefix}_${relationName}_rel` `${alias ?? prefix}_${relationName}`
) )
if (typeof relationSchema === 'object') { if (typeof relationSchema === 'object') {
createQueryBuilderRelations(relationName, relationSchema, `${alias ?? prefix}_${relationName}_rel`) createQueryBuilderRelations(relationName, relationSchema, `${alias ?? prefix}_${relationName}`)
} }
}) })
} }