summaryrefslogtreecommitdiff
path: root/docs/ref/models
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2021-09-22 11:57:54 +0200
committerGitHub <noreply@github.com>2021-09-22 11:57:54 +0200
commit221b2f85febcf68629fc3a4007dc7edb5a305b91 (patch)
treedc9c8a156758abb9f468ea31ccc627a584ebb208 /docs/ref/models
parent2f144323756fc6f8517e357c540f3570356d9eba (diff)
Fixed #33129 -- Dropped support for MariaDB 10.2.
Diffstat (limited to 'docs/ref/models')
-rw-r--r--docs/ref/models/fields.txt5
-rw-r--r--docs/ref/models/querysets.txt2
2 files changed, 3 insertions, 4 deletions
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 3b20e9a595..73c0560374 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -1196,9 +1196,8 @@ A field for storing JSON encoded data. In Python the data is represented in its
Python native format: dictionaries, lists, strings, numbers, booleans and
``None``.
-``JSONField`` is supported on MariaDB 10.2.7+, MySQL 5.7.8+, Oracle,
-PostgreSQL, and SQLite (with the :ref:`JSON1 extension enabled
-<sqlite-json1>`).
+``JSONField`` is supported on MariaDB, MySQL 5.7.8+, Oracle, PostgreSQL, and
+SQLite (with the :ref:`JSON1 extension enabled <sqlite-json1>`).
.. attribute:: JSONField.encoder
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 3a90eee179..f5bc3b8cb6 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -1793,7 +1793,7 @@ them::
<QuerySet [<Person: ...)>, ...]>
The ``postgresql``, ``oracle``, and ``mysql`` database backends support
-``select_for_update()``. However, MariaDB 10.3+ only supports the ``nowait``
+``select_for_update()``. However, MariaDB only supports the ``nowait``
argument, MariaDB 10.6+ also supports the ``skip_locked`` argument, and MySQL
8.0.1+ supports the ``nowait``, ``skip_locked``, and ``of`` arguments. The
``no_key`` argument is only supported on PostgreSQL.