handle find record array by numeric key in join

codeigniter4 · Jul 12, 2020 · d6513a1 · d6513a1
1 parent ac784fc
commit d6513a1
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -685,11 +685,14 @@ public function join(string $table, string $cond, string $type = '', bool $escap
 			}
 
 			$cond = ' ON ';
-			foreach ($conditions as $i => $condition)
+			$i    = 0;
+			foreach ($conditions as $condition)
 			{
-				$operator = $this->getOperator($condition);
+				$operator = $this->getOperator($conditions[$i]);
 				$cond    .= $joints[$i];
-				$cond    .= preg_match("/(\(*)?([\[\]\w\.'-]+)" . preg_quote($operator) . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
+				$cond    .= preg_match("/(\(*)?([\[\]\w\.'-]+)" . preg_quote($operator) . '(.*)/i', $conditions[$i], $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $conditions[$i];
+
+				$i++;
 			}
 		}