From f623516e107c8146f87d815f033cecb5d812466a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 24 Oct 2016 10:10:38 +0200 Subject: [PATCH] SQLite should use utf8, not utf8mb4 --- app/config/parameters_test.yml | 2 +- docs/en/user/parameters.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml index 3111da47..5f2e25bb 100644 --- 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 c4345b74..2fca020e 100644 --- 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" -- 2.41.0