bump to v1.0.6-alpha, hotfix mergeConfigFromSettings only execute i…

…f migrations completed/ settings table exists
fleetbase · Jun 9, 2023 · 20890b9 · 20890b9
1 parent 674dec0
commit 20890b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/core-api",
-    "version": "1.0.5-alpha",
+    "version": "1.0.6-alpha",
     "description": "Core Framework and Resources for Fleetbase API",
     "keywords": [
         "fleetbase",

diff --git a/src/Providers/CoreServiceProvider.php b/src/Providers/CoreServiceProvider.php
@@ -8,6 +8,7 @@
 use Laravel\Cashier\Cashier;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
@@ -102,6 +103,11 @@ public function boot()
      */
     public function mergeConfigFromSettings()
     {
+        // Check if the settings table exists
+        if (!Schema::hasTable('settings')) {
+            return;
+        }
+
         $putsenv = [
             'services.aws' => ['key' => 'AWS_ACCESS_KEY_ID', 'secret' => 'AWS_SECRET_ACCESS_KEY', 'region' => 'AWS_DEFAULT_REGION'],
             'services.google_maps' => ['api_key' => 'GOOGLE_MAPS_API_KEY', 'locale' => 'GOOGLE_MAPS_LOCALE'],