From ae3896cb74d4bc42acaf6fade0d2a57e28045b2a Mon Sep 17 00:00:00 2001 From: Jason Pellerin Date: Fri, 8 Sep 2006 14:11:52 +0000 Subject: [PATCH] [multi-db] Minor documentation updates git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3738 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/__init__.py | 4 +++- docs/multiple_database_support.txt | 4 ++-- docs/settings.txt | 8 ++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/django/db/__init__.py b/django/db/__init__.py index ae6eca5e7d..22bb720dd4 100644 --- a/django/db/__init__.py +++ b/django/db/__init__.py @@ -221,7 +221,7 @@ class ConnectionInfoDescriptor(object): connections per instance, and always returns the same connection for an instance in particular thread during a particular request. - Any object that includes an attribute ``model`` that holds a model class + Any object that includes a ``model`` attribute that holds a model class can use this descriptor to manage connections. """ @@ -279,6 +279,7 @@ class LocalizingProxy: self.__kw = kw def __getattr__(self, attr): + # Private (__*) attributes are munged if attr.startswith('_LocalizingProxy'): return self.__dict__[attr] try: @@ -289,6 +290,7 @@ class LocalizingProxy: return getattr(getattr(self.__storage, self.__name), attr) def __setattr__(self, attr, val): + # Private (__*) attributes are munged if attr.startswith('_LocalizingProxy'): self.__dict__[attr] = val return diff --git a/docs/multiple_database_support.txt b/docs/multiple_database_support.txt index ce14957126..9b2e037230 100644 --- a/docs/multiple_database_support.txt +++ b/docs/multiple_database_support.txt @@ -69,8 +69,8 @@ Here's the example above, with ``MODELS``:: Accessing a model's connection ============================== -Each manager has a db attribute that can be used to access the model's -connection. Access the db attribute of a model's manager to obtain the +Each manager has a ``db`` attribute that can be used to access the model's +connection. Access the ``db`` attribute of a model's manager to obtain the model's currently configured connection. Example:: diff --git a/docs/settings.txt b/docs/settings.txt index b927b62ca7..fe2c566aee 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -587,6 +587,13 @@ locales have different formats. For example, U.S. English would say See `allowed date format strings`_. See also DATE_FORMAT, DATETIME_FORMAT, TIME_FORMAT and YEAR_MONTH_FORMAT. +OTHER_DATABASES +--------------- + +Default: ``{}`` + +Other database connections to use in addition to the default connection. See the `multiple database support docs`_. + PREPEND_WWW ----------- @@ -852,6 +859,7 @@ TIME_FORMAT and MONTH_DAY_FORMAT. .. _cache docs: http://www.djangoproject.com/documentation/cache/ .. _middleware docs: http://www.djangoproject.com/documentation/middleware/ +.. _muliple database support docs: http://www.djangoproject.com/documentation/multiple_database_support/ .. _session docs: http://www.djangoproject.com/documentation/sessions/ .. _See available choices: http://www.postgresql.org/docs/current/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE .. _template documentation: http://www.djangoproject.com/documentation/templates_python/