fix: trim _ from database prefix during project initialization

carlalexander · carlalexander · commit 62bc98bdb20d · 2022-02-09T09:46:21.000-05:00
diff --git a/src/Command/Project/InitializeProjectCommand.php b/src/Command/Project/InitializeProjectCommand.php
@@ -172,7 +172,7 @@ private function addEnvironmentDatabaseNodes(Collection $environments, OutputInt
                 Arr::set($options, 'database', $databaseServer['name']);
             } elseif (!empty($databaseServer['name']) && !empty($databasePrefix)) {
                 Arr::set($options, 'database.server', $databaseServer['name']);
-                Arr::set($options, 'database.name', sprintf('%s_%s', $databasePrefix, $environment));
+                Arr::set($options, 'database.name', sprintf('%s_%s', rtrim($databasePrefix, '_'), $environment));
             }
 
             return $options;

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ private function addEnvironmentDatabaseNodes(Collection $environments, OutputInt`
`172`	`172`	`Arr::set($options, 'database', $databaseServer['name']);`
`173`	`173`	`} elseif (!empty($databaseServer['name']) && !empty($databasePrefix)) {`
`174`	`174`	`Arr::set($options, 'database.server', $databaseServer['name']);`
`175`		`- Arr::set($options, 'database.name', sprintf('%s_%s', $databasePrefix, $environment));`
	`175`	`+ Arr::set($options, 'database.name', sprintf('%s_%s', rtrim($databasePrefix, '_'), $environment));`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`return $options;`