From b6c4766f53cf00bcf63cc2aa8be977c8589d083e Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 27 May 2019 19:59:49 +0200 Subject: Refs #29548 -- Updated docs for MariaDB support. --- docs/topics/db/tablespaces.txt | 2 +- docs/topics/install.txt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'docs/topics') diff --git a/docs/topics/db/tablespaces.txt b/docs/topics/db/tablespaces.txt index 4d7151fc55..3c167b2acb 100644 --- a/docs/topics/db/tablespaces.txt +++ b/docs/topics/db/tablespaces.txt @@ -69,7 +69,7 @@ stored in the model tablespace ``tables`` by default. The index for the Database support ================ -PostgreSQL and Oracle support tablespaces. SQLite and MySQL don't. +PostgreSQL and Oracle support tablespaces. SQLite, MariaDB and MySQL don't. When you use a backend that lacks support for tablespaces, Django ignores all tablespace-related options. diff --git a/docs/topics/install.txt b/docs/topics/install.txt index e947c2293a..3f58f5102e 100644 --- a/docs/topics/install.txt +++ b/docs/topics/install.txt @@ -69,8 +69,8 @@ Get your database running If you plan to use Django's database API functionality, you'll need to make sure a database server is running. Django supports many different database -servers and is officially supported with PostgreSQL_, MySQL_, Oracle_ and -SQLite_. +servers and is officially supported with PostgreSQL_, MariaDB_, MySQL_, Oracle_ +and SQLite_. If you are developing a simple project or something you don't plan to deploy in a production environment, SQLite is generally the simplest option as it @@ -89,7 +89,7 @@ database bindings are installed. * If you're using PostgreSQL, you'll need the `psycopg2`_ package. Refer to the :ref:`PostgreSQL notes ` for further details. -* If you're using MySQL, you'll need a :ref:`DB API driver +* If you're using MySQL or MariaDB, you'll need a :ref:`DB API driver ` like ``mysqlclient``. See :ref:`notes for the MySQL backend ` for details. @@ -116,6 +116,7 @@ If you're using Django's :doc:`testing framework` to test database queries, Django will need permission to create a test database. .. _PostgreSQL: https://www.postgresql.org/ +.. _MariaDB: https://mariadb.org/ .. _MySQL: https://www.mysql.com/ .. _psycopg2: http://initd.org/psycopg/ .. _SQLite: https://www.sqlite.org/ -- cgit v1.3