Author: ikelly
Date: 2009-02-03 16:08:57 -0600 (Tue, 03 Feb 2009)
New Revision: 9812
Modified:
django/trunk/django/db/backends/oracle/base.py
Log:
Fixed #10125: fixed the Oracle dsn construction code that was broken in [9712].
Modified: django/trunk/django/db/backends/oracle/base.py
===================================================================
--- django/trunk/django/db/backends/oracle/base.py 2009-02-03 14:24:06 UTC
(rev 9811)
+++ django/trunk/django/db/backends/oracle/base.py 2009-02-03 22:08:57 UTC
(rev 9812)
@@ -253,9 +253,9 @@
if len(settings.DATABASE_HOST.strip()) == 0:
settings.DATABASE_HOST = 'localhost'
if len(settings.DATABASE_PORT.strip()) != 0:
- dsn = '%s:%s/%s' % (settings.DATABASE_HOST,
- settings.DATABASE_PORT,
- settings.DATABASE_NAME)
+ dsn = Database.makedsn(settings.DATABASE_HOST,
+ int(settings.DATABASE_PORT),
+ settings.DATABASE_NAME)
else:
dsn = settings.DATABASE_NAME
return "%s/%...@%s" % (settings.DATABASE_USER,
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
