Merge branch 'main' into fix/issue-6234-dictfield-html-parsing

auvipy · web-flow · commit ca1694562350 · 2026-04-13T06:52:21.000Z
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,6 +28,21 @@ jobs:
     name: Python ${{ matrix.python-version }}
     runs-on: ubuntu-24.04
 
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_DB: postgres
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
     strategy:
       matrix:
         python-version:
@@ -37,6 +52,9 @@ jobs:
         - '3.13'
         - '3.14'
 
+    env:
+      DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres
+
     steps:
     - uses: actions/checkout@v6
 
@@ -52,6 +70,9 @@ jobs:
     - name: Install dependencies
       run: python -m pip install --upgrade tox
 
+    - name: Create unaccent extension
+      run: PGPASSWORD=postgres psql -h localhost -U postgres -d postgres -c 'CREATE EXTENSION IF NOT EXISTS unaccent;'
+
     - name: Run tox targets for ${{ matrix.python-version }}
       run: tox run -f py$(echo ${{ matrix.python-version }} | tr -d . | cut -f 1 -d '-')
 
@@ -61,7 +82,7 @@ jobs:
         tox -e base,dist,docs
 
     - name: Upload coverage
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@v6
       with:
         env_vars: TOXENV,DJANGO
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -58,7 +58,7 @@ jobs:
           name: python-package-distributions
           path: dist/
       - name: Publish distribution 📦 to TestPyPI
-        uses: pypa/gh-action-pypi-publish@release/v1.13
+        uses: pypa/gh-action-pypi-publish@release/v1.14
         with:
           repository-url: https://test.pypi.org/legacy/
           skip-existing: true
@@ -81,7 +81,7 @@ jobs:
           name: python-package-distributions
           path: dist/
       - name: Publish distribution 📦 to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1.13
+        uses: pypa/gh-action-pypi-publish@release/v1.14
 
   github-release:
     name: >-
@@ -100,7 +100,7 @@ jobs:
           name: python-package-distributions
           path: dist/
       - name: Sign the dists with Sigstore
-        uses: sigstore/gh-action-sigstore-python@v3.2.0
+        uses: sigstore/gh-action-sigstore-python@v3.3.0
         with:
           inputs: >-
             ./dist/*.tar.gz
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,5 @@ coverage.*
 !.github
 !.gitignore
 !.pre-commit-config.yaml
+
+.idea
diff --git a/pyproject.toml b/pyproject.toml
@@ -44,6 +44,7 @@ dev = [
   { include-group = "test" },
 ]
 test = [
+  "dj-database-url>=3.1.0",
   "importlib-metadata<10.0",
   # Pytest for running the tests.
   "pytest==9.*",
@@ -68,7 +69,7 @@ optional = [
   "legacy-cgi; python_version>='3.13'",
   "markdown>=3.3.7",
   "psycopg[binary]>=3.1.8",
-  "pygments>=2.17,<2.20",
+  "pygments>=2.17,<2.21",
   "pyyaml>=5.3.1,<6.1",
   "requests",
   "uritemplate",
@@ -116,6 +117,9 @@ keep_full_version = true
 [tool.pytest.ini_options]
 addopts = "--tb=short --strict-markers -ra"
 testpaths = [ "tests" ]
+markers = [
+  "requires_postgres: marks tests as requiring a PostgreSQL database backend",
+]
 filterwarnings = [
   "ignore:'cgi' is deprecated:DeprecationWarning",
 ]
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
@@ -1680,18 +1680,24 @@ def __init__(self, **kwargs):
             self.validators.append(MinLengthValidator(self.min_length, message=message))
 
     def get_value(self, dictionary):
-        if self.field_name not in dictionary:
-            if getattr(self.root, 'partial', False):
-                return empty
         # We override the default field access in order to support
         # lists in HTML forms.
         if html.is_html_input(dictionary):
             val = dictionary.getlist(self.field_name, [])
             if len(val) > 0:
-                # Support QueryDict lists in HTML input.
+                # Support QueryDict lists and other list-like results in HTML input.
                 return val
+            # For partial updates, avoid calling parse_html_list unless indexed keys are present.
+            # This reduces unnecessary parsing overhead for omitted list fields.
+            if getattr(self.root, 'partial', False):
+                prefix = self.field_name + '['
+                if not any(key.startswith(prefix) for key in dictionary):
+                    return empty
             return html.parse_html_list(dictionary, prefix=self.field_name, default=empty)
 
+        # Non-HTML input: standard dictionary access
+        if self.field_name not in dictionary and getattr(self.root, 'partial', False):
+            return empty
         return dictionary.get(self.field_name, empty)
 
     def to_internal_value(self, data):
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,6 +1,8 @@
 import os
 
+import dj_database_url
 import django
+import pytest
 from django.core import management
 
 
@@ -13,19 +15,27 @@ def pytest_addoption(parser):
 def pytest_configure(config):
     from django.conf import settings
 
-    settings.configure(
-        DEBUG_PROPAGATE_EXCEPTIONS=True,
-        DEFAULT_AUTO_FIELD="django.db.models.AutoField",
-        DATABASES={
+    if os.getenv('DATABASE_URL'):
+        databases = {
+            'default': dj_database_url.config(),
+            'secondary': dj_database_url.config(),
+        }
+    else:
+        databases = {
             'default': {
                 'ENGINE': 'django.db.backends.sqlite3',
                 'NAME': ':memory:'
             },
             'secondary': {
                 'ENGINE': 'django.db.backends.sqlite3',
                 'NAME': ':memory:'
-            }
-        },
+            },
+        }
+
+    settings.configure(
+        DEBUG_PROPAGATE_EXCEPTIONS=True,
+        DEFAULT_AUTO_FIELD="django.db.models.AutoField",
+        DATABASES=databases,
         SITE_ID=1,
         SECRET_KEY='not very secret in tests',
         USE_I18N=True,
@@ -65,6 +75,12 @@ def pytest_configure(config):
         ),
     )
 
+    # Add django.contrib.postgres when using a PostgreSQL database
+    if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql':
+        settings.INSTALLED_APPS += (
+            'django.contrib.postgres',
+        )
+
     # guardian is optional
     try:
         import guardian  # NOQA
@@ -91,3 +107,13 @@ def pytest_configure(config):
 
     if config.getoption('--staticfiles'):
         management.call_command('collectstatic', verbosity=0, interactive=False)
+
+
+def pytest_collection_modifyitems(config, items):
+    from django.conf import settings
+
+    if settings.DATABASES['default']['ENGINE'] != 'django.db.backends.postgresql':
+        skip_postgres = pytest.mark.skip(reason='Requires PostgreSQL database backend')
+        for item in items:
+            if 'requires_postgres' in item.keywords:
+                item.add_marker(skip_postgres)
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -576,6 +576,67 @@ class TestSerializer(serializers.Serializer):
         assert serializer.is_valid()
         assert serializer.validated_data == {'scores': ['']}
 
+    def test_partial_update_with_indexed_keys(self):
+        """
+        Regression test for indexed HTML form keys with partial=True.
+        When data is passed as `colors[0]=#ffffff&colors[1]=#000000`
+        with partial=True, the field should parse indexed keys correctly.
+        """
+        class TestSerializer(serializers.Serializer):
+            colors = serializers.ListField(
+                allow_null=True,
+                child=serializers.CharField(max_length=7),
+                required=False
+            )
+            name = serializers.CharField(max_length=100, required=False)
+
+        serializer = TestSerializer(
+            data=QueryDict('colors[0]=#ffffff&colors[1]=#000000'),
+            partial=True
+        )
+        assert serializer.is_valid()
+        assert serializer.validated_data == {'colors': ['#ffffff', '#000000']}
+
+    def test_partial_update_omitted_list_field(self):
+        """
+        When a ListField is omitted in a partial update (and there are no
+        indexed keys for it), the field should be skipped and not included in
+        the validated data.
+        """
+        class TestSerializer(serializers.Serializer):
+            colors = serializers.ListField(
+                child=serializers.CharField(max_length=7),
+                required=False
+            )
+            name = serializers.CharField(max_length=100)
+
+        # colors is omitted, only name is provided
+        serializer = TestSerializer(
+            data=QueryDict('name=Test'),
+            partial=True
+        )
+        assert serializer.is_valid()
+        assert serializer.validated_data == {'name': 'Test'}
+        assert 'colors' not in serializer.validated_data
+
+    def test_partial_update_indexed_keys_ordering(self):
+        """
+        Indexed keys should preserve the correct order even when
+        they appear out of order in the QueryDict.
+        """
+        class TestSerializer(serializers.Serializer):
+            items = serializers.ListField(
+                child=serializers.IntegerField(),
+                required=False
+            )
+
+        serializer = TestSerializer(
+            data=QueryDict('items[2]=3&items[0]=1&items[1]=2'),
+            partial=True
+        )
+        assert serializer.is_valid()
+        assert serializer.validated_data == {'items': [1, 2, 3]}
+
 
 class TestCreateOnlyDefault:
     def setup_method(self):
diff --git a/tests/test_filters.py b/tests/test_filters.py
@@ -291,6 +291,109 @@ class SearchListView(generics.ListAPIView):
         ]
 
 
+@pytest.mark.requires_postgres
+class SearchFilterFullTextTests(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        SearchFilterModel.objects.create(title='The quick brown fox', text='jumps over the lazy dog')
+        SearchFilterModel.objects.create(title='The slow brown turtle', text='crawls under the fence')
+        SearchFilterModel.objects.create(title='A bright sunny day', text='in the park with friends')
+
+    def test_full_text_search_single_term(self):
+        class SearchListView(generics.ListAPIView):
+            queryset = SearchFilterModel.objects.all()
+            serializer_class = SearchFilterSerializer
+            filter_backends = (filters.SearchFilter,)
+            search_fields = ('@title',)
+
+        view = SearchListView.as_view()
+        request = factory.get('/', {'search': 'fox'})
+        response = view(request)
+        assert len(response.data) == 1
+        assert response.data[0]['title'] == 'The quick brown fox'
+
+    def test_full_text_search_multiple_results(self):
+        class SearchListView(generics.ListAPIView):
+            queryset = SearchFilterModel.objects.all()
+            serializer_class = SearchFilterSerializer
+            filter_backends = (filters.SearchFilter,)
+            search_fields = ('@title',)
+
+        view = SearchListView.as_view()
+        request = factory.get('/', {'search': 'brown'})
+        response = view(request)
+        assert len(response.data) == 2
+        titles = {item['title'] for item in response.data}
+        assert titles == {'The quick brown fox', 'The slow brown turtle'}
+
+    def test_full_text_search_no_results(self):
+        class SearchListView(generics.ListAPIView):
+            queryset = SearchFilterModel.objects.all()
+            serializer_class = SearchFilterSerializer
+            filter_backends = (filters.SearchFilter,)
+            search_fields = ('@title',)
+
+        view = SearchListView.as_view()
+        request = factory.get('/', {'search': 'elephant'})
+        response = view(request)
+        assert len(response.data) == 0
+
+    def test_full_text_search_multiple_fields(self):
+        class SearchListView(generics.ListAPIView):
+            queryset = SearchFilterModel.objects.all()
+            serializer_class = SearchFilterSerializer
+            filter_backends = (filters.SearchFilter,)
+            search_fields = ('@title', '@text')
+
+        view = SearchListView.as_view()
+        request = factory.get('/', {'search': 'lazy'})
+        response = view(request)
+        assert len(response.data) == 1
+        assert response.data[0]['title'] == 'The quick brown fox'
+
+    def test_full_text_search_stemming(self):
+        """Full text search should match stemmed words (e.g. 'jumping' matches 'jumps')."""
+        class SearchListView(generics.ListAPIView):
+            queryset = SearchFilterModel.objects.all()
+            serializer_class = SearchFilterSerializer
+            filter_backends = (filters.SearchFilter,)
+            search_fields = ('@text',)
+
+        view = SearchListView.as_view()
+        request = factory.get('/', {'search': 'jumping'})
+        response = view(request)
+        assert len(response.data) == 1
+        assert response.data[0]['text'] == 'jumps over the lazy dog'
+
+    def test_full_text_search_multiple_terms(self):
+        """Each search term must match (AND semantics across terms)."""
+        class SearchListView(generics.ListAPIView):
+            queryset = SearchFilterModel.objects.all()
+            serializer_class = SearchFilterSerializer
+            filter_backends = (filters.SearchFilter,)
+            search_fields = ('@title', '@text')
+
+        view = SearchListView.as_view()
+        request = factory.get('/', {'search': 'brown lazy'})
+        response = view(request)
+        assert len(response.data) == 1
+        assert response.data[0]['title'] == 'The quick brown fox'
+
+    def test_full_text_search_mixed_with_icontains(self):
+        """Full text search fields can be mixed with regular icontains fields."""
+        class SearchListView(generics.ListAPIView):
+            queryset = SearchFilterModel.objects.all()
+            serializer_class = SearchFilterSerializer
+            filter_backends = (filters.SearchFilter,)
+            search_fields = ('@title', 'text')
+
+        view = SearchListView.as_view()
+        request = factory.get('/', {'search': 'park'})
+        response = view(request)
+        assert len(response.data) == 1
+        assert response.data[0]['title'] == 'A bright sunny day'
+
+
 class AttributeModel(models.Model):
     label = models.CharField(max_length=32)
 
@@ -339,6 +442,10 @@ def test_custom_lookup_to_related_model(self):
         assert 'attribute__label__icontains' == filter_.construct_search('attribute__label', SearchFilterModelFk._meta)
         assert 'attribute__label__iendswith' == filter_.construct_search('attribute__label__iendswith', SearchFilterModelFk._meta)
 
+    def test_construct_search_with_at_prefix(self):
+        filter_ = filters.SearchFilter()
+        assert 'title__search' == filter_.construct_search('@title', SearchFilterModelFk._meta)
+
 
 class SearchFilterModelM2M(models.Model):
     title = models.CharField(max_length=20)
diff --git a/tests/test_serializer_lists.py b/tests/test_serializer_lists.py
