p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #30242 -- Removed extra space before LIMIT/OFFSET SQL.

This commit is contained in:
Hang Park 2019-03-10 05:32:20 +09:00 committed by Mariusz Felisiak
parent a35bf4af72
commit 142e1ead76
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -325,6 +325,7 @@ answer newbie questions, and generally made Django that much better:
Guillaume Pannatier <guillaume.pannatier@gmail.com> Guillaume Pannatier <guillaume.pannatier@gmail.com>
Gustavo Picon Gustavo Picon
hambaloney hambaloney
Hang Park <hangpark@kaist.ac.kr>
Hannes Struß <x@hannesstruss.de> Hannes Struß <x@hannesstruss.de>
Hasan Ramezani <hasan.r67@gmail.com> Hasan Ramezani <hasan.r67@gmail.com>
Hawkeye Hawkeye

8
django/db/backends/base/operations.py
View File

@ -218,10 +218,10 @@ class BaseDatabaseOperations:
def limit_offset_sql(self, low_mark, high_mark): def limit_offset_sql(self, low_mark, high_mark):
"""Return LIMIT/OFFSET SQL clause.""" """Return LIMIT/OFFSET SQL clause."""
limit, offset = self._get_limit_offset_params(low_mark, high_mark) limit, offset = self._get_limit_offset_params(low_mark, high_mark)
return '%s%s' % ( return ' '.join(sql for sql in (
(' LIMIT %d' % limit) if limit else '', ('LIMIT %d' % limit) if limit else None,
(' OFFSET %d' % offset) if offset else '', ('OFFSET %d' % offset) if offset else None,
) ) if sql)
def last_executed_query(self, cursor, sql, params): def last_executed_query(self, cursor, sql, params):
""" """

8
django/db/backends/oracle/operations.py
View File

@ -249,10 +249,10 @@ END;
def limit_offset_sql(self, low_mark, high_mark): def limit_offset_sql(self, low_mark, high_mark):
fetch, offset = self._get_limit_offset_params(low_mark, high_mark) fetch, offset = self._get_limit_offset_params(low_mark, high_mark)
return '%s%s' % ( return ' '.join(sql for sql in (
(' OFFSET %d ROWS' % offset) if offset else '', ('OFFSET %d ROWS' % offset) if offset else None,
(' FETCH FIRST %d ROWS ONLY' % fetch) if fetch else '', ('FETCH FIRST %d ROWS ONLY' % fetch) if fetch else None,
) ) if sql)
def last_executed_query(self, cursor, sql, params): def last_executed_query(self, cursor, sql, params):
# https://cx-oracle.readthedocs.io/en/latest/cursor.html#Cursor.statement # https://cx-oracle.readthedocs.io/en/latest/cursor.html#Cursor.statement