Merge pull request #978 from dash8x/patch-1

Fixed IncludedCount.php
spatie · Dec 11, 2024 · b25d021 · b25d021
2 parents 342f30f + 59e3157
commit b25d021
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Includes/IncludedCount.php b/src/Includes/IncludedCount.php
@@ -9,6 +9,9 @@ class IncludedCount implements IncludeInterface
 {
     public function __invoke(Builder $query, string $count)
     {
-        $query->withCount(Str::before($count, config('query-builder.count_suffix', 'Count')));
+        $suffix = config('query-builder.count_suffix', 'Count');
+        $relation = Str::endsWith($count, $suffix) ? Str::beforeLast($count, $suffix) : $count;
+
+        $query->withCount($relation);
     }
 }