From fb42d0247136249ea81962474e9a6a2faf1755f1 Mon Sep 17 00:00:00 2001 From: Mads Jensen Date: Fri, 25 Aug 2017 23:54:36 +0200 Subject: [PATCH] Refs #25809 -- Omitted pages_per_range from BrinIndex.deconstruct() if it's None. --- django/contrib/postgres/indexes.py | 3 ++- docs/releases/1.11.5.txt | 3 +++ tests/postgres_tests/test_indexes.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/django/contrib/postgres/indexes.py b/django/contrib/postgres/indexes.py index 5ece631829..1f7a01faf1 100644 --- a/django/contrib/postgres/indexes.py +++ b/django/contrib/postgres/indexes.py @@ -19,7 +19,8 @@ class BrinIndex(Index): def deconstruct(self): path, args, kwargs = super().deconstruct() - kwargs['pages_per_range'] = self.pages_per_range + if self.pages_per_range is not None: + kwargs['pages_per_range'] = self.pages_per_range return path, args, kwargs def create_sql(self, model, schema_editor, using=''): diff --git a/docs/releases/1.11.5.txt b/docs/releases/1.11.5.txt index baa327bc02..5716ad63c1 100644 --- a/docs/releases/1.11.5.txt +++ b/docs/releases/1.11.5.txt @@ -26,3 +26,6 @@ Bugfixes * Added POST request support to ``LogoutView``, for equivalence with the function-based ``logout()`` view (:ticket:`28513`). + +* Omitted ``pages_per_range`` from ``BrinIndex.deconstruct()`` if it's ``None`` + (:ticket:`25809`). diff --git a/tests/postgres_tests/test_indexes.py b/tests/postgres_tests/test_indexes.py index d866a8b869..ae4895a03e 100644 --- a/tests/postgres_tests/test_indexes.py +++ b/tests/postgres_tests/test_indexes.py @@ -33,7 +33,7 @@ class BrinIndexTests(PostgreSQLTestCase): path, args, kwargs = index.deconstruct() self.assertEqual(path, 'django.contrib.postgres.indexes.BrinIndex') self.assertEqual(args, ()) - self.assertEqual(kwargs, {'fields': ['title'], 'name': 'test_title_brin', 'pages_per_range': None}) + self.assertEqual(kwargs, {'fields': ['title'], 'name': 'test_title_brin'}) def test_deconstruction_with_pages_per_range(self): index = BrinIndex(fields=['title'], name='test_title_brin', pages_per_range=16)