Skip to content

Commit ddcb960

Browse files
authored
Merge pull request #82 from acquia/ACMS-4480
ACMS-4480: Include settings for MySQL Compatibility.
2 parents 2b10937 + 5e8802e commit ddcb960

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

settings/acquia-recommended.settings.php

+15-1
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,27 @@
8484
*/
8585
// phpcs:ignore
8686
$site_name = EnvironmentDetector::getSiteName($site_path);
87+
8788
// Acquia Cloud settings.
8889
if (EnvironmentDetector::isAhEnv()) {
8990
try {
91+
// Acquia platform settings includes a require line
92+
// that opens database connection, hence the mysql57 settings
93+
// file should be added before platform require line.
94+
// @see: https://www.drupal.org/project/mysql57
95+
// @todo: Remove this line once acquia platform start supporting mysql 8.0
96+
if(!EnvironmentDetector::isAhIdeEnv()) {
97+
$settings_files[] = __DIR__ . "/mysql57.settings.php";
98+
}
9099
if (!EnvironmentDetector::isAcsfEnv()) {
91100
$settings_files[] = FilePaths::ahSettingsFile(EnvironmentDetector::getAhGroup(), $site_name);
92101
}
102+
// Acquia Cloud IDE settings have $databases variable defined hence
103+
// the mysql57 setting file should be added after platform require line.
104+
// @todo: Remove this line once acquia platform start supporting mysql 8.0
105+
if(EnvironmentDetector::isAhIdeEnv()) {
106+
$settings_files[] = __DIR__ . "/mysql57.settings.php";
107+
}
93108
}
94109
catch (SettingsException $e) {
95110
trigger_error($e->getMessage(), E_USER_WARNING);
@@ -101,7 +116,6 @@
101116
$settings_files[] = EnvironmentDetector::getAhFilesRoot() . '/secrets.settings.php';
102117
$settings_files[] = EnvironmentDetector::getAhFilesRoot() . "/$site_name/secrets.settings.php";
103118
}
104-
105119
// Default global settings.
106120
$acquia_settings_files = [
107121
'cache',

settings/mysql57.settings.php

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
/**
4+
* @file
5+
* Settings file for mysql57 backport module if present.
6+
*/
7+
if (file_exists(DRUPAL_ROOT . '/modules/contrib/mysql57/settings.inc')) {
8+
require DRUPAL_ROOT . '/modules/contrib/mysql57/settings.inc';
9+
}

0 commit comments

Comments
 (0)