diff --git a/docs/setup.rst b/docs/setup.rst --- a/docs/setup.rst +++ b/docs/setup.rst @@ -24,7 +24,7 @@ Next, you need to create the databases u use PostgreSQL or SQLite (default). If you choose a database other than the default, ensure you properly adjust the database URL in your ``my.ini`` configuration file to use this other database. Kallithea currently supports -PostgreSQL, SQLite and MySQL databases. Create the database by running +PostgreSQL, SQLite and MariaDB/MySQL databases. Create the database by running the following command:: kallithea-cli db-create -c my.ini diff --git a/docs/upgrade.rst b/docs/upgrade.rst --- a/docs/upgrade.rst +++ b/docs/upgrade.rst @@ -51,7 +51,7 @@ file. If using PostgreSQL, please consult the documentation for the ``pg_dump`` utility. -If using MySQL, please consult the documentation for the ``mysqldump`` +If using MariaDB/MySQL, please consult the documentation for the ``mysqldump`` utility. Look for ``sqlalchemy.url`` in your configuration file to determine diff --git a/docs/usage/performance.rst b/docs/usage/performance.rst --- a/docs/usage/performance.rst +++ b/docs/usage/performance.rst @@ -40,7 +40,7 @@ SQLite is a good option when having a sm locking issues with SQLite, it is not recommended to use it for larger deployments. -Switching to MySQL or PostgreSQL will result in an immediate performance +Switching to PostgreSQL or MariaDB/MySQL will result in an immediate performance increase. A tool like SQLAlchemyGrate_ can be used for migrating to another database platform. 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,6 +463,7 @@ sqlalchemy.url = postgresql://user:pass@ %elif database_engine == 'mysql': <%text>## MySQL sqlalchemy.url = mysql://user:pass@localhost/kallithea?charset=utf8 +<%text>## Note: the mysql:// prefix should also be used for MariaDB %endif <%text>## see sqlalchemy docs for other backends