Set server_version in dbal config

See: doctrine/DoctrineBundle#351 for more details about the problem.
OpenConext · Sep 19, 2018 · d719bca · d719bca · tvdijen · Sep 22, 2018
1 parent 2d13c66
commit d719bca
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,3 +36,4 @@ branches:
   only:
     - master
     - develop
+    - release/2.9
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.9.1
+**Bugfix**
+* Resolve a Doctrine DBAL configuration issue described in https://github.com/doctrine/DoctrineBundle/issues/351
+
 ## 2.9.0
 **Bugfix**
 * Fix SRAA command for institution without config #228

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -72,6 +72,7 @@ doctrine:
                 dbname:   "%database_middleware_name%"
                 user:     "%database_middleware_user%"
                 password: "%database_middleware_password%"
+                server_version: '5.6'
                 charset:  UTF8
             gateway:
                 driver:   "%database_driver%"
@@ -80,6 +81,7 @@ doctrine:
                 dbname:   "%database_gateway_name%"
                 user:     "%database_gateway_user%"
                 password: "%database_gateway_password%"
+                server_version: '5.6'
                 charset:  UTF8
             deploy:
                 driver:   "%database_driver%"
@@ -88,6 +90,7 @@ doctrine:
                 dbname:   "%database_middleware_name%"
                 user:     "%database_deploy_user%"
                 password: "%database_deploy_password%"
+                server_version: '5.6'
                 charset:  UTF8
         types:
             authority_role: Surfnet\StepupMiddleware\ApiBundle\Doctrine\Type\AuthorityRoleType
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,3 +36,4 @@ branches: @@
       only:
         - master
         - develop
+        - release/2.9