Skip to content

Commit

Permalink
Merge branch '5.4' into 6.4
Browse files Browse the repository at this point in the history
* 5.4:
  Replace serverVersion example values with full version numbers
  • Loading branch information
javiereguiluz committed Jun 10, 2024
2 parents 8da0e89 + bd50a7e commit 802dc73
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions doctrine.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ The database connection information is stored as an environment variable called
# .env (or override DATABASE_URL in .env.local to avoid committing your changes)
# customize this line!
DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7"
DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=8.0.37"
# to use mariadb:
# Before doctrine/dbal < 3.7
Expand All @@ -53,7 +53,7 @@ The database connection information is stored as an environment variable called
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/app.db"
# to use postgresql:
# DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11&charset=utf8"
# DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=12.19 (Debian 12.19-1.pgdg120+1)&charset=utf8"
# to use oracle:
# DATABASE_URL="oci8://db_user:db_password@127.0.0.1:1521/db_name"
Expand All @@ -75,7 +75,7 @@ database for you:
$ php bin/console doctrine:database:create
There are more options in ``config/packages/doctrine.yaml`` that you can configure,
including your ``server_version`` (e.g. 5.7 if you're using MySQL 5.7), which may
including your ``server_version`` (e.g. 8.0.37 if you're using MySQL 8.0.37), which may
affect how Doctrine functions.

.. tip::
Expand Down
2 changes: 1 addition & 1 deletion doctrine/dbal.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Then configure the ``DATABASE_URL`` environment variable in ``.env``:
# .env (or override DATABASE_URL in .env.local to avoid committing your changes)
# customize this line!
DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7"
DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=8.0.37"
Further things can be configured in ``config/packages/doctrine.yaml`` - see
:ref:`reference-dbal-configuration`. Remove the ``orm`` key in that file
Expand Down
8 changes: 4 additions & 4 deletions reference/configuration/doctrine.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ The following block shows all possible configuration keys:
charset: utf8mb4
logging: '%kernel.debug%'
platform_service: App\DBAL\MyDatabasePlatformService
server_version: '5.7'
server_version: '8.0.37'
mapping_types:
enum: string
types:
Expand Down Expand Up @@ -91,7 +91,7 @@ The following block shows all possible configuration keys:
charset="utf8mb4"
logging="%kernel.debug%"
platform-service="App\DBAL\MyDatabasePlatformService"
server-version="5.7">
server-version="8.0.37">
<doctrine:option key="foo">bar</doctrine:option>
<doctrine:mapping-type name="enum">string</doctrine:mapping-type>
Expand Down Expand Up @@ -136,13 +136,13 @@ If you want to configure multiple connections in YAML, put them under the
user: root
password: null
host: localhost
server_version: '5.6'
server_version: '8.0.37'
customer:
dbname: customer
user: root
password: null
host: localhost
server_version: '5.7'
server_version: '8.2.0'
The ``database_connection`` service always refers to the *default* connection,
which is the first one defined or the one configured via the
Expand Down
4 changes: 2 additions & 2 deletions testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ need in your ``.env.test`` file:
# .env.test
# ...
DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name_test?serverVersion=5.7"
DATABASE_URL="mysql://db_user:db_password@127.0.0.1:3306/db_name_test?serverVersion=8.0.37"
In the test environment, these env files are read (if vars are duplicated
in them, files lower in the list override previous items):
Expand Down Expand Up @@ -341,7 +341,7 @@ env var:
.. code-block:: env
# .env.test.local
DATABASE_URL="mysql://USERNAME:PASSWORD@127.0.0.1:3306/DB_NAME?serverVersion=5.7"
DATABASE_URL="mysql://USERNAME:PASSWORD@127.0.0.1:3306/DB_NAME?serverVersion=8.0.37"
This assumes that each developer/machine uses a different database for the
tests. If the test set-up is the same on each machine, use the ``.env.test``
Expand Down

0 comments on commit 802dc73

Please sign in to comment.