diff options
author | Claude Paroz <claude@2xlibre.net> | 2012-12-18 09:56:30 +0100 |
---|---|---|
committer | Claude Paroz <claude@2xlibre.net> | 2012-12-18 09:56:30 +0100 |
commit | 55972ee5c799c75f2d3a320a46297076aaae614a (patch) | |
tree | 59b5dfc8f35e29e42553440e4b529a9a9b41255a /django/db/backends/postgresql_psycopg2/creation.py | |
parent | c64b57d16688025b2d48668d5c4cb9eda7484612 (diff) | |
download | django-55972ee5c799c75f2d3a320a46297076aaae614a.tar.gz |
Fixed #19441 -- Created PostgreSQL varchar index when unique=True
Thanks Dylan Verheul for the report and Anssi Kääriäinen for the
review.
Diffstat (limited to 'django/db/backends/postgresql_psycopg2/creation.py')
-rw-r--r-- | django/db/backends/postgresql_psycopg2/creation.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/django/db/backends/postgresql_psycopg2/creation.py b/django/db/backends/postgresql_psycopg2/creation.py index ca389b9046..90304aa566 100644 --- a/django/db/backends/postgresql_psycopg2/creation.py +++ b/django/db/backends/postgresql_psycopg2/creation.py @@ -41,7 +41,8 @@ class DatabaseCreation(BaseDatabaseCreation): return '' def sql_indexes_for_field(self, model, f, style): - if f.db_index and not f.unique: + output = [] + if f.db_index: qn = self.connection.ops.quote_name db_table = model._meta.db_table tablespace = f.db_tablespace or model._meta.db_tablespace @@ -60,7 +61,8 @@ class DatabaseCreation(BaseDatabaseCreation): "(%s%s)" % (style.SQL_FIELD(qn(f.column)), opclass) + "%s;" % tablespace_sql) - output = [get_index_sql('%s_%s' % (db_table, f.column))] + if not f.unique: + output = [get_index_sql('%s_%s' % (db_table, f.column))] # Fields with database column types of `varchar` and `text` need # a second index that specifies their operator class, which is @@ -73,8 +75,6 @@ class DatabaseCreation(BaseDatabaseCreation): elif db_type.startswith('text'): output.append(get_index_sql('%s_%s_like' % (db_table, f.column), ' text_pattern_ops')) - else: - output = [] return output def set_autocommit(self): |