Fix bug with IN statement

Author: QuentinBubu

src/QueryBuilder/Expr.php

@@ -135,7 +135,7 @@ public static function in(string $column, array $value): array {
         return [
             'value'  => '(' . implode(',', $value) . ')',
             'column' => $column,
-            'expr'   => "`{$column}` IN :{$column}"
+            'expr'   => "`{$column}` IN (:{$column}"
         ];
     }
 }

src/QueryBuilder/QueryBuilder.php

@@ -48,7 +48,6 @@ public function __toString(): string
         if (!is_null($this->as)) $request .= " AS {$this->as}";
         if (!is_null($this->join)) $request .= " {$this->join}";
         if (!is_null($this->condition)) $request .= $this->condition;
-        if (!is_null($this->in)) $request .= (is_null($this->condition) ? 'WHERE ' : ' AND ') . implode(' AND ', $this->in);
         if (!is_null($this->orderBy)) $request .= $this->orderBy;
         if (!is_null($this->limit)) $request .= $this->limit;
 

src/QueryBuilder/QueryMethods.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Bubu\Database\QueryBuilder;
 
 trait QueryMethods
@@ -11,7 +12,6 @@ trait QueryMethods
     protected array  $values     = [];
     protected ?string $orderBy   = null;
     protected ?string $limit     = null;
-    protected ?array $in         = null;
     protected ?string $join      = null;
 
     public function table(string $table): self
@@ -31,9 +31,7 @@ public function insert(array $values): self
         foreach ($values as $key => $value) {
             $columns .= "`{$key}`, ";
             $markers .= ":{$key}, ";
-            $this->values[
-                $key
-            ] = $value;
+            $this->values[$key] = $value;
         }
         $columns = trim($columns, ', ');
         $markers = trim($markers, ', ');
@@ -83,9 +81,7 @@ public function update(array $values): self
 
             $request .= "`{$col}` = :{$marker}, ";
 
-            $this->values[
-                $marker
-            ] = $value;
+            $this->values[$marker] = $value;
         }
         $request = trim($request, ', ');
         $this->action = 'UPDATE `[TABLE_NAME]` SET ' . $request;
@@ -107,20 +103,18 @@ public function where(array ...$where): self
             $condition = $this->condition . ' OR (';
         }
         foreach ($where as $value) {
-            if (str_contains($value['expr'], '` IN :' . $value['column'])) {
-                $this->in[] = str_replace(':' . $value['column'], $value['value'], $value['expr']);
-            } else {
-                $marker = ':' . str_replace('.', '_', $value['column']) . QueryBuilder::SECURE . count($this->values);
-                $tmpExpr = explode(' ', $value['expr']);
-                $tmpExpr[count($tmpExpr)-1] = str_replace('.', '_', $tmpExpr[count($tmpExpr)-1]);
-                $value['expr'] = implode(' ', $tmpExpr);
-                $condition .= $value['expr'] . QueryBuilder::SECURE . count($this->values) . " AND ";
 
-                $this->values[
-                    $marker
-                ] = $value['value'];
+            $marker = ':' . str_replace('.', '_', $value['column']) . QueryBuilder::SECURE . count($this->values);
+            $tmpExpr = explode(' ', $value['expr']);
+            $tmpExpr[count($tmpExpr) - 1] = str_replace('.', '_', $tmpExpr[count($tmpExpr) - 1]);
+            $value['expr'] = implode(' ', $tmpExpr);
+            $condition .= $value['expr']
+                . QueryBuilder::SECURE
+                . count($this->values)
+                . (str_contains($value['expr'], '` IN (:' . $value['column']) ? ')' : '')
+                . " AND ";
 
-            }
+            $this->values[$marker] = $value['value'];
         }
         $condition = rtrim($condition, ' AND ') . ')';
         $this->condition = $condition;