Fixed #27834 -- Added StrIndex database function.

2 files changed, 34 insertions, 1 deletions

diff --git a/docs/ref/models/database-functions.txt b/docs/ref/models/database-functions.txt
index 18d547d906..21b6f897ac 100644
--- a/docs/ref/models/database-functions.txt
+++ b/docs/ref/models/database-functions.txt
@@ -237,6 +237,38 @@ Usage example::
     ``Now()`` uses ``STATEMENT_TIMESTAMP`` instead. If you need the transaction
     timestamp, use :class:`django.contrib.postgres.functions.TransactionNow`.
 
+``StrIndex``
+============
+
+.. class:: StrIndex(expression, substring, **extra)
+
+.. versionadded:: 2.0
+
+Returns a positive integer corresponding to the 1-indexed position of the
+first occurrence of ``substring`` inside another string, or 0 if the substring
+is not found.
+
+Usage example::
+
+    >>> from django.db.models.functions import StrIndex
+    >>> Author.objects.create(name='Margaret Smith')
+    >>> Author.objects.create(name='Smith, Margaret')
+    >>> Author.objects.create(name='Margaret Jackson')
+    >>> authors = Author.objects.annotate(
+    ...     smith_index=StrIndex('name', 'Smith')).order_by('smith_index')
+    >>> authors.first().smith_index
+    0
+    >>> authors = Author.objects.annotate(
+    ...    smith_index=StrIndex('name', 'Smith')).filter(smith_index__gt=0)
+    <QuerySet [<Author: Margaret Smith>, <Author: Smith, Margaret>]>
+
+.. warning::
+
+    In MySQL, a database table's :ref:`collation<mysql-collation>` determines
+    whether string comparisons (such as the ``expression`` and ``substring`` of
+    this function) are case-sensitive. Comparisons are case-insensitive by
+    default.
+
 ``Substr``
 ==========
 
diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt
index 4592d8b76d..369a5893ba 100644
--- a/docs/releases/2.0.txt
+++ b/docs/releases/2.0.txt
@@ -170,7 +170,8 @@ Migrations
 Models
 ~~~~~~
 
-* ...
+* The new :class:`~django.db.models.functions.StrIndex` database function
+  finds the starting index of a string inside another string.
 
 Requests and Responses
 ~~~~~~~~~~~~~~~~~~~~~~