Fixed regression bug with case role filter (and other filters).

CHANGELOG.md

-# Version 1.24 (not yet released)
+# Version 1.23.4
+
+* Fixed regression bug with case role filter (and other filters).
 
 # Version 1.23.3
 

Civi/DataProcessor/FilterHandler/CaseRoleFilter.php

@@ -83,12 +83,13 @@ class CaseRoleFilter extends AbstractFieldFilterHandler {
     }
 
     if ($dataFlow && $dataFlow instanceof SqlDataFlow) {
+      $tableAlias = $this->getTableAlias($dataFlow);
       $this->whereClause = new SqlDataFlow\InTableWhereClause(
         'case_id',
         'civicrm_relationship',
         $relationshipTableAlias,
         $relationshipFilters,
-        $dataFlow->getName(),
+        $tableAlias,
         $this->inputFieldSpecification->getName(),
         $inOperator
       );

Civi/DataProcessor/FilterHandler/ChecksumFilter.php

@@ -160,11 +160,13 @@ class ChecksumFilter extends AbstractFieldFilterHandler {
     if ($dataFlow && $hashDataFlow && $dataFlow instanceof SqlDataFlow && $hashDataFlow instanceof SqlDataFlow) {
       list($cs, $ts, $lf) = explode('_', $filter['value'], 3);
       $now = time();
+      $tableAlias = $this->getTableAlias($dataFlow);
+      $hashTableAlias = $this->getTableAlias($hashTableAlias);
       $this->whereClause = new SqlDataFlow\PureSqlStatementClause(
         "MD5(CONCAT(
-          `{$hashDataFlow->getName()}`.`{$this->hashInputFieldSpecification->getName()}`,
+          `{$hashTableAlias}`.`{$this->hashInputFieldSpecification->getName()}`,
           '_',
-          `{$dataFlow->getName()}`.`{$this->inputFieldSpecification->getName()}`,
+          `{$tableAlias}`.`{$this->inputFieldSpecification->getName()}`,
           '_{$ts}_{$lf}'
           )) = '{$cs}' AND ({$ts} + ({$lf} * 60 * 60)) >= {$now}
           "

Civi/DataProcessor/FilterHandler/ContactHasMembershipFilter.php

@@ -56,12 +56,13 @@ class ContactHasMembershipFilter extends AbstractFieldFilterHandler {
     );
 
     if ($dataFlow && $dataFlow instanceof SqlDataFlow) {
+      $tableAlias = $this->getTableAlias($dataFlow);
       $this->whereClause = new SqlDataFlow\InTableWhereClause(
         'contact_id',
         'civicrm_membership',
         $membershipTableAlias,
         $embershipFilters,
-        $dataFlow->getName(),
+        $tableAlias,
         $this->inputFieldSpecification->getName(),
         $filter['op']
       );

Civi/DataProcessor/FilterHandler/ContactInGroupFilter.php

@@ -77,12 +77,13 @@ class ContactInGroupFilter extends AbstractFieldFilterHandler {
     );
 
     if ($dataFlow && $dataFlow instanceof SqlDataFlow) {
+      $tableAlias = $this->getTableAlias($dataFlow);
       $this->whereClause = new SqlDataFlow\InTableWhereClause(
         'contact_id',
         'civicrm_group_contact',
         $groupTableAlias,
         $groupFilters,
-        $dataFlow->getName(),
+        $tableAlias,
         $this->inputFieldSpecification->getName(),
         $filter['op']
       );
@@ -96,12 +97,13 @@ class ContactInGroupFilter extends AbstractFieldFilterHandler {
     );
 
     if ($dataFlow && $dataFlow instanceof SqlDataFlow) {
+      $tableAlias = $this->getTableAlias($dataFlow);
       $this->whereClause = new SqlDataFlow\InTableWhereClause(
         'contact_id',
         'civicrm_group_contact_cache',
         $groupTableAlias,
         $groupFilters,
-        $dataFlow->getName(),
+        $tableAlias,
         $this->inputFieldSpecification->getName(),
         $filter['op']
       );

Civi/DataProcessor/FilterHandler/ContactTypeFilter.php

@@ -54,12 +54,13 @@ class ContactTypeFilter extends AbstractFieldFilterHandler {
     if (count($contactTypeClauses)) {
       $contactTypeClause = new SqlDataFlow\OrClause($contactTypeClauses);
       if ($dataFlow && $dataFlow instanceof SqlDataFlow) {
+        $tableAlias = $this->getTableAlias($dataFlow);
         $this->whereClause = new SqlDataFlow\InTableWhereClause(
           'id',
           'civicrm_contact',
           $contactTableAlias,
           array($contactTypeClause),
-          $dataFlow->getName(),
+          $tableAlias,
           $this->inputFieldSpecification->getName(),
           $filter['op']
         );

Civi/DataProcessor/FilterHandler/ContactWithTagFilter.php

@@ -45,12 +45,13 @@ class ContactWithTagFilter extends AbstractFieldFilterHandler {
     );
 
     if ($dataFlow && $dataFlow instanceof SqlDataFlow) {
+      $tableAlias = $this->getTableAlias($dataFlow);
       $this->whereClause = new SqlDataFlow\InTableWhereClause(
         'entity_id',
         'civicrm_entity_tag',
         $tagTableAlias,
         $tagFilters,
-        $dataFlow->getName(),
+        $tableAlias,
         $this->inputFieldSpecification->getName(),
         $filter['op']
       );

Civi/DataProcessor/FilterHandler/DateFilter.php

@@ -37,6 +37,7 @@ class DateFilter extends AbstractFieldFilterHandler {
   public function setFilter($filter) {
     $this->resetFilter();
     $dataFlow  = $this->dataSource->ensureField($this->inputFieldSpecification);
+    $tableAlias = $this->getTableAlias($dataFlow);
     if ($dataFlow && $dataFlow instanceof SqlDataFlow) {
       $value = null;
       if (isset($filter['value']) && is_array($filter['value'])) {
@@ -50,7 +51,7 @@ class DateFilter extends AbstractFieldFilterHandler {
         $value = $dateTime->format('Y-m-d');
       }
 
-      $this->whereClause = new SqlDataFlow\SimpleWhereClause($dataFlow->getName(), $this->inputFieldSpecification->getName(), $filter['op'], $value, 'String');
+      $this->whereClause = new SqlDataFlow\SimpleWhereClause($tableAlias, $this->inputFieldSpecification->getName(), $filter['op'], $value, 'String');
       $dataFlow->addWhereClause($this->whereClause);
     }
   }

Civi/DataProcessor/FilterHandler/DateMonthFilter.php

@@ -53,11 +53,12 @@ class DateMonthFilter extends AbstractFieldFilterHandler {
     $this->resetFilter();
     $dataFlow  = $this->dataSource->ensureField($this->inputFieldSpecification);
     if ($dataFlow && $dataFlow instanceof SqlDataFlow) {
+      $tableAlias = $this->getTableAlias($dataFlow);
       $value = $filter['value'];
       if (!is_array($value)) {
         $value = explode(",", $value);
       }
-      $this->whereClause = new SqlDataFlow\SimpleWhereClause($dataFlow->getName(), $this->inputFieldSpecification->getName(), $filter['op'], $value, 'Int', FALSE, 'MONTH(%s)');
+      $this->whereClause = new SqlDataFlow\SimpleWhereClause($tableAlias, $this->inputFieldSpecification->getName(), $filter['op'], $value, 'Int', FALSE, 'MONTH(%s)');
       $dataFlow->addWhereClause($this->whereClause);
     } elseif ($dataFlow && $dataFlow instanceof InMemoryDataFlow) {
       $this->filterClass = new InMemoryDataFlow\SimpleFilter($this->inputFieldSpecification->getName(), $filter['op'], $filter['value'], function($value) {

Civi/DataProcessor/FilterHandler/MultipleFieldFilter.php

@@ -182,7 +182,8 @@ class MultipleFieldFilter extends AbstractFilterHandler {
       }
       $dataFlow = $dataSource->ensureField($fieldSpec);
       if ($dataFlow && $dataFlow instanceof SqlDataFlow) {
-        $clauses[] = new SqlDataFlow\SimpleWhereClause($dataFlow->getName(), $fieldSpec->getName(), $filterParams['op'], $filterParams['value'], $this->fieldSpecification->type);
+        $tableAlias = $this->getTableAlias($dataFlow);
+        $clauses[] = new SqlDataFlow\SimpleWhereClause($tableAlias, $fieldSpec->getName(), $filterParams['op'], $filterParams['value'], $this->fieldSpecification->type);
       }
     }
     if (count($clauses)) {

Civi/DataProcessor/FilterHandler/PermissionToViewContactFilter.php

@@ -49,12 +49,13 @@ class PermissionToViewContactFilter extends AbstractFieldFilterHandler {
     if ($where) {
       $contactFilters[] = new SqlDataFlow\PureSqlStatementClause($where);
       if ($dataFlow && $dataFlow instanceof SqlDataFlow) {
+        $tableAlias = $this->getTableAlias($dataFlow);
         $this->whereClause = new SqlDataFlow\InTableWhereClause(
           'id',
           'civicrm_contact',
           $contactTableAlias,
           $contactFilters,
-          $dataFlow->getName(),
+          $tableAlias,
           $this->inputFieldSpecification->getName(),
           'IN'
         );

Civi/DataProcessor/FilterHandler/SimpleSqlFilter.php

@@ -42,11 +42,6 @@ class SimpleSqlFilter extends AbstractFieldFilterHandler {
     if ($dataFlow && $dataFlow instanceof SqlDataFlow) {
       $tableAlias = $this->getTableAlias($dataFlow);
       $fieldName = $this->inputFieldSpecification->getName();
-      // special handling for activity contact fields added to filter
-      if (stripos($fieldName, 'activity_contact_') === 0) {
-        $tableAlias = '_activity_contact';
-        $fieldName = substr($fieldName, 17);
-      }
       if ($this->isMultiValueField()) {
         $this->whereClause = new SqlDataFlow\MultiValueFieldWhereClause($tableAlias, $fieldName, $filter['op'], $filter['value'], $this->inputFieldSpecification->type);
       } else {

Civi/DataProcessor/FilterHandler/WorldRegionFilter.php

@@ -46,12 +46,13 @@ class WorldRegionFilter extends AbstractFieldFilterHandler {
       new SqlDataFlow\SimpleWhereClause($countryTableAlias, 'region_id', 'IN', $region_ids),
     );
     if ($dataFlow && $dataFlow instanceof SqlDataFlow) {
+      $tableAlias = $this->getTableAlias($dataFlow);
       $this->whereClause = new SqlDataFlow\InTableWhereClause(
         'id',
         'civicrm_country',
         $countryTableAlias,
         $countryFilters,
-        $dataFlow->getName(),
+        $tableAlias,
         $this->inputFieldSpecification->getName(),
         $filter['op']
       );

Civi/DataProcessor/Source/Cases/CaseSource.php

@@ -14,6 +14,7 @@ use Civi\DataProcessor\DataFlow\SqlDataFlow\SimpleWhereClause;
 use Civi\DataProcessor\DataFlow\SqlTableDataFlow;
 use Civi\DataProcessor\DataSpecification\CustomFieldSpecification;
 use Civi\DataProcessor\DataSpecification\DataSpecification;
+use Civi\DataProcessor\DataSpecification\FieldSpecification;
 use Civi\DataProcessor\Source\AbstractCivicrmEntitySource;
 use Civi\DataProcessor\DataSpecification\Utils as DataSpecificationUtils;
 
@@ -114,7 +115,7 @@ class CaseSource extends AbstractCivicrmEntitySource {
     $caseContactDataDescription = new DataFlowDescription($this->caseContactDataFlow, $join);
 
     // Create the subquery data flow
-    $this->entityDataFlow = new SubqueryDataFlow($this->getSourceName(), $this->getTable(), $this->getSourceName());
+    $this->entityDataFlow = new SubqueryDataFlow($this->getSourceName(), $this->caseDataFlow->getTable(), $this->caseDataFlow->getTableAlias());
     $this->entityDataFlow->addSourceDataFlow($caseDataDescription);
     $this->entityDataFlow->addSourceDataFlow($caseContactDataDescription);
 
@@ -147,6 +148,7 @@ class CaseSource extends AbstractCivicrmEntitySource {
     return $additionalDataFlowDescription->getDataFlow();
   }
 
+
   /**
    * Adds an inidvidual filter to the data source
    *

info.xml

@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-12-07</releaseDate>
-  <version>1.24-dev</version>
+  <version>1.23.4</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>