diff options
| author | Ian Kelly <ian.g.kelly@gmail.com> | 2007-12-01 19:23:49 +0000 |
|---|---|---|
| committer | Ian Kelly <ian.g.kelly@gmail.com> | 2007-12-01 19:23:49 +0000 |
| commit | bbc3a955573c8e53dcc6d314ed1bd364a49d31b5 (patch) | |
| tree | 8d16fb06fa40c3e7467fe2307405590489c1bef0 /django | |
| parent | c5a4541f102014dadc5ac23e902933289abb1fe7 (diff) | |
Fixed #6007: Added DEFAULT_TABLESPACE and DEFAULT_INDEX_TABLESPACE
options to global_settings.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/conf/global_settings.py | 4 | ||||
| -rw-r--r-- | django/db/models/fields/__init__.py | 2 | ||||
| -rw-r--r-- | django/db/models/options.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 2853d6c618..837158a0a4 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -253,6 +253,10 @@ TRANSACTIONS_MANAGED = False from django import get_version URL_VALIDATOR_USER_AGENT = "Django/%s (http://www.djangoproject.com)" % get_version() +# The tablespaces to use for each model when not specified otherwise. +DEFAULT_TABLESPACE = '' +DEFAULT_INDEX_TABLESPACE = '' + ############## # MIDDLEWARE # ############## diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index ddf695816e..7eb57d96c9 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -104,7 +104,7 @@ class Field(object): self.radio_admin = radio_admin self.help_text = help_text self.db_column = db_column - self.db_tablespace = db_tablespace + self.db_tablespace = db_tablespace or settings.DEFAULT_INDEX_TABLESPACE # Set db_index to True if the field has a relationship and doesn't explicitly set db_index. self.db_index = db_index diff --git a/django/db/models/options.py b/django/db/models/options.py index 788d1c80de..23d9b04fe9 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -29,7 +29,7 @@ class Options(object): self.object_name, self.app_label = None, None self.get_latest_by = None self.order_with_respect_to = None - self.db_tablespace = None + self.db_tablespace = settings.DEFAULT_TABLESPACE self.admin = None self.meta = meta self.pk = None |