Change IN statement

Author: QuentinBubu

src/QueryBuilder/Expr.php

@@ -123,4 +123,19 @@ public static function isNotNull(string $column, mixed $value): array {
             'expr'   => "`{$column}` IS NOT NULL :{$column}"
         ];
     }
+
+    /**
+     * in (IN)
+     *
+     * @param string $column
+     * @param array $value
+     * @return array
+     */
+    public static function in(string $column, array $value): array {
+        return [
+            'value'  => '(' . implode(',', $value) . ')',
+            'column' => $column,
+            'expr'   => "`{$column}` IN :{$column}"
+        ];
+    }
 }

src/QueryBuilder/QueryBuilder.php

@@ -38,7 +38,7 @@ public function __toString(): string
        $request = str_replace('[TABLE_NAME]', $this->table, $this->action);
 
        if (!is_null($this->condition)) $request .= $this->condition;
-       if (!is_null($this->in)) $request .= $this->in;
+       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

@@ -11,7 +11,7 @@ trait QueryMethods
     protected array  $values     = [];
     protected ?string $orderBy   = null;
     protected ?string $limit     = null;
-    protected ?string $in        = null;
+    protected ?array $in         = null;
 
     public function table(string $table): self
     {
@@ -106,16 +106,20 @@ public function where(array ...$where): self
             $condition = $this->condition . ' OR (';
         }
         foreach ($where as $value) {
-            $marker = ':' . $value['column'] . QueryBuilder::SECURE . count($this->values);
-
-            $condition .= $value['expr'] . QueryBuilder::SECURE . count($this->values) . " AND ";
+            if (str_contains($value['expr'], '` IN :' . $value['column'])) {
+                $this->in[] = str_replace(':' . $value['column'], $value['value'], $value['expr']);
+            } else {
+                $marker = ':' . $value['column'] . QueryBuilder::SECURE . count($this->values);
+                $condition .= $value['expr'] . QueryBuilder::SECURE . count($this->values) . " AND ";
 
-            $this->values[
-                $marker
+                $this->values[
+                    $marker
                 ] = $value['value'];
+
+                $condition = rtrim($condition, ' AND ') . ')';
+                $this->condition = $condition;
+            }
         }
-        $condition = rtrim($condition, ' AND ') . ')';
-        $this->condition = $condition;
         return $this;
     }
 
@@ -144,17 +148,4 @@ public function limit(int $limit, int $offset = 0): self
         $this->limit = " LIMIT $limit OFFSET $offset";
         return $this;
     }
-
-    /**
-     * in
-     *
-     * @param array $in
-     * @return self
-     */
-    public function in(array $in): self
-    {
-        $in = implode(',', $in);
-        $this->in = " IN($in)";
-        return $this;
-    }
 }

tests/index.php

@@ -57,14 +57,14 @@
     ])
     ->execute($i);
 
-var_dump(Database::queryBuilder('test')
+Database::queryBuilder('test')
     ->select('col1', 'col2')
     ->orderBy('col1', QueryBuilder::DESC)
     ->limit(2)
     ->where(
         Database::expr()->neq('col1', 50)
     )
-    ->fetchAll($i));
+    ->fetchAll($i);
 /*
     Database::queryBuilder('test')
     ->delete()
@@ -81,3 +81,11 @@
         Database::expr()::lte('col1', 50)
     )
     ->execute($i);
+
+var_dump(Database::queryBuilder('test')
+    ->select('col2')
+    ->where(Database::expr()::in('id', ['27', 30]),
+    Database::expr()::in('id', [29, 42, 46]))
+    ->simulate()
+    ->fetchAll()
+);