summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMads Jensen <mje@inducks.org>2017-01-16 17:28:30 +0100
committerTim Graham <timograham@gmail.com>2017-01-16 13:23:20 -0500
commit65e321b78161d83db408504290edbfbace267233 (patch)
treeac1b8cdec2f750cf0f14991f829c81a73b12837e /django
parent0f46bc67e26d439517bb0d0cb474c72859e76b60 (diff)
Refs #25809 -- Made a few late review comments for BrinIndex.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/postgres/indexes.py6
-rw-r--r--django/db/models/indexes.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/django/contrib/postgres/indexes.py b/django/contrib/postgres/indexes.py
index 897fbc1f57..185ea7435c 100644
--- a/django/contrib/postgres/indexes.py
+++ b/django/contrib/postgres/indexes.py
@@ -9,10 +9,10 @@ class BrinIndex(Index):
suffix = 'brin'
def __init__(self, fields=[], name=None, pages_per_range=None):
- if pages_per_range is not None and not (isinstance(pages_per_range, int) and pages_per_range > 0):
- raise ValueError('pages_per_range must be None or a positive integer for BRIN indexes')
+ if pages_per_range is not None and pages_per_range <= 0:
+ raise ValueError('pages_per_range must be None or a positive integer')
self.pages_per_range = pages_per_range
- return super(BrinIndex, self).__init__(fields, name)
+ super(BrinIndex, self).__init__(fields, name)
def __repr__(self):
if self.pages_per_range is not None:
diff --git a/django/db/models/indexes.py b/django/db/models/indexes.py
index 35f84f37de..5922131292 100644
--- a/django/db/models/indexes.py
+++ b/django/db/models/indexes.py
@@ -60,9 +60,9 @@ class Index(object):
'extra': tablespace_sql,
}
- def create_sql(self, model, schema_editor, using='', parameters=None):
+ def create_sql(self, model, schema_editor, using=''):
sql_create_index = schema_editor.sql_create_index
- sql_parameters = parameters or self.get_sql_create_template_values(model, schema_editor, using)
+ sql_parameters = self.get_sql_create_template_values(model, schema_editor, using)
return sql_create_index % sql_parameters
def remove_sql(self, model, schema_editor):