Merge pull request #34 from ZaidMaslouhi/master

Fix: duplicate column selection issue in getMany with joins and pagination
gid-oss · Mar 21, 2024 · b88f8ff · b88f8ff
2 parents 5008444 + 5333edd
commit b88f8ff
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/packages/crud-typeorm/src/typeorm-crud.service.ts b/packages/crud-typeorm/src/typeorm-crud.service.ts
@@ -647,9 +647,11 @@ export class TypeOrmCrudService<T> extends CrudService<T, DeepPartial<T>> {
         : allowedRelation.allowedColumns;
 
       const select = [
-        ...allowedRelation.primaryColumns,
-        ...(isArrayFull(options.persist) ? options.persist : []),
-        ...columns,
+        ...new Set([
+          ...allowedRelation.primaryColumns,
+          ...(isArrayFull(options.persist) ? options.persist : []),
+          ...columns,
+        ]),
       ].map((col) => `${alias}.${col}`);
 
       builder.addSelect(Array.from(new Set(select)));
@@ -985,9 +987,11 @@ export class TypeOrmCrudService<T> extends CrudService<T, DeepPartial<T>> {
         : allowed;
 
     const select = [
-      ...(options.persist && options.persist.length ? options.persist : []),
-      ...columns,
-      ...this.entityPrimaryColumns,
+      ...new Set([
+        ...(options.persist && options.persist.length ? options.persist : []),
+        ...columns,
+        ...this.entityPrimaryColumns,
+      ]),
     ].map((col) => `${this.alias}.${col}`);
 
     return Array.from(new Set(select));