Commit b07c55d0 authored by jaapjansma's avatar jaapjansma
Browse files

Fixed regression bug with joins and filters on a data source.

parent 99beff37
# Version 1.41 (not yet released)
# Version 1.41
* Fixed regression bug with joins and filters on a data source.
# Version 1.40
......
......@@ -223,8 +223,9 @@ class CombinedSqlDataFlow extends SqlDataFlow implements MultipleSourceDataFlows
foreach($sourceDataFlowDescription->getDataFlow()->getWhereClauses() as $clause) {
if ($clause->isJoinClause() && $includeJoinClause) {
$clauses[] = $clause;
}
if (!$clause->isJoinClause() && $includeNonJoinClause) {
} elseif (!$clause->isJoinClause() && $includeNonJoinClause) {
$clauses[] = $clause;
} elseif ($clause->isJoinClause() && !$includeJoinClause && !$sourceDataFlowDescription->getJoinSpecification()) {
$clauses[] = $clause;
}
}
......
......@@ -14,8 +14,8 @@
<url desc="Documentation">https://lab.civicrm.org/extensions/dataprocessor/blob/master/README.md</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-07-05</releaseDate>
<version>1.41-dev</version>
<releaseDate>2021-07-15</releaseDate>
<version>1.41</version>
<develStage>stable</develStage>
<compatibility>
<ver>5.20</ver>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment