From 156cdcf92decdf18a87a1229ba4ef8da1e6972ab Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Tue, 23 Feb 2010 12:24:41 +0000
Subject: [PATCH] Fixed #12912 -- Placed the psycopg1-backed ``postgresql``
 database backend on the deprecation path.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12510 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/db/backends/postgresql/base.py |  6 ++++++
 docs/internals/deprecation.txt        |  3 +++
 docs/releases/1.2.txt                 | 12 ++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py
index 5681311a65..5352e9bff6 100644
--- a/django/db/backends/postgresql/base.py
+++ b/django/db/backends/postgresql/base.py
@@ -102,6 +102,12 @@ class DatabaseWrapper(BaseDatabaseWrapper):
     def __init__(self, *args, **kwargs):
         super(DatabaseWrapper, self).__init__(*args, **kwargs)
 
+        import warnings
+        warnings.warn(
+            'The ``postgres`` backend has been deprecated. Use ``postgres_psycopg2`` instead.',
+            PendingDeprecationWarning
+        )
+
         self.features = DatabaseFeatures()
         self.ops = DatabaseOperations(self)
         self.client = DatabaseClient(self)
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index a56b522278..2bfa54fb93 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -91,6 +91,9 @@ their deprecation, as per the :ref:`Django deprecation policy
           ``django.contrib.auth.context_processors.auth``.  This has been
           deprecated since the 1.2 release.
 
+        * The ``postgresql`` database backend has been deprecated in favor of
+          the ``postgresql_psycopg2`` backend.
+
     * 2.0
         * ``django.views.defaults.shortcut()``. This function has been moved
           to ``django.contrib.contenttypes.views.shortcut()`` as part of the
diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt
index 7dccffaa89..b952ec1f6c 100644
--- a/docs/releases/1.2.txt
+++ b/docs/releases/1.2.txt
@@ -305,6 +305,18 @@ created using ``decorator_from_middleware``.
 Features deprecated in 1.2
 ==========================
 
+``postgresql`` database backend
+-------------------------------
+
+The ``psycopg1`` library has not been updated since October 2005. As a
+result, the ``postgresql`` database backend, which depends on this
+library, has been deprecated.
+
+If you are currently using the ``postgresql`` backend, you should
+migrate to using the ``postgresql_psycopg2`` backend. To update your
+code, install the ``psycopg2`` library and change the
+``DATABASE_ENGINE`` setting to read ``postgresql_psycopg2``.
+
 CSRF response-rewriting middleware
 ----------------------------------