summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMads Jensen <mje@inducks.org>2017-08-25 23:54:36 +0200
committerTim Graham <timograham@gmail.com>2017-08-26 09:45:45 -0400
commitfb42d0247136249ea81962474e9a6a2faf1755f1 (patch)
tree251f64fcd23c7f8437ff661943ed85a24861d3fa
parent3c0b2b80edbe744f45b59fa29219db4997d2a108 (diff)
Refs #25809 -- Omitted pages_per_range from BrinIndex.deconstruct() if it's None.
-rw-r--r--django/contrib/postgres/indexes.py3
-rw-r--r--docs/releases/1.11.5.txt3
-rw-r--r--tests/postgres_tests/test_indexes.py2
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)