boulder-oracle-sprint: Fixed Oracle limit-offset logic and many_to_one test

case.


git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4078 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/db/backends/oracle/base.py

@@ -143,15 +143,15 @@ def get_max_name_length():
 
 OPERATOR_MAPPING = {
     'exact': '= %s',
-    'iexact': 'LIKE %s',
-    'contains': 'LIKE %s',
-    'icontains': 'LIKE %s',
+    'iexact': "LIKE %s ESCAPE '\\'",
+    'contains': "LIKE %s ESCAPE '\\'",
+    'icontains': "LIKE %s ESCAPE '\\'",
     'gt': '> %s',
     'gte': '>= %s',
     'lt': '< %s',
     'lte': '<= %s',
-    'startswith': 'LIKE %s',
-    'endswith': 'LIKE %s',
-    'istartswith': 'LIKE %s',
-    'iendswith': 'LIKE %s',
+    'startswith': "LIKE %s ESCAPE '\\'",
+    'endswith': "LIKE %s ESCAPE '\\'",
+    'istartswith': "LIKE %s ESCAPE '\\'",
+    'iendswith': "LIKE %s ESCAPE '\\'",
 }

django/db/backends/oracle/query.py

@@ -53,6 +53,7 @@ def get_query_set_class(DefaultQuerySet):
             extra_select = self._select.items()
 
             full_query = None
+
             select, sql, params, full_query = self._get_sql_clause()
             if not full_query:
                 full_query = "SELECT %s%s\n%s" % \
@@ -170,10 +171,20 @@ def get_query_set_class(DefaultQuerySet):
                     (backend.quote_name(opts.db_table),
                     backend.quote_name(opts.fields[0].db_column or opts.fields[0].column))
             # limit_and_offset_clause
-            offset = self._offset and int(self._offset) or 0 
-            limit = self._limit and int(self._limit) or None 
+            if self._limit is None:
+                assert self._offset is None, "'offset' is not allowed without 'limit'"
+
+            if self._offset is not None:
+                offset = int(self._offset)
+            else:
+                offset = 0
+            if self._limit is not None:
+                limit = int(self._limit)
+            else:
+                limit = None
+
             limit_and_offset_clause = ''
-            if limit: 
+            if limit is not None:
                 limit_and_offset_clause = "WHERE rn > %s AND rn <= %s" % (offset, limit+offset)
             elif offset:
                 limit_and_offset_clause = "WHERE rn > %s" % (offset)

tests/modeltests/many_to_one/models.py

@@ -146,7 +146,7 @@ False
 
 # The underlying query only makes one join when a related table is referenced twice.
 >>> query = Article.objects.filter(reporter__first_name__exact='John', reporter__last_name__exact='Smith')
->>> null, sql, null = query._get_sql_clause()
+>>> null, sql, null, null = query._get_sql_clause()
 >>> sql.count('INNER JOIN')
 1