Merge pull request #232 from mycarrysun/fix-disable-cache

When model cache disabled, it is correctly disabled on query and all eager loaded relations

Author: mikebronner

src/CachedBuilder.php

@@ -166,6 +166,25 @@ public function paginate(
         return $this->cachedValue(func_get_args(), $cacheKey);
     }
 
+	/**
+	 * Get the relation instance for the given relation name.
+	 * This is overloaded so we can disable model cache on
+	 * relations if parent has disabled model caching.
+	 *
+	 * @param  string  $name
+	 * @return \Illuminate\Database\Eloquent\Relations\Relation
+	 */
+	public function getRelation($name)
+	{
+		$relation = parent::getRelation($name);
+
+		if(!$this->isCachable() && is_a($relation->getQuery(), self::class)){
+			$relation->getQuery()->disableModelCaching();
+		}
+
+		return $relation;
+	}
+
     protected function recursiveImplodeWithKey(array $items, string $glue = "_") : string
     {
         $result = "";

src/Traits/ModelCaching.php

@@ -69,7 +69,7 @@ public static function destroy($ids)
     public function newEloquentBuilder($query)
     {
         if (! $this->isCachable()) {
-            $this->isCachable = true;
+            $this->isCachable = false;
 
             return new EloquentBuilder($query);
         }