##// END OF EJS Templates
mysql: bump sqlalchemy.url MariaDB/MySQL charset to to 'utf8mb4' to get full UTF-8 support...
Mads Kiilerich -
r8342:3c503044 default
parent child Browse files
Show More
@@ -361,7 +361,7 b' logview.pylons.util = #eee'
361
361
362 sqlalchemy.url = sqlite:///%(here)s/kallithea.db?timeout=60
362 sqlalchemy.url = sqlite:///%(here)s/kallithea.db?timeout=60
363 #sqlalchemy.url = postgresql://kallithea:password@localhost/kallithea
363 #sqlalchemy.url = postgresql://kallithea:password@localhost/kallithea
364 #sqlalchemy.url = mysql://kallithea:password@localhost/kallithea?charset=utf8
364 #sqlalchemy.url = mysql://kallithea:password@localhost/kallithea?charset=utf8mb4
365 ## Note: the mysql:// prefix should also be used for MariaDB
365 ## Note: the mysql:// prefix should also be used for MariaDB
366
366
367 sqlalchemy.pool_recycle = 3600
367 sqlalchemy.pool_recycle = 3600
@@ -101,7 +101,7 b' Tests can be run on PostgreSQL like::'
101 Tests can be run on MariaDB/MySQL like::
101 Tests can be run on MariaDB/MySQL like::
102
102
103 echo "GRANT ALL PRIVILEGES ON \`kallithea-test\`.* TO 'kallithea-test'@'localhost' IDENTIFIED BY 'password'" | sudo -u mysql mysql
103 echo "GRANT ALL PRIVILEGES ON \`kallithea-test\`.* TO 'kallithea-test'@'localhost' IDENTIFIED BY 'password'" | sudo -u mysql mysql
104 TEST_DB='mysql://kallithea-test:password@localhost/kallithea-test?charset=utf8' py.test
104 TEST_DB='mysql://kallithea-test:password@localhost/kallithea-test?charset=utf8mb4' py.test
105
105
106 You can also use ``tox`` to run the tests with all supported Python versions.
106 You can also use ``tox`` to run the tests with all supported Python versions.
107
107
@@ -463,9 +463,9 b' sqlalchemy.url = postgresql://kallithea:'
463 #sqlalchemy.url = postgresql://kallithea:password@localhost/kallithea
463 #sqlalchemy.url = postgresql://kallithea:password@localhost/kallithea
464 %endif
464 %endif
465 %if database_engine == 'mysql':
465 %if database_engine == 'mysql':
466 sqlalchemy.url = mysql://kallithea:password@localhost/kallithea?charset=utf8
466 sqlalchemy.url = mysql://kallithea:password@localhost/kallithea?charset=utf8mb4
467 %else:
467 %else:
468 #sqlalchemy.url = mysql://kallithea:password@localhost/kallithea?charset=utf8
468 #sqlalchemy.url = mysql://kallithea:password@localhost/kallithea?charset=utf8mb4
469 %endif
469 %endif
470 <%text>##</%text> Note: the mysql:// prefix should also be used for MariaDB
470 <%text>##</%text> Note: the mysql:// prefix should also be used for MariaDB
471
471
General Comments 0
You need to be logged in to leave comments. Login now