From 7c8d8e464b3f4b7f8970d26736ead159e4503d9d Mon Sep 17 00:00:00 2001
From: Maciej Kobus <webhdx@users.noreply.github.com>
Date: Tue, 9 Jul 2019 16:19:18 +0200
Subject: [PATCH] EZP-30667: Made database charset and collation configurable
 via dotenv (#434)

---
 .env                          |  5 +++--
 config/packages/doctrine.yaml | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.env b/.env
index 3f3ba35cf6..4dc9016afb 100644
--- a/.env
+++ b/.env
@@ -48,7 +48,8 @@ DATABASE_PASSWORD=SetYourOwnPassword
 DATABASE_NAME=ezp
 DATABASE_HOST=db
 DATABASE_PORT=3306
-DATABASE_DRIVER=mysql
+DATABASE_PLATFORM=mysql
+DATABASE_DRIVER=pdo_mysql
 
 # Doctrine DBAL Schema
 # set here for BC reasons, change them in parameters.yml
@@ -70,7 +71,7 @@ APP_SECRET=ff6dc61a329dc96652bb092ec58981f7
 # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
 # Configure your db driver and server_version in config/packages/doctrine.yaml
-DATABASE_URL=${DATABASE_DRIVER}://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
+DATABASE_URL=${DATABASE_PLATFORM}://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/swiftmailer-bundle ###
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
index 9521fad7db..68f0c8ce0b 100644
--- a/config/packages/doctrine.yaml
+++ b/config/packages/doctrine.yaml
@@ -4,17 +4,17 @@ parameters:
     # environment variables are not available yet.
     # You should not need to change this value.
     env(DATABASE_URL): ''
+    env(DATABASE_DRIVER): ''
+    database_driver: '%env(DATABASE_DRIVER)%'
 
 doctrine:
     dbal:
         # configure these for your database server
-        driver: 'pdo_mysql'
-        server_version: '5.7'
-        charset: utf8mb4
+        driver: '%database_driver%'
+        charset: '%database_charset%'
         default_table_options:
-            charset: utf8mb4
-            collate: utf8mb4_unicode_ci
-
+            charset: '%database_charset%'
+            collate: '%database_collation%'
         url: '%env(resolve:DATABASE_URL)%'
     orm:
         auto_generate_proxy_classes: true