Fix subquery parsing for NotSubIn and SubIn

Author: mikebronner

src/CacheKey.php

@@ -97,7 +97,7 @@ protected function getQueryColumns(array $columns) : string
 
     protected function getTypeClause($where) : string
     {
-        $type =in_array($where["type"], ["In", "NotIn", "Null", "NotNull", "between"])
+        $type = in_array($where["type"], ["In", "NotIn", "Null", "NotNull", "between", "NotInSub", "InSub"])
             ? strtolower($where["type"])
             : strtolower($where["operator"]);
 
@@ -120,6 +120,18 @@ protected function getValuesClause(array $where = null) : string
 
     protected function getValuesFromWhere(array $where) : string
     {
+        if (array_get($where, "query")) {
+            $prefix = $this->getCachePrefix();
+            $subKey = (new self($this->eagerLoad, $this->model, $where["query"]))
+                ->make();
+            $subKey = str_replace($prefix, "", $subKey);
+            $subKey = str_replace($this->getModelSlug(), "", $subKey);
+            $classParts = explode("\\", get_class($this->model));
+            $subKey = strtolower(array_pop($classParts)) . $subKey;
+
+            return $subKey;
+        }
+
         if (is_array(array_get($where, "values"))) {
             return implode("_", $where["values"]);
         }

tests/Integration/CachedBuilder/WhereNotInTest.php

@@ -17,8 +17,6 @@
 
 class WhereNotInTest extends IntegrationTestCase
 {
-    
-
     public function testWhereNotInQuery()
     {
         $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook-author_id_not_in_1_2_3_4');
@@ -64,4 +62,30 @@ public function testWhereNotInResults()
         $this->assertEquals($liveResults->pluck("id"), $results->pluck("id"));
         $this->assertEquals($liveResults->pluck("id"), $cachedResults->pluck("id"));
     }
+
+    public function testWhereNotInSubquery()
+    {
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook-id_notinsub_book-id_<_10');
+        $tags = [
+            'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',
+        ];
+
+        $results = (new Book)
+            ->whereNotIn("id", function ($query) {
+                $query->select("id")->from("authors")->where("id", "<", 10);
+            })
+            ->get();
+        $cachedResults = $this
+            ->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+        $liveResults = (new UncachedBook)
+            ->whereNotIn("id", function ($query) {
+                $query->select("id")->from("authors")->where("id", "<", 10);
+            })
+            ->get();
+
+        $this->assertEquals($liveResults->pluck("id"), $results->pluck("id"));
+        $this->assertEquals($liveResults->pluck("id"), $cachedResults->pluck("id"));
+    }
 }