dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no more removal of ORDER BY in MSSQL

Browse Source
This commit is contained in:
mdipierro
2013-08-01 02:49:27 -05:00
parent a2566ef7ab
commit df4d8a5238
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.08.01.01.59.18 Version 2.6.0-development+timestamp.2013.08.01.02.48.50
gluon/dal.py
+3 -8
View File
@@ -1676,10 +1676,9 @@ class BaseAdapter(ConnectionPool):
sql_o += ' ORDER BY %s' % self.RANDOM() sql_o += ' ORDER BY %s' % self.RANDOM()
else: else:
sql_o += ' ORDER BY %s' % self.expand(orderby) sql_o += ' ORDER BY %s' % self.expand(orderby)
if limitby: if (limitby and not groupby and tablenames and orderby_on_limitby):
if orderby_on_limitby and not orderby and tablenames: sql_o += ' ORDER BY %s' % ', '.join(['%s.%s'%(t,x) for t in tablenames for x in (hasattr(self.db[t],'_primarykey') and self.db[t]._primarykey or [self.db[t]._id.name])])
sql_o += ' ORDER BY %s' % ', '.join(['%s.%s'%(t,x) for t in tablenames for x in (hasattr(self.db[t],'_primarykey') and self.db[t]._primarykey or [self.db[t]._id.name])]) # oracle does not support limitby
# oracle does not support limitby
sql = self.select_limitby(sql_s, sql_f, sql_t, sql_w, sql_o, limitby) sql = self.select_limitby(sql_s, sql_f, sql_t, sql_w, sql_o, limitby)
if for_update and self.can_select_for_update is True: if for_update and self.can_select_for_update is True:
sql = sql.rstrip(';') + ' FOR UPDATE;' sql = sql.rstrip(';') + ' FOR UPDATE;'
@@ -3173,10 +3172,6 @@ class MSSQLAdapter(BaseAdapter):
if limitby: if limitby:
(lmin, lmax) = limitby (lmin, lmax) = limitby
sql_s += ' TOP %i' % lmax sql_s += ' TOP %i' % lmax
if 'GROUP BY' in sql_o:
orderfound = sql_o.find('ORDER BY ')
if orderfound >= 0:
sql_o = sql_o[:orderfound]
return 'SELECT %s %s FROM %s%s%s;' % (sql_s, sql_f, sql_t, sql_w, sql_o) return 'SELECT %s %s FROM %s%s%s;' % (sql_s, sql_f, sql_t, sql_w, sql_o)
TRUE = 1 TRUE = 1