Fix multi-column WHERE not prefixed with DBPrefix

codeigniter4 · Feb 9, 2020 · aef1e64 · aef1e64
1 parent 1514be2
commit aef1e64
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -3045,6 +3045,11 @@ protected function compileWhereHaving(string $qb_key): string
 
 					if (! empty($matches[4]))
 					{
+						if (strpos($matches[4], '.') !== false)
+						{
+							$matches[4] = $this->db->protectIdentifiers(trim($matches[4]));
+						}
+
 						$matches[4] = ' ' . $matches[4];
 					}
 

diff --git a/tests/system/Database/Builder/PrefixTest.php b/tests/system/Database/Builder/PrefixTest.php
@@ -26,4 +26,19 @@ public function testPrefixesSetOnTableNames()
 
 	//--------------------------------------------------------------------
 
+	public function testPrefixesSetOnTableNamesWithWhereClause()
+	{
+		$builder = $this->db->table('users');
+
+		$where = 'users.created_at < users.updated_at';
+
+		$expectedSQL   = 'SELECT * FROM "ci_users" WHERE "ci_users"."created_at" < "ci_users"."updated_at"';
+		$expectedBinds = [];
+
+		$builder->where($where);
+
+		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+		$this->assertSame($expectedBinds, $builder->getBinds());
+	}
+
 }