summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJames Bennett <ubernostrum@gmail.com>2009-02-28 06:05:44 +0000
committerJames Bennett <ubernostrum@gmail.com>2009-02-28 06:05:44 +0000
commit9b5b2ee2f3f64bdd71faf7631498d0892a7dbba2 (patch)
tree7d9acb59e86edd7aad6ee3662d980dafc7b9e759 /docs
parent9b373d078942e23b1b5564996cf22d9e361450a3 (diff)
[1.0.X] Fixed #10377: Added clearer warning to database notes for cx_Oracle 5.0.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/databases.txt13
-rw-r--r--docs/topics/install.txt7
2 files changed, 13 insertions, 7 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index f544ef68f1..342d932f7f 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -333,10 +333,15 @@ version of SQLite.
Oracle notes
============
-Django supports `Oracle Database Server`_ versions 9i and higher. Oracle
-version 10g or later is required to use Django's ``regex`` and ``iregex`` query
-operators. You will also need a 4.X release of the `cx_Oracle`_ driver,
-version 4.3.1 or newer.
+Django supports `Oracle Database Server`_ versions 9i and
+higher. Oracle version 10g or later is required to use Django's
+``regex`` and ``iregex`` query operators. You will also need at least
+version 4.3.1 of the `cx_Oracle`_ Python driver.
+
+Note that due to a Unicode-corruption bug in ``cx_Oracle`` 5.0, that
+version of the driver should **not** be used with Django;
+``cx_Oracle`` 5.0.1 resolved this issue, so if you'd like to use a
+more recent ``cx_Oracle``, use version 5.0.1.
.. _`Oracle Database Server`: http://www.oracle.com/
.. _`cx_Oracle`: http://cx-oracle.sourceforge.net/
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index 7965b96834..413359943a 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -82,9 +82,10 @@ installed.
wrapper in the standard library, so you don't need to install anything extra
in that case.
-* If you're using Oracle, you'll need a 4.X release of cx_Oracle_, version
- 4.3.1 or higher. You will also want to read the database-specific notes for
- the :ref:`Oracle backend <oracle-notes>`.
+* If you're using Oracle, you'll need a copy of cx_Oracle_, but please
+ read the database-specific notes for the
+ :ref:`Oracle backend <oracle-notes>` for important information
+ regarding supported versions of both Oracle and ``cx_Oracle``.
If you plan to use Django's ``manage.py syncdb`` command to
automatically create database tables for your models, you'll need to