Fix InRaw caching

Fixes #239

Author: mikebronner

README.md

@@ -37,7 +37,6 @@ The following items currently do no work with this package:
 - caching of lazy-loaded relationships, see #127
 - using select() clauses in Eloquent queries, see #238 (work-around discussed in the issue)
 - using SoftDeletes on Models, see #237
-- using polymorphic relationships, see #239
 ```
 
 [![installation guide cover](https://user-images.githubusercontent.com/1791050/36356190-fc1982b2-14a2-11e8-85ed-06f8e3b57ae8.png)](https://vimeo.com/256318402)

src/CacheKey.php

@@ -218,7 +218,7 @@ protected function getInClauses(array $where) : string
 
     protected function getInAndNotInClauses(array $where) : string
     {
-        if (! in_array($where["type"], ["In", "NotIn"])) {
+        if (! in_array($where["type"], ["In", "NotIn", "InRaw"])) {
             return "";
         }
 
@@ -264,7 +264,7 @@ protected function recursiveImplode(array $items, string $glue = ",") : string
 
     protected function getRawClauses(array $where) : string
     {
-        if ($where["type"] !== "raw") {
+        if (! in_array($where["type"], ["raw"])) {
             return "";
         }
 
@@ -288,7 +288,7 @@ protected function getRawClauses(array $where) : string
 
     protected function getOtherClauses(array $where) : string
     {
-        if (in_array($where["type"], ["Exists", "Nested", "NotExists", "Column", "raw", "In", "NotIn"])) {
+        if (in_array($where["type"], ["Exists", "Nested", "NotExists", "Column", "raw", "In", "NotIn", "InRaw"])) {
             return "";
         }
 

tests/Fixtures/Book.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
 
 class Book extends Model
 {
@@ -33,6 +34,11 @@ public function comments() : MorphMany
         return $this->morphMany(Comment::class, "commentable");
     }
 
+    public function image() : MorphOne
+    {
+        return $this->morphOne(Image::class, "imagable");
+    }
+
     public function publisher() : BelongsTo
     {
         return $this->belongsTo(Publisher::class);

tests/Fixtures/Image.php

@@ -0,0 +1,19 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
+
+use GeneaLabs\LaravelModelCaching\Traits\Cachable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+
+class Image extends Model
+{
+    use Cachable;
+
+    protected $fillable = [
+        'path',
+    ];
+
+    public function imagable() : MorphTo
+    {
+        return $this->morphTo();
+    }
+}

tests/Fixtures/UncachedBook.php

@@ -2,10 +2,15 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
 
 class UncachedBook extends Model
 {
+    protected $casts = [
+        'price' => 'float',
+    ];
     protected $dates = [
         'published_at',
     ];
@@ -21,6 +26,16 @@ public function author() : BelongsTo
         return $this->belongsTo(UncachedAuthor::class);
     }
 
+    public function comments() : MorphMany
+    {
+        return $this->morphMany(Comment::class, "commentable");
+    }
+
+    public function image() : MorphOne
+    {
+        return $this->morphOne(Image::class, "imagable");
+    }
+
     public function publisher() : BelongsTo
     {
         return $this->belongsTo(UncachedPublisher::class);

tests/Integration/CachedBuilder/MorphOneTest.php

@@ -0,0 +1,56 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration\CachedBuilder;
+
+use Faker\Generator as Faker;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
+use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
+
+class MorphOneTest extends IntegrationTestCase
+{
+    public function setUp() : void
+    {
+        parent::setUp();
+
+        (new Book)
+            ->get()
+            ->each(function ($book) {
+                $book->image()->create([
+                    "path" => app(Faker::class)->imageUrl(),
+                ]);
+            });
+        $this->cache()->flush();
+    }
+
+    public function testMorphTo()
+    {
+        $key1 = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-author_id_=_1-testing::memory::image');
+        $key2 = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-author_id_=_2-testing::memory::image');
+        $tags = [
+            "genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook",
+            "genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesimage",
+        ];
+
+        $books1 = (new Book)
+            ->with("image")
+            ->where("author_id", 1)
+            ->get();
+        $cachedResults1 = $this->cache()
+            ->tags($tags)
+            ->get($key1)['value'];
+        $books2 = (new Book)
+            ->with("image")
+            ->where("author_id", 2)
+            ->get();
+        $cachedResults2 = $this->cache()
+            ->tags($tags)
+            ->get($key2)['value'];
+
+        $this->assertEquals($cachedResults1->pluck("images.id"), $books1->pluck("images.id"));
+        $this->assertEquals($cachedResults2->pluck("images.id"), $books2->pluck("images.id"));
+        $this->assertNotEquals($cachedResults1->pluck("images.id"), $cachedResults2->pluck("images.id"));
+        $this->assertNotEquals($books1->pluck("images.id"), $books2->pluck("images.id"));
+        $this->assertNotNull($books1->first()->image);
+        $this->assertNotNull($books2->first()->image);
+        $this->assertNotNull($cachedResults1->first()->image);
+        $this->assertNotNull($cachedResults2->first()->image);
+    }
+}

tests/Integration/CachedBuilder/WhereInTest.php

@@ -79,7 +79,6 @@ public function testBindingsAreCorrectWithMultipleWhereInClauses()
         $this->assertEquals($liveResults->pluck("id"), $cachedResults->pluck("id"));
     }
 
-    /** @group test */
     public function testWhereInUsesCorrectBindings()
     {
         $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-id_in_1_2_3_4_5-id_between_1_99999');

tests/database/factories/ImageFactory.php

@@ -0,0 +1,10 @@
+<?php
+
+use Faker\Generator as Faker;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Image;
+
+$factory->define(Image::class, function (Faker $faker) {
+    return [
+        'path' => $faker->imageUrl(),
+    ];
+});

tests/database/migrations/2018_06_03_202001_create_images.php

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateImages extends Migration
+{
+    public function up()
+    {
+        Schema::create('images', function (Blueprint $table) {
+            $table->increments('id');
+            $table->timestamps();
+
+            $table->unsignedInteger("imagable_id")->nullable();
+            $table->string("imagable_type")->nullable();
+            $table->text("path");
+        });
+    }
+}