Changeset 6801

Timestamp:

12/01/07 13:23:49 (9 months ago)

Author:

ikelly

Message:

Fixed #6007: Added DEFAULT_TABLESPACE and DEFAULT_INDEX_TABLESPACE
options to global_settings.py

Files:

• django/trunk/django/conf/global_settings.py (modified) (1 diff)
• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/django/db/models/options.py (modified) (1 diff)
• django/trunk/docs/databases.txt (modified) (1 diff)
• django/trunk/docs/model-api.txt (modified) (1 diff)
• django/trunk/docs/settings.txt (modified) (1 diff)

django/trunk/django/conf/global_settings.py

@@ -254 +254 @@
-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 #

django/trunk/django/db/models/fields/__init__.py

@@ -105 +105 @@
-        self.help_text = help_text
-        self.db_column = db_column
-
+ or settings.DEFAULT_INDEX_TABLESPACE
-
-        # Set db_index to True if the field has a relationship and doesn't explicitly set db_index.

django/trunk/django/db/models/options.py

@@ -30 +30 @@
-        self.get_latest_by = None
-        self.order_with_respect_to = None
-None
+settings.DEFAULT_TABLESPACE
-        self.admin = None
-        self.meta = meta

django/trunk/docs/databases.txt

@@ -259 +259 @@
-it would be stored in the model tablespace ``tables`` by default.
-
+The settings.py file supports two additional options to specify
+default values for the db_tablespace options. This is useful for
+setting a tablespace for the Django internal apps and other
+contributed applications.  These options are ``DEFAULT_TABLESPACE``
+and ``DEFAULT_INDEX_TABLESPACE``.
+
-Django does not create the tablespaces for you. Please refer to `Oracle's
-documentation`_ for details on creating and managing tablespaces.

django/trunk/docs/model-api.txt

@@ -619 +619 @@
-
-The name of the database tablespace to use for this field's index, if
-
-
+
+
+
-option is ignored.
-

django/trunk/docs/settings.txt

@@ -404 +404 @@
-Default e-mail address to use for various automated correspondence from the
-site manager(s).
+
+DEFAULT_TABLESPACE
+------------------
+
+Default: ``''`` (Empty string)
+
+Default tablespace to use for models that do not specify one, if the
+backend supports it.
+
+DEFAULT_INDEX_TABLESPACE
+------------------------
+
+Default: ``''`` (Empty string)
+
+Default tablespace to use for indexes on fields that do not specify
+one, if the backend supports it.
-
-DISALLOWED_USER_AGENTS