Fix JOIN with no condition bug

doctrine · Jan 18, 2020 · 73adb67 · 73adb67
1 parent c950aab
commit 73adb67
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 6 deletions.
diff --git a/lib/Doctrine/DBAL/Query/QueryBuilder.php b/lib/Doctrine/DBAL/Query/QueryBuilder.php
@@ -1303,9 +1303,10 @@ private function getSQLForJoins(string $fromAlias, array &$knownAliases) : strin
  if (array_key_exists($join->alias, $knownAliases)) {
  throw NonUniqueAlias::new($join->alias, array_keys($knownAliases));
  }
- $sql .= ' ' . $join->type
- . ' JOIN ' . $join->table . ' ' . $join->alias
- . ' ON ' . ((string) $join->condition);
+ $sql .= ' ' . $join->type . ' JOIN ' . $join->table . ' ' . $join->alias;
+ if ($join->condition !== null) {
+ $sql .= ' ON ' . $join->condition;
+ }
  $knownAliases[$join->alias] = true;
  }
 

diff --git a/tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php b/tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php
@@ -87,14 +87,25 @@ public function testSelectWithLeftJoin() : void
  self::assertEquals('SELECT u.*, p.* FROM users u LEFT JOIN phones p ON p.user_id = u.id', (string) $qb);
  }
 
+ public function testSelectWithLeftJoinNoCondition() : void
+ {
+ $qb = new QueryBuilder($this->conn);
+
+ $qb->select('u.*', 'p.*')
+ ->from('users', 'u')
+ ->leftJoin('u', 'phones', 'p');
+
+ self::assertEquals('SELECT u.*, p.* FROM users u LEFT JOIN phones p', (string) $qb);
+ }
+
  public function testSelectWithJoin() : void
  {
  $qb = new QueryBuilder($this->conn);
  $expr = $qb->expr();
 
  $qb->select('u.*', 'p.*')
  ->from('users', 'u')
- ->Join('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id'));
+ ->join('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id'));
 
  self::assertEquals('SELECT u.*, p.* FROM users u INNER JOIN phones p ON p.user_id = u.id', (string) $qb);
  }
@@ -111,18 +122,40 @@ public function testSelectWithInnerJoin() : void
  self::assertEquals('SELECT u.*, p.* FROM users u INNER JOIN phones p ON p.user_id = u.id', (string) $qb);
  }
 
+ public function testSelectWithInnerJoinNoCondition() : void
+ {
+ $qb = new QueryBuilder($this->conn);
+
+ $qb->select('u.*', 'p.*')
+ ->from('users', 'u')
+ ->innerJoin('u', 'phones', 'p');
+
+ self::assertEquals('SELECT u.*, p.* FROM users u INNER JOIN phones p', (string) $qb);
+ }
+
  public function testSelectWithRightJoin() : void
  {
  $qb = new QueryBuilder($this->conn);
  $expr = $qb->expr();
 
  $qb->select('u.*', 'p.*')
- ->from('users', 'u')
- ->rightJoin('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id'));
+  ->from('users', 'u')
+  ->rightJoin('u', 'phones', 'p', $expr->eq('p.user_id', 'u.id'));
 
  self::assertEquals('SELECT u.*, p.* FROM users u RIGHT JOIN phones p ON p.user_id = u.id', (string) $qb);
  }
 
+ public function testSelectWithRightJoinNoCondition() : void
+ {
+ $qb = new QueryBuilder($this->conn);
+
+ $qb->select('u.*', 'p.*')
+ ->from('users', 'u')
+ ->rightJoin('u', 'phones', 'p');
+
+ self::assertEquals('SELECT u.*, p.* FROM users u RIGHT JOIN phones p', (string) $qb);
+ }
+
  public function testSelectWithAndWhereConditions() : void
  {
  $qb = new QueryBuilder($this->conn);