Skip to content

Commit 0a2ad7e

Browse files
committed
Make dbal config: "server_version" configurable
The server version must now be set in the parameters.yml. A sensible default is provided in the parameters.yml.dist.
1 parent 5864d9e commit 0a2ad7e

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## Develop
4+
* The previously hardcoded "server_version" config option (Doctrine DBAL) is now configurable
5+
36
## 2.9.1
47
**Bugfix**
58
* Resolve a Doctrine DBAL configuration issue described in https://github.com/doctrine/DoctrineBundle/issues/351

app/config/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ doctrine:
7272
dbname: "%database_middleware_name%"
7373
user: "%database_middleware_user%"
7474
password: "%database_middleware_password%"
75-
server_version: '5.6'
75+
server_version: "%database_server_version%"
7676
charset: UTF8
7777
gateway:
7878
driver: "%database_driver%"
@@ -81,7 +81,7 @@ doctrine:
8181
dbname: "%database_gateway_name%"
8282
user: "%database_gateway_user%"
8383
password: "%database_gateway_password%"
84-
server_version: '5.6'
84+
server_version: "%database_server_version%"
8585
charset: UTF8
8686
deploy:
8787
driver: "%database_driver%"
@@ -90,7 +90,7 @@ doctrine:
9090
dbname: "%database_middleware_name%"
9191
user: "%database_deploy_user%"
9292
password: "%database_deploy_password%"
93-
server_version: '5.6'
93+
server_version: "%database_server_version%"
9494
charset: UTF8
9595
types:
9696
authority_role: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\AuthorityRoleType

app/config/parameters.yml.dist

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ parameters:
22
database_driver: pdo_mysql
33
database_host: 10.10.0.100
44
database_port: ~
5+
# The database server version is used in the dbal configuration and is required to prevent issues when the database
6+
# connection is booted. See https://github.com/doctrine/DoctrineBundle/issues/351 for more details on this.
7+
# Also see: https://symfony.com/doc/current/reference/configuration/doctrine.html#doctrine-dbal-configuration
8+
database_server_version: 5.6
59
database_middleware_name: middleware
610
database_middleware_user: middleware
711
database_middleware_password: middleware

0 commit comments

Comments
 (0)