Merge pull request #219 from wizzymore/fix-model-connection

Fix model connection
spatie · Feb 12, 2024 · 8f6a193 · 8f6a193
2 parents 75dc464 + 4716ce4
commit 8f6a193
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/src/Models/HealthCheckResultHistoryItem.php b/src/Models/HealthCheckResultHistoryItem.php
@@ -34,13 +34,14 @@ class HealthCheckResultHistoryItem extends Model
 
     public function getConnectionName(): string
     {
-        return config('health.result_stores.'.EloquentHealthResultStore::class.'.connection')
-            ?: config('database.default');
+        return $this->connection ?:
+            config('health.result_stores.' . EloquentHealthResultStore::class . '.connection') ?:
+            config('database.default');
     }
 
     public function prunable(): Builder
     {
-        $days = config('health.result_stores.'.EloquentHealthResultStore::class.'.keep_history_for_days') ?? 5;
+        $days = config('health.result_stores.' . EloquentHealthResultStore::class . '.keep_history_for_days') ?? 5;
 
         return static::where('created_at', '<=', now()->subDays($days));
     }

diff --git a/tests/Support/DbConnectionInfoTest.php b/tests/Support/DbConnectionInfoTest.php
@@ -1,7 +1,10 @@
 <?php
 
 use Illuminate\Database\ConnectionResolverInterface;
+use Spatie\Health\Models\HealthCheckResultHistoryItem;
+use Spatie\Health\ResultStores\EloquentHealthResultStore;
 use Spatie\Health\Support\DbConnectionInfo;
+use Spatie\Health\Tests\TestClasses\CrashingHealthCheckResultHistoryItem;
 
 it('can determine the table size in mb', function () {
     $connection = app(ConnectionResolverInterface::class)->connection('mysql');
@@ -22,3 +25,21 @@
 
     expect($size)->toBeGreaterThan(0);
 });
+
+it('correctly determines the connection of the model', function () {
+    $model = new CrashingHealthCheckResultHistoryItem();
+
+    expect($model->getConnectionName())->toBe('custom');
+
+    $model = new HealthCheckResultHistoryItem();
+
+    expect($model->getConnectionName())->toBe(config('database.default'));
+
+    config()->set('health.result_stores', [
+        EloquentHealthResultStore::class => [
+            'connection' => 'custom_in_config'
+        ],
+    ]);
+
+    expect($model->getConnectionName())->toBe(config('health.result_stores.' . EloquentHealthResultStore::class . '.connection'));
+});
diff --git a/tests/TestClasses/CrashingHealthCheckResultHistoryItem.php b/tests/TestClasses/CrashingHealthCheckResultHistoryItem.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Spatie\Health\Tests\TestClasses;
+
+use Spatie\Health\Models\HealthCheckResultHistoryItem;
+
+class CrashingHealthCheckResultHistoryItem extends HealthCheckResultHistoryItem
+{
+	protected $connection = 'custom';
+}