SqlBuilder: Fixed loading arguments for left join conditions (#224)

nette · Apr 12, 2019 · a45e10a · a45e10a
1 parent d81e35e
commit a45e10a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Database/Table/SqlBuilder.php b/src/Database/Table/SqlBuilder.php
@@ -585,6 +585,9 @@ protected function getSortedJoins(string $table, &$leftJoinDependency, &$tableJo
 			}
 			$finalJoins += $tableJoins[$table];
 			$key = isset($this->aliases[$table]) ? $table : $this->reservedTableNames[$table];
+			if ($key[0] === '.') {
+				$key = substr($key, 1);
+			}
 			$this->parameters['joinConditionSorted'] += isset($this->parameters['joinCondition'][$key])
 				? [$table => $this->parameters['joinCondition'][$key]]
 				: [];

diff --git a/tests/Database/Table/SqlBuilder.parseJoinConditions().phpt b/tests/Database/Table/SqlBuilder.parseJoinConditions().phpt
@@ -89,3 +89,10 @@ test(function () use ($context, $driver) {
 	}
 	Assert::same([2, 'private'], $sqlBuilder->getParameters());
 });
+
+test(function () use ($context) {
+	$sqlBuilder = new SqlBuilderMock('book', $context);
+	$sqlBuilder->addJoinCondition('next_volume.author', 'next_volume.author.born >', '2000-01-01');
+
+	Assert::same(['2000-01-01'], $sqlBuilder->getParameters());
+});