diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2009-12-12 02:10:28 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2009-12-12 02:10:28 +0000 |
| commit | c88113683d6538dbc2f779ff57fd1ea20211abec (patch) | |
| tree | 48756d324a15b8d1d990855ad3249f607a81ebf5 /django/db/backends/oracle/base.py | |
| parent | 353e0797920fbf5170653c9a9aabe2572a5ad214 (diff) | |
| download | django-c88113683d6538dbc2f779ff57fd1ea20211abec.tar.gz | |
[soc2009/multidb] Merged up to trunk r11810. There are many conflicts in this merge, these will be resolved in a subsequent commit.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/backends/oracle/base.py')
| -rw-r--r-- | django/db/backends/oracle/base.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index cc85685e5b..dd085008a2 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -357,7 +357,11 @@ class DatabaseWrapper(BaseDatabaseWrapper): cursor = None if not self._valid_connection(): conn_string = convert_unicode(self._connect_string()) +<<<<<<< HEAD:django/db/backends/oracle/base.py self.connection = Database.connect(conn_string, **self.settings_dict['OPTIONS']) +======= + self.connection = Database.connect(conn_string, **self.settings_dict['DATABASE_OPTIONS']) +>>>>>>> master:django/db/backends/oracle/base.py cursor = FormatStylePlaceholderCursor(self.connection) # Set oracle date to ansi date format. This only needs to execute # once when we create a new connection. We also set the Territory |