From b4c83138e9daa0be301d1f18458609f003d19922 Mon Sep 17 00:00:00 2001 From: Ian Kelly Date: Mon, 18 Apr 2011 21:59:20 +0000 Subject: [PATCH] Fixed #15534: Made the Oracle runtime test for regex capabilities use the !DatabaseOperations connection instead of grabbing the default connection. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16041 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/backends/oracle/base.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index a477c8d974..dc70a1018c 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -258,9 +258,8 @@ WHEN (new.%(col_name)s IS NULL) def regex_lookup(self, lookup_type): # If regex_lookup is called before it's been initialized, then create # a cursor to initialize it and recur. - from django.db import connection - connection.cursor() - return connection.ops.regex_lookup(lookup_type) + self.connection.cursor() + return self.connection.ops.regex_lookup(lookup_type) def return_insert_id(self): return "RETURNING %s INTO %%s", (InsertIdVar(),)