Added support for DATABASE_DATABASE DB name in settings.

drevops · Jan 31, 2025 · a4668c7 · a4668c7 · github-actions · Jan 31, 2025
1 parent 10fa3ec
commit a4668c7
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 1 deletion.
diff --git a/.vortex/docs/.utils/variables/extra/lagoon.variables.sh b/.vortex/docs/.utils/variables/extra/lagoon.variables.sh
@@ -3,6 +3,9 @@
 # Additional environment variables used in this project in the Lagoon environment.
 # shellcheck disable=SC2034
 
+# Database name.
+DATABASE_DATABASE=
+
 # Enable New Relic in Lagoon environment.
 #
 # Set as project-wide variable.

diff --git a/.vortex/docs/content/workflows/variables.mdx b/.vortex/docs/content/workflows/variables.mdx
@@ -44,6 +44,14 @@ Default value: `UNDEFINED`
 
 Defined in: `ENVIRONMENT`
 
+### `DATABASE_DATABASE`
+
+Database name.
+
+Default value: `UNDEFINED`
+
+Defined in: `LAGOON ENVIRONMENT`
+
 ### `DATABASE_HOST`
 
 Local database host.

diff --git a/tests/phpunit/Drupal/DatabaseSettingsTest.php b/tests/phpunit/Drupal/DatabaseSettingsTest.php
@@ -70,6 +70,29 @@ public static function dataProviderDatabases(): array {
           ],
         ],
       ],
+
+      [
+        [
+          'DATABASE_DATABASE' => 'test_db_name',
+          'DATABASE_USERNAME' => 'test_db_user',
+          'DATABASE_PASSWORD' => 'test_db_pass',
+          'DATABASE_HOST' => 'test_db_host',
+          'DATABASE_PORT' => 'test_db_port',
+        ],
+        [
+          'default' => [
+            'default' => [
+              'database' => 'test_db_name',
+              'username' => 'test_db_user',
+              'password' => 'test_db_pass',
+              'host' => 'test_db_host',
+              'port' => 'test_db_port',
+              'driver' => 'mysql',
+              'prefix' => '',
+            ],
+          ],
+        ],
+      ],
     ];
   }
 

diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php
@@ -113,7 +113,7 @@
     [
       'default' =>
         [
-          'database' => getenv('DATABASE_NAME') ?: getenv('MARIADB_DATABASE') ?: 'drupal',
+          'database' => getenv('DATABASE_NAME') ?: getenv('DATABASE_DATABASE') ?: getenv('MARIADB_DATABASE') ?: 'drupal',
           'username' => getenv('DATABASE_USERNAME') ?: getenv('MARIADB_USERNAME') ?: 'drupal',
           'password' => getenv('DATABASE_PASSWORD') ?: getenv('MARIADB_PASSWORD') ?: 'drupal',
           'host' => getenv('DATABASE_HOST') ?: getenv('MARIADB_HOST') ?: 'localhost',