Merge pull request #20 from qpfmtlcp/master

fix: duplicate column selection
rewiko · Aug 24, 2022 · 3613b1e · 3613b1e
2 parents 6a48357 + 638c629
commit 3613b1e
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
@@ -631,9 +631,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(select);
@@ -946,9 +948,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 select;