Skip to content

Commit ce8ee13

Browse files
Merge pull request #947 from nicolas-grekas/server
Update note about server version
2 parents 9a3759a + be2898b commit ce8ee13

File tree

5 files changed

+13
-4
lines changed

5 files changed

+13
-4
lines changed

doctrine/doctrine-bundle/2.3/config/packages/doctrine.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
doctrine:
22
dbal:
3-
# IMPORTANT: DATABASE_URL *must* define the server version
43
url: '%env(resolve:DATABASE_URL)%'
4+
5+
# IMPORTANT: You MUST configure your server version,
6+
# either here or in the DATABASE_URL env var (see .env file)
7+
#server_version: '13'
58
orm:
69
auto_generate_proxy_classes: true
710
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware

doctrine/doctrine-bundle/2.3/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"env": {
1010
"#1": "Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url",
11-
"#2": "IMPORTANT: DATABASE_URL *must* define the server version",
11+
"#2": "IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml",
1212
"#3": "",
1313
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
1414
"#5": "DATABASE_URL=\"mysql://db_user:[email protected]:3306/db_name?serverVersion=5.7\"",

doctrine/doctrine-bundle/2.4/config/packages/doctrine.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
doctrine:
22
dbal:
3-
# IMPORTANT: DATABASE_URL *must* define the server version
43
url: '%env(resolve:DATABASE_URL)%'
4+
5+
# IMPORTANT: You MUST configure your server version,
6+
# either here or in the DATABASE_URL env var (see .env file)
7+
#server_version: '13'
58
orm:
69
auto_generate_proxy_classes: true
710
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware

doctrine/doctrine-bundle/2.4/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"env": {
1010
"#1": "Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url",
11-
"#2": "IMPORTANT: DATABASE_URL *must* define the server version",
11+
"#2": "IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml",
1212
"#3": "",
1313
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
1414
"#5": "DATABASE_URL=\"mysql://db_user:[email protected]:3306/db_name?serverVersion=5.7\"",

doctrine/doctrine-bundle/2.4/post-install.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
<bg=blue;fg=white> </>
44

55
* Modify your DATABASE_URL config in <fg=green>.env</>
6+
7+
* Configure the <fg=green>driver</> (postgresql) and
8+
<fg=green>server_version</> (13) in <fg=green>config/packages/doctrine.yaml</>

0 commit comments

Comments
 (0)