Don't override database prefix in settings.ddev.php (ddev#4781) [skip ci]

Author: rfay

pkg/ddevapp/backdrop.go

@@ -23,7 +23,6 @@ type BackdropSettings struct {
 	DatabaseHost     string
 	DatabaseDriver   string
 	DatabasePort     string
-	DatabasePrefix   string
 	HashSalt         string
 	Signature        string
 	SiteSettings     string
@@ -44,7 +43,6 @@ func NewBackdropSettings(app *DdevApp) *BackdropSettings {
 		DatabaseHost:     "ddev-" + app.Name + "-db",
 		DatabaseDriver:   "mysql",
 		DatabasePort:     GetExposedPort(app, "db"),
-		DatabasePrefix:   "",
 		HashSalt:         util.RandString(64),
 		Signature:        nodeps.DdevFileSignature,
 		SiteSettings:     "settings.php",

pkg/ddevapp/drupal.go

@@ -27,7 +27,6 @@ type DrupalSettings struct {
 	DatabaseHost     string
 	DatabaseDriver   string
 	DatabasePort     string
-	DatabasePrefix   string
 	HashSalt         string
 	Signature        string
 	SitePath         string
@@ -50,7 +49,6 @@ func NewDrupalSettings(app *DdevApp) *DrupalSettings {
 		DatabaseHost:     "db",
 		DatabaseDriver:   "mysql",
 		DatabasePort:     GetExposedPort(app, "db"),
-		DatabasePrefix:   "",
 		HashSalt:         util.RandString(64),
 		Signature:        nodeps.DdevFileSignature,
 		SitePath:         path.Join("sites", "default"),

pkg/ddevapp/drupal/backdrop/settings.ddev.php

@@ -17,7 +17,6 @@
 }
 
 $database = "$driver://{{ $config.DatabaseUsername }}:{{ $config.DatabasePassword }}@$host:$port/{{ $config.DatabaseName }}";
-$database_prefix = '{{ $config.DatabasePrefix }}';
 
 $settings['update_free_access'] = FALSE;
 $settings['hash_salt'] = '{{ $config.HashSalt }}';

pkg/ddevapp/drupal/drupal10/settings.ddev.php

@@ -18,15 +18,12 @@
   $port = {{ $config.DBPublishedPort }};
 }
 
-$databases['default']['default'] = array(
-  'database' => "{{ $config.DatabaseName }}",
-  'username' => "{{ $config.DatabaseUsername }}",
-  'password' => "{{ $config.DatabasePassword }}",
-  'host' => $host,
-  'driver' => $driver,
-  'port' => $port,
-  'prefix' => "{{ $config.DatabasePrefix }}",
-);
+$databases['default']['default']['database'] = "{{ $config.DatabaseName }}";
+$databases['default']['default']['username'] = "{{ $config.DatabaseUsername }}";
+$databases['default']['default']['password'] = "{{ $config.DatabasePassword }}";
+$databases['default']['default']['host'] = $host;
+$databases['default']['default']['driver'] = $driver;
+$databases['default']['default']['port'] = $port;
 
 $settings['hash_salt'] = '{{ $config.HashSalt }}';
 

pkg/ddevapp/drupal/drupal7/settings.ddev.php

@@ -18,15 +18,12 @@
   $port = {{ $config.DBPublishedPort }};
 }
 
-$databases['default']['default'] = array(
-  'database' => "{{ $config.DatabaseName }}",
-  'username' => "{{ $config.DatabaseUsername }}",
-  'password' => "{{ $config.DatabasePassword }}",
-  'host' => $host,
-  'driver' => $driver,
-  'port' => $port,
-  'prefix' => "{{ $config.DatabasePrefix }}",
-);
+$databases['default']['default']['database'] = "{{ $config.DatabaseName }}";
+$databases['default']['default']['username'] = "{{ $config.DatabaseUsername }}";
+$databases['default']['default']['password'] = "{{ $config.DatabasePassword }}";
+$databases['default']['default']['host'] = $host;
+$databases['default']['default']['driver'] = $driver;
+$databases['default']['default']['port'] = $port;
 
 $drupal_hash_salt = '{{ $config.HashSalt }}';
 

pkg/ddevapp/drupal/drupal8/settings.ddev.php

@@ -18,15 +18,12 @@
   $port = {{ $config.DBPublishedPort }};
 }
 
-$databases['default']['default'] = array(
-  'database' => "{{ $config.DatabaseName }}",
-  'username' => "{{ $config.DatabaseUsername }}",
-  'password' => "{{ $config.DatabasePassword }}",
-  'host' => $host,
-  'driver' => $driver,
-  'port' => $port,
-  'prefix' => "{{ $config.DatabasePrefix }}",
-);
+$databases['default']['default']['database'] = "{{ $config.DatabaseName }}";
+$databases['default']['default']['username'] = "{{ $config.DatabaseUsername }}";
+$databases['default']['default']['password'] = "{{ $config.DatabasePassword }}";
+$databases['default']['default']['host'] = $host;
+$databases['default']['default']['driver'] = $driver;
+$databases['default']['default']['port'] = $port;
 
 $settings['hash_salt'] = '{{ $config.HashSalt }}';
 

pkg/ddevapp/drupal/drupal9/settings.ddev.php

@@ -18,15 +18,12 @@
   $port = {{ $config.DBPublishedPort }};
 }
 
-$databases['default']['default'] = array(
-  'database' => "{{ $config.DatabaseName }}",
-  'username' => "{{ $config.DatabaseUsername }}",
-  'password' => "{{ $config.DatabasePassword }}",
-  'host' => $host,
-  'driver' => $driver,
-  'port' => $port,
-  'prefix' => "{{ $config.DatabasePrefix }}",
-);
+$databases['default']['default']['database'] = "{{ $config.DatabaseName }}";
+$databases['default']['default']['username'] = "{{ $config.DatabaseUsername }}";
+$databases['default']['default']['password'] = "{{ $config.DatabasePassword }}";
+$databases['default']['default']['host'] = $host;
+$databases['default']['default']['driver'] = $driver;
+$databases['default']['default']['port'] = $port;
 
 $settings['hash_salt'] = '{{ $config.HashSalt }}';