Skip to content
Snippets Groups Projects
Commit 59b064b6 authored by jaapjansma's avatar jaapjansma
Browse files

Fixed regression bug after refactor

parent d99d7cac
No related branches found
No related tags found
No related merge requests found
......@@ -79,7 +79,7 @@ class CombinedSqlDataFlow extends SqlDataFlow implements MultipleSourceDataFlows
$sourceDataFlowDescription = reset($this->sourceDataFlowDescriptions);
$dataFlow = $sourceDataFlowDescription->getDataFlow();
$fromStatements[] = $dataFlow->getFromStatement();
$fromStatements = array_merge($fromStatements, $this->getJoinStatement(0));
$fromStatements = array_merge($fromStatements, $this->getJoinStatement(1));
return implode(" ", $fromStatements);
}
......@@ -96,8 +96,7 @@ class CombinedSqlDataFlow extends SqlDataFlow implements MultipleSourceDataFlows
$i++;
if ($i > $skip) {
if ($sourceDataFlowDescription->getJoinSpecification()) {
$joinStatement = $sourceDataFlowDescription->getJoinSpecification()
->getJoinClause($sourceDataFlowDescription);
$joinStatement = $sourceDataFlowDescription->getJoinSpecification()->getJoinClause($sourceDataFlowDescription);
if (is_array($joinStatement)) {
$fromStatements = array_merge($fromStatements, $joinStatement);
} else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment