mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-22 09:53:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Dont fetch join part informations to improve performance."

Browse source 
This reverts commit afa09306df.
This commit is contained in:
Jan Böhmer 2020-01-26 21:54:21 +01:00
parent afa09306df
commit 62b3b638ca
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/DataTables/PartsDataTable.php
View file

@ -31,7 +31,6 @@ use App\DataTables\Column\LocaleDateTimeColumn;
use App\DataTables\Column\MarkdownColumn; use App\DataTables\Column\MarkdownColumn;
use App\DataTables\Column\PartAttachmentsColumn; use App\DataTables\Column\PartAttachmentsColumn;
use App\DataTables\Column\TagsColumn; use App\DataTables\Column\TagsColumn;
use App\Entity\LogSystem\AbstractLogEntry;
use App\Entity\Parts\Category; use App\Entity\Parts\Category;
use App\Entity\Parts\Footprint; use App\Entity\Parts\Footprint;
use App\Entity\Parts\Manufacturer; use App\Entity\Parts\Manufacturer;
@ -45,7 +44,6 @@ use App\Services\EntityURLGenerator;
use App\Services\Trees\NodesListBuilder; use App\Services\Trees\NodesListBuilder;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Omines\DataTablesBundle\Adapter\Doctrine\ORM\SearchCriteriaProvider; use Omines\DataTablesBundle\Adapter\Doctrine\ORM\SearchCriteriaProvider;
use Omines\DataTablesBundle\Adapter\Doctrine\ORMAdapter;
use Omines\DataTablesBundle\Column\BoolColumn; use Omines\DataTablesBundle\Column\BoolColumn;
use Omines\DataTablesBundle\Column\MapColumn; use Omines\DataTablesBundle\Column\MapColumn;
use Omines\DataTablesBundle\Column\TextColumn; use Omines\DataTablesBundle\Column\TextColumn;
@ -217,8 +215,7 @@ final class PartsDataTable implements DataTableTypeInterface
'visible' => false, 'visible' => false,
]) ])
->addOrderBy('name'); ->addOrderBy('name')
/**
->createAdapter(FetchJoinORMAdapter::class, [ ->createAdapter(FetchJoinORMAdapter::class, [
'simple_total_query' => true, 'simple_total_query' => true,
'query' => function (QueryBuilder $builder): void { 'query' => function (QueryBuilder $builder): void {
@ -231,19 +228,22 @@ final class PartsDataTable implements DataTableTypeInterface
}, },
new SearchCriteriaProvider(), new SearchCriteriaProvider(),
], ],
]); **/
$dataTable->createAdapter(ORMAdapter::class, [
'entity' => Part::class,
'query' => function (QueryBuilder $builder): void {
$this->getQuery($builder);
},
]); ]);
} }
protected function getQuery(QueryBuilder $builder): void protected function getQuery(QueryBuilder $builder): void
{ {
$builder->distinct()->select('part') $builder->distinct()->select('part')
->addSelect('category')
->addSelect('footprint')
->addSelect('manufacturer')
->addSelect('partUnit')
->addSelect('master_picture_attachment')
->addSelect('footprint_attachment')
->addSelect('partLots')
->addSelect('orderdetails')
->addSelect('attachments')
->addSelect('storelocations')
->from(Part::class, 'part') ->from(Part::class, 'part')
->leftJoin('part.category', 'category') ->leftJoin('part.category', 'category')
->leftJoin('part.master_picture_attachment', 'master_picture_attachment') ->leftJoin('part.master_picture_attachment', 'master_picture_attachment')