From be2898b8e4011ab8d30db717596b84e841fe5a63 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 10 May 2021 17:23:40 +0200 Subject: [PATCH] Update note about server version --- doctrine/doctrine-bundle/2.3/config/packages/doctrine.yaml | 5 ++++- doctrine/doctrine-bundle/2.3/manifest.json | 2 +- doctrine/doctrine-bundle/2.4/config/packages/doctrine.yaml | 5 ++++- doctrine/doctrine-bundle/2.4/manifest.json | 2 +- doctrine/doctrine-bundle/2.4/post-install.txt | 3 +++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doctrine/doctrine-bundle/2.3/config/packages/doctrine.yaml b/doctrine/doctrine-bundle/2.3/config/packages/doctrine.yaml index 3475b374..c3191765 100644 --- a/doctrine/doctrine-bundle/2.3/config/packages/doctrine.yaml +++ b/doctrine/doctrine-bundle/2.3/config/packages/doctrine.yaml @@ -1,7 +1,10 @@ doctrine: dbal: - # IMPORTANT: DATABASE_URL *must* define the server version url: '%env(resolve:DATABASE_URL)%' + + # IMPORTANT: You MUST configure your server version, + # either here or in the DATABASE_URL env var (see .env file) + #server_version: '13' orm: auto_generate_proxy_classes: true naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware diff --git a/doctrine/doctrine-bundle/2.3/manifest.json b/doctrine/doctrine-bundle/2.3/manifest.json index 0eae6da8..995a953a 100644 --- a/doctrine/doctrine-bundle/2.3/manifest.json +++ b/doctrine/doctrine-bundle/2.3/manifest.json @@ -8,7 +8,7 @@ }, "env": { "#1": "Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url", - "#2": "IMPORTANT: DATABASE_URL *must* define the server version", + "#2": "IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml", "#3": "", "#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"", "#5": "DATABASE_URL=\"mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7\"", diff --git a/doctrine/doctrine-bundle/2.4/config/packages/doctrine.yaml b/doctrine/doctrine-bundle/2.4/config/packages/doctrine.yaml index 3475b374..c3191765 100644 --- a/doctrine/doctrine-bundle/2.4/config/packages/doctrine.yaml +++ b/doctrine/doctrine-bundle/2.4/config/packages/doctrine.yaml @@ -1,7 +1,10 @@ doctrine: dbal: - # IMPORTANT: DATABASE_URL *must* define the server version url: '%env(resolve:DATABASE_URL)%' + + # IMPORTANT: You MUST configure your server version, + # either here or in the DATABASE_URL env var (see .env file) + #server_version: '13' orm: auto_generate_proxy_classes: true naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware diff --git a/doctrine/doctrine-bundle/2.4/manifest.json b/doctrine/doctrine-bundle/2.4/manifest.json index 0eae6da8..995a953a 100644 --- a/doctrine/doctrine-bundle/2.4/manifest.json +++ b/doctrine/doctrine-bundle/2.4/manifest.json @@ -8,7 +8,7 @@ }, "env": { "#1": "Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url", - "#2": "IMPORTANT: DATABASE_URL *must* define the server version", + "#2": "IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml", "#3": "", "#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"", "#5": "DATABASE_URL=\"mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7\"", diff --git a/doctrine/doctrine-bundle/2.4/post-install.txt b/doctrine/doctrine-bundle/2.4/post-install.txt index 2b2a14e8..54ca1381 100644 --- a/doctrine/doctrine-bundle/2.4/post-install.txt +++ b/doctrine/doctrine-bundle/2.4/post-install.txt @@ -3,3 +3,6 @@ * Modify your DATABASE_URL config in .env + + * Configure the driver (postgresql) and + server_version (13) in config/packages/doctrine.yaml