SqlBuilder: lose parameters for aliasses (#150)

h4kuna · dg · commit 19060eaed9a8 · 2017-01-09T03:18:26.000+01:00
diff --git a/src/Database/Table/SqlBuilder.php b/src/Database/Table/SqlBuilder.php
@@ -572,8 +572,9 @@ protected function getSortedJoins($table, & $leftJoinDependency, & $tableJoins,
 				}
 			}
 			$finalJoins += $tableJoins[$table];
-			$this->parameters['joinConditionSorted'] += isset($this->parameters['joinCondition'][$this->reservedTableNames[$table]])
-				? [$table => $this->parameters['joinCondition'][$this->reservedTableNames[$table]]]
+			$key = isset($this->aliases[$table]) ? $table : $this->reservedTableNames[$table];
+			$this->parameters['joinConditionSorted'] += isset($this->parameters['joinCondition'][$key])
+				? [$table => $this->parameters['joinCondition'][$key]]
 				: [];
 			unset($tableJoins[$table]);
 			unset($this->expandingJoins[$table]);

Original file line number	Diff line number	Diff line change
`@@ -572,8 +572,9 @@ protected function getSortedJoins($table, & $leftJoinDependency, & $tableJoins,`
`572`	`572`	`}`
`573`	`573`	`}`
`574`	`574`	`$finalJoins += $tableJoins[$table];`
`575`		`- $this->parameters['joinConditionSorted'] += isset($this->parameters['joinCondition'][$this->reservedTableNames[$table]])`
`576`		`- ? [$table => $this->parameters['joinCondition'][$this->reservedTableNames[$table]]]`
	`575`	`+ $key = isset($this->aliases[$table]) ? $table : $this->reservedTableNames[$table];`
	`576`	`+ $this->parameters['joinConditionSorted'] += isset($this->parameters['joinCondition'][$key])`
	`577`	`+ ? [$table => $this->parameters['joinCondition'][$key]]`
`577`	`578`	`: [];`
`578`	`579`	`unset($tableJoins[$table]);`
`579`	`580`	`unset($this->expandingJoins[$table]);`