Throw QueryException on improperly initialized from clause

Author: nreynis

lib/Doctrine/DBAL/Query/QueryBuilder.php

@@ -1176,6 +1176,16 @@ private function getFromClauses()
         return $fromClauses;
     }
 
+    /**
+     * @throws QueryException
+     */
+    private function assertHasSingleFromClause(): void
+    {
+        if (! array_key_exists('table', $this->sqlParts['from'])) {
+            throw QueryException::uninitializedTableName();
+        }
+    }
+
     /**
      * @param string[] $knownAliases
      *
@@ -1202,9 +1212,13 @@ private function isLimitQuery()
      * Converts this instance into an INSERT string in SQL.
      *
      * @return string
+     *
+     * @throws QueryException
      */
     private function getSQLForInsert()
     {
+        $this->assertHasSingleFromClause();
+
         return 'INSERT INTO ' . $this->sqlParts['from']['table'] .
         ' (' . implode(', ', array_keys($this->sqlParts['values'])) . ')' .
         ' VALUES(' . implode(', ', $this->sqlParts['values']) . ')';
@@ -1214,9 +1228,13 @@ private function getSQLForInsert()
      * Converts this instance into an UPDATE string in SQL.
      *
      * @return string
+     *
+     * @throws QueryException
      */
     private function getSQLForUpdate()
     {
+        $this->assertHasSingleFromClause();
+
         $table = $this->sqlParts['from']['table']
             . ($this->sqlParts['from']['alias'] ? ' ' . $this->sqlParts['from']['alias'] : '');
 
@@ -1229,9 +1247,13 @@ private function getSQLForUpdate()
      * Converts this instance into a DELETE string in SQL.
      *
      * @return string
+     *
+     * @throws QueryException
      */
     private function getSQLForDelete()
     {
+        $this->assertHasSingleFromClause();
+
         $table = $this->sqlParts['from']['table']
             . ($this->sqlParts['from']['alias'] ? ' ' . $this->sqlParts['from']['alias'] : '');
 

lib/Doctrine/DBAL/Query/QueryException.php

@@ -36,4 +36,9 @@ public static function nonUniqueAlias($alias, $registeredAliases)
             'in FROM and JOIN clause table. The currently registered ' .
             'aliases are: ' . implode(', ', $registeredAliases) . '.');
     }
+
+    public static function uninitializedTableName(): self
+    {
+        return new self('There is no currently registered table name.');
+    }
 }

tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php

@@ -462,6 +462,18 @@ public function testEmptyUpdate(): void
         self::assertSame($qb2, $qb);
     }
 
+    public function testUpdateImproperFromThrowsException(): void
+    {
+        $qb = new QueryBuilder($this->conn);
+        $qb->update()
+            ->from('users');
+        $this->expectException(QueryException::class);
+        $this->expectExceptionMessage(
+            'There is no currently registered table name.'
+        );
+        self::assertEquals('', $qb->getSQL());
+    }
+
     public function testDelete(): void
     {
         $qb = new QueryBuilder($this->conn);
@@ -489,6 +501,18 @@ public function testDeleteWhere(): void
         self::assertEquals('DELETE FROM users u WHERE u.foo = ?', (string) $qb);
     }
 
+    public function testDeleteImproperFromThrowsException(): void
+    {
+        $qb = new QueryBuilder($this->conn);
+        $qb->delete()
+            ->from('users');
+        $this->expectException(QueryException::class);
+        $this->expectExceptionMessage(
+            'There is no currently registered table name.'
+        );
+        self::assertEquals('', $qb->getSQL());
+    }
+
     public function testEmptyDelete(): void
     {
         $qb  = new QueryBuilder($this->conn);
@@ -568,6 +592,18 @@ public function testEmptyInsert(): void
         self::assertSame($qb2, $qb);
     }
 
+    public function testInsertImproperFromThrowsException(): void
+    {
+        $qb = new QueryBuilder($this->conn);
+        $qb->insert()
+            ->from('users');
+        $this->expectException(QueryException::class);
+        $this->expectExceptionMessage(
+            'There is no currently registered table name.'
+        );
+        self::assertEquals('', $qb->getSQL());
+    }
+
     public function testGetConnection(): void
     {
         $qb = new QueryBuilder($this->conn);