Author: adrian
Date: 2011-04-17 13:45:06 -0700 (Sun, 17 Apr 2011)
New Revision: 16034
Modified:
django/trunk/django/conf/global_settings.py
django/trunk/django/conf/project_template/settings.py
django/trunk/docs/howto/initial-data.txt
django/trunk/docs/ref/settings.txt
django/trunk/docs/topics/install.txt
Log:
Fixed #15822 -- Removed references to the v1 postgresql backend (which has been
removed). Thanks for the patch, aaugustin
Modified: django/trunk/django/conf/global_settings.py
===================================================================
--- django/trunk/django/conf/global_settings.py 2011-04-17 14:27:53 UTC (rev
16033)
+++ django/trunk/django/conf/global_settings.py 2011-04-17 20:45:06 UTC (rev
16034)
@@ -143,7 +143,7 @@
# Database connection info.
# Legacy format
-DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'postgresql', 'mysql',
'sqlite3' or 'oracle'.
+DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'mysql', 'sqlite3' or
'oracle'.
DATABASE_NAME = '' # Or path to database file if using sqlite3.
DATABASE_USER = '' # Not used with sqlite3.
DATABASE_PASSWORD = '' # Not used with sqlite3.
Modified: django/trunk/django/conf/project_template/settings.py
===================================================================
--- django/trunk/django/conf/project_template/settings.py 2011-04-17
14:27:53 UTC (rev 16033)
+++ django/trunk/django/conf/project_template/settings.py 2011-04-17
20:45:06 UTC (rev 16034)
@@ -11,7 +11,7 @@
DATABASES = {
'default': {
- 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2',
'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+ 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql',
'sqlite3' or 'oracle'.
'NAME': '', # Or path to database file if using
sqlite3.
'USER': '', # Not used with sqlite3.
'PASSWORD': '', # Not used with sqlite3.
Modified: django/trunk/docs/howto/initial-data.txt
===================================================================
--- django/trunk/docs/howto/initial-data.txt 2011-04-17 14:27:53 UTC (rev
16033)
+++ django/trunk/docs/howto/initial-data.txt 2011-04-17 20:45:06 UTC (rev
16034)
@@ -136,18 +136,18 @@
----------------------------------
There's also a hook for backend-specific SQL data. For example, you
-can have separate initial-data files for PostgreSQL and MySQL. For
+can have separate initial-data files for PostgreSQL and SQLite. For
each app, Django looks for a file called
``<appname>/sql/<modelname>.<backend>.sql``, where ``<appname>`` is
your app directory, ``<modelname>`` is the model's name in lowercase
and ``<backend>`` is the last part of the module name provided for the
:setting:`ENGINE` in your settings file (e.g., if you have defined a
database with an :setting:`ENGINE` value of
-``django.db.backends.postgresql``, Django will look for
-``<appname>/sql/<modelname>.postgresql.sql``).
+``django.db.backends.sqlite3``, Django will look for
+``<appname>/sql/<modelname>.sqlite3.sql``).
Backend-specific SQL data is executed before non-backend-specific SQL
data. For example, if your app contains the files ``sql/person.sql``
-and ``sql/person.postgresql.sql`` and you're installing the app on
-PostgreSQL, Django will execute the contents of
-``sql/person.postgresql.sql`` first, then ``sql/person.sql``.
+and ``sql/person.sqlite3.sql`` and you're installing the app on
+SQLite, Django will execute the contents of
+``sql/person.sqlite.sql`` first, then ``sql/person.sql``.
Modified: django/trunk/docs/ref/settings.txt
===================================================================
--- django/trunk/docs/ref/settings.txt 2011-04-17 14:27:53 UTC (rev 16033)
+++ django/trunk/docs/ref/settings.txt 2011-04-17 20:45:06 UTC (rev 16034)
@@ -394,7 +394,6 @@
The database backend to use. The built-in database backends are:
* ``'django.db.backends.postgresql_psycopg2'``
- * ``'django.db.backends.postgresql'``
* ``'django.db.backends.mysql'``
* ``'django.db.backends.sqlite3'``
* ``'django.db.backends.oracle'``
@@ -498,8 +497,8 @@
string is passed directly through to the database, so its format is
backend-specific.
-Supported for the PostgreSQL_ (``postgresql``, ``postgresql_psycopg2``) and
-MySQL_ (``mysql``) backends.
+Supported for the PostgreSQL_ (``postgresql_psycopg2``) and MySQL_ (``mysql``)
+backends.
.. _PostgreSQL: http://www.postgresql.org/docs/8.2/static/multibyte.html
.. _MySQL: http://dev.mysql.com/doc/refman/5.0/en/charset-database.html
Modified: django/trunk/docs/topics/install.txt
===================================================================
--- django/trunk/docs/topics/install.txt 2011-04-17 14:27:53 UTC (rev
16033)
+++ django/trunk/docs/topics/install.txt 2011-04-17 20:45:06 UTC (rev
16034)
@@ -92,9 +92,7 @@
In addition to a database backend, you'll need to make sure your Python
database bindings are installed.
-* If you're using PostgreSQL, you'll need the psycopg_ package. Django supports
- both version 1 and 2. (When you configure Django's database layer, specify
- either ``postgresql`` [for version 1] or ``postgresql_psycopg2`` [for
version 2].)
+* If you're using PostgreSQL, you'll need the ``postgresql_psycopg2`` package.
You might want to refer to our :ref:`PostgreSQL notes <postgresql-notes>` for
further technical details specific to this database.
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
