Merge remote-tracking branch 'origin/master' into fix/526-custom-builder-support

Author: mikebronner

.gitignore

@@ -12,3 +12,4 @@
 /vendor
 composer.lock
 .ai
+/tests/database/*.sqlite-journal

src/CacheKey.php

@@ -1,8 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace GeneaLabs\LaravelModelCaching;
 
 use BackedEnum;
+use DateTimeInterface;
 use Exception;
 use GeneaLabs\LaravelModelCaching\Traits\CachePrefixing;
 use Illuminate\Database\Query\Expression;
@@ -137,11 +140,6 @@ protected function getInAndNotInClauses(array $where) : string
 
         $type = strtolower($where["type"]);
         $subquery = $this->getValuesFromWhere($where);
-        $values = collect($this->getCurrentBinding('where', []));
-
-        if (Str::startsWith($subquery, $values->first())) {
-            $this->currentBinding += count($where["values"]);
-        }
 
         if (! is_numeric($subquery) && ! is_numeric(str_replace("_", "", $subquery))) {
             try {
@@ -154,6 +152,23 @@ protected function getInAndNotInClauses(array $where) : string
             }
         }
 
+        $placeholderCount = preg_match_all('/\?(?=(?:[^"]*"[^"]*")*[^"]*\Z)/m', $subquery);
+
+        if ($placeholderCount === 0) {
+            if (data_get($where, "values")) {
+                $this->currentBinding += count(data_get($where, "values"));
+            }
+
+            $values = $this->recursiveImplode([$subquery], "_");
+
+            return "-{$where["column"]}_{$type}{$values}";
+        }
+
+        $values = collect(data_get($this->query->bindings, "where"))
+            ->slice($this->currentBinding, $placeholderCount)
+            ->values();
+        $this->currentBinding += $placeholderCount;
+
         $subquery = preg_replace('/\?(?=(?:[^"]*"[^"]*")*[^"]*\Z)/m', "_??_", $subquery);
         $subquery = str_replace('%', '%%', $subquery);
         $subquery = collect(vsprintf(str_replace("_??_", "%s", $subquery), $values->toArray()));
@@ -370,7 +385,7 @@ protected function getValuesFromBindings(array $where, string $values) : string
             $values = $values->format("Y-m-d-H-i-s");
         }
 
-        return $values;
+        return (string) $values;
     }
 
     protected function getWhereClauses(array $wheres = []) : string
@@ -483,17 +498,20 @@ protected function recursiveImplode(array $items, string $glue = ",") : string
         return $result;
     }
 
-    private function processEnum(BackedEnum|UnitEnum|Expression|string|null $value): ?string
-    {
+    private function processEnum(
+        BackedEnum|UnitEnum|Expression|DateTimeInterface|int|float|bool|string|null $value,
+    ): string {
         if ($value instanceof BackedEnum) {
             return $value->value;
         } elseif ($value instanceof UnitEnum) {
             return $value->name;
         } elseif ($value instanceof Expression) {
             return $this->expressionToString($value);
+        } elseif ($value instanceof DateTimeInterface) {
+            return $value->format("Y-m-d-H-i-s");
         }
 
-        return $value;
+        return "{$value}";
     }
 
     private function processEnums(array $values): array

tests/Integration/CachedBuilder/WhereInTest.php

@@ -121,4 +121,48 @@ public function testWhereInWithPercentCharacterInValueDoesNotThrow()
         $this->assertEquals($liveResults->pluck("id"), $authors->pluck("id"));
         $this->assertEquals($liveResults->pluck("id"), $cachedResults->pluck("id"));
     }
+
+    public function testWhereInWithSubqueryContainingSingleWhereClause()
+    {
+        $books = (new Book)
+            ->whereIn("author_id", function ($query) {
+                $query->select("id")
+                    ->from("authors")
+                    ->where("name", "=", "John");
+            })
+            ->get();
+
+        $liveResults = (new UncachedBook)
+            ->whereIn("author_id", function ($query) {
+                $query->select("id")
+                    ->from("authors")
+                    ->where("name", "=", "John");
+            })
+            ->get();
+
+        $this->assertEquals($liveResults->pluck("id"), $books->pluck("id"));
+    }
+
+    public function testWhereInWithSubqueryContainingMultipleWhereClauses()
+    {
+        $books = (new Book)
+            ->whereIn("author_id", function ($query) {
+                $query->select("id")
+                    ->from("authors")
+                    ->where("name", "=", "John")
+                    ->where("id", ">", 0);
+            })
+            ->get();
+
+        $liveResults = (new UncachedBook)
+            ->whereIn("author_id", function ($query) {
+                $query->select("id")
+                    ->from("authors")
+                    ->where("name", "=", "John")
+                    ->where("id", ">", 0);
+            })
+            ->get();
+
+        $this->assertEquals($liveResults->pluck("id"), $books->pluck("id"));
+    }
 }