Merge pull request #2802 from michalsn/feature/qb_from_reset

Add resetting QBFrom part
codeigniter4 · Apr 6, 2020 · 1092399 · 1092399
2 parents 241a54e + 654b915
commit 1092399
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -3328,6 +3328,12 @@ protected function resetSelect()
 		{
 			$this->db->setAliasedTables([]);
 		}
+
+		// Reset QBFrom part
+		if (! empty($this->QBFrom))
+		{
+			$this->from(array_shift($this->QBFrom), true);
+		}
 	}
 
 	//--------------------------------------------------------------------

diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
@@ -69,4 +69,33 @@ public function testFromWithMultipleTablesAsString()
 	}
 
 	//--------------------------------------------------------------------
+
+	public function testFromReset()
+	{
+		$builder = new BaseBuilder('user', $this->db);
+
+		$builder->from(['jobs', 'roles']);
+
+		$expectedSQL = 'SELECT * FROM "user", "jobs", "roles"';
+
+		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+
+		$expectedSQL = 'SELECT * FROM "user"';
+
+		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+
+		$expectedSQL = 'SELECT *';
+
+		$builder->from(null, true);
+
+		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+
+		$expectedSQL = 'SELECT * FROM "jobs"';
+
+		$builder->from('jobs');
+
+		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+	}
+
+	//--------------------------------------------------------------------
 }