Fixed #29155 -- Fixed crash when database functions are used with pattern lookups.

Thanks Tim Graham and Sergey Fedoseev for reviews.

2 files changed, 18 insertions, 0 deletions

diff --git a/tests/lookup/models.py b/tests/lookup/models.py
index ef5e7dfb0e..3f1f14dfbc 100644
--- a/tests/lookup/models.py
+++ b/tests/lookup/models.py
@@ -17,6 +17,7 @@ class Alarm(models.Model):
 
 class Author(models.Model):
     name = models.CharField(max_length=100)
+    alias = models.CharField(max_length=50, null=True, blank=True)
 
     class Meta:
         ordering = ('name',)
diff --git a/tests/lookup/tests.py b/tests/lookup/tests.py
index 7d7216777c..785d3ea478 100644
--- a/tests/lookup/tests.py
+++ b/tests/lookup/tests.py
@@ -5,6 +5,7 @@ from operator import attrgetter
 
 from django.core.exceptions import FieldError
 from django.db import connection
+from django.db.models.functions import Substr
 from django.test import TestCase, skipUnlessDBFeature
 
 from .models import Article, Author, Game, Player, Season, Tag
@@ -878,3 +879,19 @@ class LookupTests(TestCase):
         season = Season.objects.create(year=2012, nulled_text_field=None)
         self.assertTrue(Season.objects.filter(pk=season.pk, nulled_text_field__isnull=True))
         self.assertTrue(Season.objects.filter(pk=season.pk, nulled_text_field=''))
+
+    def test_pattern_lookups_with_substr(self):
+        a = Author.objects.create(name='John Smith', alias='Johx')
+        b = Author.objects.create(name='Rhonda Simpson', alias='sonx')
+        tests = (
+            ('startswith', [a]),
+            ('istartswith', [a]),
+            ('contains', [a, b]),
+            ('icontains', [a, b]),
+            ('endswith', [b]),
+            ('iendswith', [b]),
+        )
+        for lookup, result in tests:
+            with self.subTest(lookup=lookup):
+                authors = Author.objects.filter(**{'name__%s' % lookup: Substr('alias', 1, 3)})
+                self.assertCountEqual(authors, result)