From a125a1c9b646368702bb14f26c1a6b09cff3e5a0 Mon Sep 17 00:00:00 2001 From: Justin Bronn Date: Sun, 27 Apr 2008 17:41:42 +0000 Subject: [PATCH] gis: Forgot to include Oracle `relate` patch with the other qsrf changes. git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7483 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/gis/db/backend/oracle/query.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/django/contrib/gis/db/backend/oracle/query.py b/django/contrib/gis/db/backend/oracle/query.py index f1841e0fc0..d4cd3669e2 100644 --- a/django/contrib/gis/db/backend/oracle/query.py +++ b/django/contrib/gis/db/backend/oracle/query.py @@ -56,9 +56,10 @@ class SDORelate(SpatialFunction): masks = 'TOUCH|OVERLAPBDYDISJOINT|OVERLAPBDYINTERSECT|EQUAL|INSIDE|COVEREDBY|CONTAINS|COVERS|ANYINTERACT|ON' mask_regex = re.compile(r'^(%s)(\+(%s))*$' % (masks, masks), re.I) def __init__(self, mask): + func = 'SDO_RELATE' if not self.mask_regex.match(mask): - raise ValueError('Invalid %s mask: "%s"' % (self.lookup, mask)) - super(SDORelate, self).__init__('SDO_RELATE', end_subst=", 'mask=%s') = 'TRUE'" % mask) + raise ValueError('Invalid %s mask: "%s"' % (func, mask)) + super(SDORelate, self).__init__(func, end_subst=", 'mask=%s') = 'TRUE'" % mask) #### Lookup type mapping dictionaries of Oracle spatial operations ####