fix: wrong from is provided after reset query

See codeigniter4#4461
kenjis · Mar 22, 2021 · 3e5e23c · 3e5e23c
1 parent de8d7f4
commit 3e5e23c
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 3 deletions.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -266,7 +266,11 @@ public function __construct($tableName, ConnectionInterface &$db, array $options
 		/** @var BaseConnection $db */
 		$this->db = $db;
 
-		$this->tableName = $tableName;
+		if (is_string($tableName))
+		{
+			$this->tableName = $tableName;
+		}
+
 		$this->from($tableName);
 
 		if (! empty($options))
@@ -3377,6 +3381,7 @@ protected function resetSelect()
 	{
 		$this->resetRun([
 			'QBSelect'   => [],
+			'QBFrom'     => [],
 			'QBJoin'     => [],
 			'QBWhere'    => [],
 			'QBGroupBy'  => [],
@@ -3394,9 +3399,9 @@ protected function resetSelect()
 		}
 
 		// Reset QBFrom part
-		if (! empty($this->QBFrom))
+		if (is_string($this->tableName))
 		{
-			$this->from(array_shift($this->QBFrom), true);
+			$this->from($this->tableName, true);
 		}
 	}
 

diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
@@ -99,6 +99,43 @@ public function testFromReset()
 		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 	}
 
+	public function testFromSelectSubQuery()
+	{
+		$builder = new BaseBuilder('user', $this->db);
+
+		$builder->from('(SELECT id, name FROM test_1) t', true);
+
+		$expectedSQL = 'SELECT * FROM (SELECT id, name FROM test_1) t';
+
+		$this->assertEquals(
+			$expectedSQL,
+			str_replace(
+				"\n",
+				' ',
+				$builder->getCompiledSelect()
+			)
+		);
+
+		return $builder;
+	}
+
+	/**
+	 * @depends testFromSelectSubQuery
+	 */
+	public function testFromAfterSubQuery($builder)
+	{
+		$expectedSQL = 'SELECT * FROM "user"';
+
+		$this->assertEquals(
+			$expectedSQL,
+			str_replace(
+				"\n",
+				' ',
+				$builder->getCompiledSelect()
+			)
+		);
+	}
+
 	//--------------------------------------------------------------------
 
 	public function testFromWithMultipleTablesAsStringWithSQLSRV()