p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Oracle backend failure in test suite for modeltests.queries. Item.objects.all()[0:0] was optimizing out the limits clause and returning all rows. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Matt Boersma 2008-07-24 20:11:37 +00:00
parent f5801e5fd1
commit 96d141dfda
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/db/backends/oracle/query.py
View File

@ -87,9 +87,11 @@ def query_class(QueryClass, Database):
If 'with_limits' is False, any limit/offset information is not If 'with_limits' is False, any limit/offset information is not
included in the query. included in the query.
""" """
# The `do_offset` flag indicates whether we need to construct # The `do_offset` flag indicates whether we need to construct
# the SQL needed to use limit/offset w/Oracle. # the SQL needed to use limit/offset w/Oracle.
do_offset = with_limits and (self.high_mark or self.low_mark) do_offset = with_limits and (self.high_mark is not None
or self.low_mark)
# If no offsets, just return the result of the base class # If no offsets, just return the result of the base class
# `as_sql`. # `as_sql`.
@ -117,7 +119,7 @@ def query_class(QueryClass, Database):
# Getting the selection SQL and the params, which has the `rn` # Getting the selection SQL and the params, which has the `rn`
# extra selection SQL. # extra selection SQL.
self.extra_select['rn'] = 'ROW_NUMBER() OVER (ORDER BY %s )' % rn_orderby self.extra_select['rn'] = 'ROW_NUMBER() OVER (ORDER BY %s )' % rn_orderby
sql, params= super(OracleQuery, self).as_sql(with_limits=False, sql, params = super(OracleQuery, self).as_sql(with_limits=False,
with_col_aliases=True) with_col_aliases=True)
# Constructing the result SQL, using the initial select SQL # Constructing the result SQL, using the initial select SQL
@ -126,7 +128,7 @@ def query_class(QueryClass, Database):
# Place WHERE condition on `rn` for the desired range. # Place WHERE condition on `rn` for the desired range.
result.append('WHERE rn > %d' % self.low_mark) result.append('WHERE rn > %d' % self.low_mark)
if self.high_mark: if self.high_mark is not None:
result.append('AND rn <= %d' % self.high_mark) result.append('AND rn <= %d' % self.high_mark)
# Returning the SQL w/params. # Returning the SQL w/params.
@ -148,4 +150,3 @@ def query_class(QueryClass, Database):
_classes[QueryClass] = OracleQuery _classes[QueryClass] = OracleQuery
return OracleQuery return OracleQuery