SQLite should use utf8, not utf8mb4

diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml
index 3111da4771aaf5cab9d1cb40a804385a170e47bd..5f2e25bb9bb13ebe021a6e3ca6c00a7d11f51e6b 100644 (file)
--- a/app/config/parameters_test.yml
+++ b/app/config/parameters_test.yml
@@ -6,4 +6,4 @@ parameters:
     test_database_user: null
     test_database_password: null
     test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite'
-    test_database_charset: utf8mb4
+    test_database_charset: utf8

diff --git a/docs/en/user/parameters.rst b/docs/en/user/parameters.rst
index c4345b74ae6163fc849ef8e08edad6dd499af098..2fca020efbee549f1de1fccf270d44de467b4507 100644 (file)
--- a/docs/en/user/parameters.rst
+++ b/docs/en/user/parameters.rst
@@ -11,8 +11,8 @@ What is the meaning of the parameters?
    "database_password", "~", "password of that user"
    "database_path", "``""%kernel.root_dir%/../data/db/wallabag.sqlite""``", "only for SQLite, define where to put the database file. Leave it for other database"
    "database_table_prefix", "wallabag_", "all wallabag's tables will be prefixed with that string. You can include a ``_`` for clarity"
-   "database_socket", "null", "If your database is using a socket instead of tcp, put the path of the socket (other connection parameters will then be ignored"
-   "database_charset", "utf8mb4", "For PostgreSQL you should use utf8, for other use utf8mb4 which handle emoji"
+   "database_socket", "null", "If your database is using a socket instead of tcp, put the path of the socket (other connection parameters will then be ignored)"
+   "database_charset", "utf8mb4", "For PostgreSQL & SQLite you should use utf8, for MySQL use utf8mb4 which handle emoji"
 
 .. csv-table:: Configuration to send emails from wallabag
    :header: "name", "default", "description"