Merge remote-tracking branch 'pelican-dev/issue/311' into issue/311

pelican-dev · Sep 26, 2024 · f6609b1 · f6609b1
2 parents 6f15537 + 3acaf3d
commit f6609b1
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 51 deletions.
diff --git a/composer.json b/composer.json
@@ -90,4 +90,4 @@
     },
     "minimum-stability": "stable",
     "prefer-stable": true
-}
+}
diff --git a/composer.lock b/composer.lock
diff --git a/config/database.php b/config/database.php
@@ -1,5 +1,7 @@
 <?php
 
+$databasePath = env('DB_DATABASE', 'database.sqlite');
+
 return [
 
     'default' => env('DB_CONNECTION', 'sqlite'),
@@ -8,7 +10,7 @@
         'sqlite' => [
             'driver' => 'sqlite',
             'url' => env('DB_URL'),
-            'database' => database_path(env('DB_DATABASE', 'database.sqlite')),
+            'database' => str_starts_with($databasePath, '/') ? $databasePath : database_path($databasePath),
             'prefix' => '',
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ],