Merge pull request #2533 from musmanikram/2532-fix-multi-column-where-prefix-issue

Fix multi-column WHERE not prefixed with DBPrefix

Author: MGatner

system/Database/BaseBuilder.php

@@ -3045,6 +3045,17 @@ protected function compileWhereHaving(string $qb_key): string
 
 					if (! empty($matches[4]))
 					{
+						$protectIdentifiers = false;
+						if (strpos($matches[4], '.') !== false)
+						{
+							$protectIdentifiers = true;
+						}
+
+						if (strpos($matches[4], ':') === false)
+						{
+							$matches[4] = $this->db->protectIdentifiers(trim($matches[4]), false, $protectIdentifiers);
+						}
+
 						$matches[4] = ' ' . $matches[4];
 					}
 

system/Database/BaseConnection.php

@@ -1215,7 +1215,7 @@ public function protectIdentifiers($item, bool $prefixSingle = false, bool $prot
 				// This can happen when this function is being called from a JOIN.
 				if ($fieldExists === false)
 				{
-					$i ++;
+					$i++;
 				}
 
 				// Verify table prefix and replace if necessary

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());
+	}
+
 }