# HG changeset patch # User Mads Kiilerich # Date 2020-07-01 12:58:56 # Node ID 3c503044e9f12c8a6d0ea2ad317071f0b96a6ff3 # Parent 922808a6127471449c3262c98ed6d5f7624e11d3 mysql: bump sqlalchemy.url MariaDB/MySQL charset to to 'utf8mb4' to get full UTF-8 support The change in 210e76d69b62 only changed character_set_database, as shown by output after: --- a/kallithea/model/base.py +++ b/kallithea/model/base.py @@ -46,3 +46,8 @@ def init_model(engine): engine_str = obfuscate_url_pw(str(engine.url)) log.info("initializing db for %s", engine_str) meta.Base.metadata.bind = engine + + meta.Session.configure(bind=engine) + for a, b in meta.Session().execute('''show variables''').fetchall(): + if 'character_set_' in a: + print(a, repr(b)) Before, with charset=utf8, the utf8mb3 charset was used all the way through the stack: [kallithea.model.base] initializing db for mysql://kallithea-test:XXXXX@localhost/kallithea-test?charset=utf8 character_set_client 'utf8' character_set_connection 'utf8' character_set_database 'utf8mb4' character_set_filesystem 'binary' character_set_results 'utf8' character_set_server 'latin1' character_set_system 'utf8' With explicit charset=utf8mb4: [kallithea.model.base] initializing db for mysql://kallithea-test:XXXXX@localhost/kallithea-test?charset=utf8mb4 character_set_client 'utf8mb4' character_set_connection 'utf8mb4' character_set_database 'utf8mb4' character_set_filesystem 'binary' character_set_results 'utf8mb4' character_set_server 'latin1' character_set_system 'utf8' diff --git a/development.ini b/development.ini --- a/development.ini +++ b/development.ini @@ -361,7 +361,7 @@ logview.pylons.util = #eee sqlalchemy.url = sqlite:///%(here)s/kallithea.db?timeout=60 #sqlalchemy.url = postgresql://kallithea:password@localhost/kallithea -#sqlalchemy.url = mysql://kallithea:password@localhost/kallithea?charset=utf8 +#sqlalchemy.url = mysql://kallithea:password@localhost/kallithea?charset=utf8mb4 ## Note: the mysql:// prefix should also be used for MariaDB sqlalchemy.pool_recycle = 3600 diff --git a/docs/contributing.rst b/docs/contributing.rst --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -101,7 +101,7 @@ Tests can be run on PostgreSQL like:: Tests can be run on MariaDB/MySQL like:: echo "GRANT ALL PRIVILEGES ON \`kallithea-test\`.* TO 'kallithea-test'@'localhost' IDENTIFIED BY 'password'" | sudo -u mysql mysql - TEST_DB='mysql://kallithea-test:password@localhost/kallithea-test?charset=utf8' py.test + TEST_DB='mysql://kallithea-test:password@localhost/kallithea-test?charset=utf8mb4' py.test You can also use ``tox`` to run the tests with all supported Python versions. diff --git a/kallithea/lib/paster_commands/template.ini.mako b/kallithea/lib/paster_commands/template.ini.mako --- a/kallithea/lib/paster_commands/template.ini.mako +++ b/kallithea/lib/paster_commands/template.ini.mako @@ -463,9 +463,9 @@ sqlalchemy.url = postgresql://kallithea: #sqlalchemy.url = postgresql://kallithea:password@localhost/kallithea %endif %if database_engine == 'mysql': -sqlalchemy.url = mysql://kallithea:password@localhost/kallithea?charset=utf8 +sqlalchemy.url = mysql://kallithea:password@localhost/kallithea?charset=utf8mb4 %else: -#sqlalchemy.url = mysql://kallithea:password@localhost/kallithea?charset=utf8 +#sqlalchemy.url = mysql://kallithea:password@localhost/kallithea?charset=utf8mb4 %endif <%text>## Note: the mysql:// prefix should also be used for MariaDB