From c693dfde66219db20f3d895883dcabacbb237495 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 10 Aug 2022 16:33:05 +0200 Subject: [PATCH] a same join() in filter and aggregator make error if we combine them --- .../HouseholdAggregators/CompositionAggregator.php | 5 ----- .../ChillPersonBundle/Export/Export/CountHousehold.php | 1 + .../Export/Filter/HouseholdFilters/CompositionFilter.php | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php index 5718f990d..2a7c89ee3 100644 --- a/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php +++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php @@ -78,11 +78,6 @@ class CompositionAggregator implements AggregatorInterface */ public function alterQuery(QueryBuilder $qb, $data) { - $qb - ->join('household.compositions', 'composition') - //->join('composition.householdCompositionType', 'type') - ; - $qb->addSelect('IDENTITY(composition.householdCompositionType) AS composition_aggregator'); $groupBy = $qb->getDQLPart('groupBy'); diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php index 5bc333e2a..c9b2b541a 100644 --- a/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php +++ b/src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php @@ -107,6 +107,7 @@ class CountHousehold implements ExportInterface, GroupedExportInterface ->join('acppart.person', 'person') ->join('person.householdParticipations', 'householdmember') ->join('householdmember.household', 'household') + ->join('household.compositions', 'composition') ; $qb->select('COUNT(DISTINCT householdmember.household) AS export_result'); diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php index 132b878fd..ae4427e6d 100644 --- a/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php +++ b/src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php @@ -77,11 +77,6 @@ class CompositionFilter implements FilterInterface */ public function alterQuery(QueryBuilder $qb, $data) { - $qb - ->join('household.compositions', 'composition') - //->join('composition.householdCompositionType', 'type') - ; - $where = $qb->getDQLPart('where'); $clause = $qb->expr()->in('composition.householdCompositionType', ':compositions');