Skip to content

Commit

Permalink
SHARE-92 Hotfix db connection
Browse files Browse the repository at this point in the history
  • Loading branch information
HCrane committed May 28, 2019
1 parent bae6cd8 commit 1d807d7
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

Proposed new version number: `2.1.1`. Urgently to be merged into `master` as a hotfix.
### Fixed
- Fixes a problem in db connection with `server_version` in `doctrine.yml`([Source])
## [2.1.0]
### Added
- Program Owner now visible on small devices too.
Expand Down Expand Up @@ -36,5 +38,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Follow Icon gets positioned correctly again.
- Color of text in search field is adjusted for "Luna & Cat"

[Source]: https://github.com/doctrine/DoctrineBundle/issues/351
[Unreleased]: https://github.com/Catrobat/Catroweb-Symfony/compare/v2.1.0...HEAD
[2.1.0]: https://github.com/olivierlacan/keep-a-changelog/releases/tag/v2.1.0
13 changes: 7 additions & 6 deletions config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ parameters:

doctrine:
dbal:
driver: "%database_driver%"
host: "%database_host%"
port: "%database_port%"
dbname: "%database_name%"
user: "%database_user%"
password: "%database_password%"
server_version: "%database_server_v%"
driver: "%database_driver%"
host: "%database_host%"
port: "%database_port%"
dbname: "%database_name%"
user: "%database_user%"
password: "%database_password%"
charset: utf8mb4
default_table_options:
charset: utf8mb4
Expand Down
1 change: 1 addition & 0 deletions config/packages/parameters.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ parameters:
database_name: symfony
database_user: root
database_password: ~
database_server_v: 10.1

locale: en
secret: ThisTokenIsNotSoSecretChangeIt
Expand Down

0 comments on commit 1d807d7

Please sign in to comment.