test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed the Oracle environment variables not getting set correctly under Cygwin. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ian Kelly 2010-12-03 00:54:39 +00:00
parent bb10a5ba79
commit cbf9d6e0bb
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
django/db/backends/oracle/base.py
View File

@ -6,16 +6,35 @@ Requires cx_Oracle: http://cx-oracle.sourceforge.net/
import datetime import datetime
import os
import sys import sys
import time import time
from decimal import Decimal from decimal import Decimal
# Oracle takes client-side character set encoding from the environment.
os.environ['NLS_LANG'] = '.UTF8' def _setup_environment(environ):
# This prevents unicode from getting mangled by getting encoded into the import platform
# potentially non-unicode database character set. # Cygwin requires some special voodoo to set the environment variables
os.environ['ORA_NCHAR_LITERAL_REPLACE'] = 'TRUE' # 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.
('NLS_LANG', '.UTF8'),
# This prevents unicode from getting mangled by getting encoded into the
# potentially non-unicode database character set.
('ORA_NCHAR_LITERAL_REPLACE', 'TRUE'),
])
try: try:
import cx_Oracle as Database import cx_Oracle as Database