Commit 57e5ccbc authored by Ian Kelly's avatar Ian Kelly
Browse files

[1.2.X] Fixed the Oracle environment variables not getting set correctly under Cygwin.

Backport of r14781 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent f8d01450
Loading
Loading
Loading
Loading
+25 −6
Original line number Diff line number Diff line
@@ -6,16 +6,35 @@ Requires cx_Oracle: http://cx-oracle.sourceforge.net/


import datetime
import os
import sys
import time
from decimal import Decimal


def _setup_environment(environ):
    import platform
    # Cygwin requires some special voodoo to set the environment variables
    # properly so that Oracle will see them.
    if platform.system().upper().startswith('CYGWIN'):
        try:
            import ctypes
        except ImportError:
            raise ImportError("ctypes not found. The Oracle backend requires ctypes to operate correctly under Cygwin.")
        kernel32 = ctypes.CDLL('kernel32')
        for name, value in environ:
            kernel32.SetEnvironmentVariableA(name, value)
    else:
        import os
        os.environ.update(environ)

_setup_environment([
    # Oracle takes client-side character set encoding from the environment.
os.environ['NLS_LANG'] = '.UTF8'
    ('NLS_LANG', '.UTF8'),
    # This prevents unicode from getting mangled by getting encoded into the
    # potentially non-unicode database character set.
os.environ['ORA_NCHAR_LITERAL_REPLACE'] = 'TRUE'
    ('ORA_NCHAR_LITERAL_REPLACE', 'TRUE'),
])


try:
    import cx_Oracle as Database