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

Fix for orderby_on_limitby with Table aliases

Browse Source
This commit is contained in:
Fran Boon
2014-01-07 22:36:22 +00:00
parent 8ba8eb58ed
commit d5f04551f2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/dal.py
+4 -3
View File
@@ -1799,8 +1799,8 @@ class BaseAdapter(ConnectionPool):
sql_o += ' ORDER BY %s' % self.expand(orderby) sql_o += ' ORDER BY %s' % self.expand(orderby)
if (limitby and not groupby and tablenames and orderby_on_limitby and not orderby): if (limitby and not groupby and tablenames and orderby_on_limitby and not orderby):
sql_o += ' ORDER BY %s' % ', '.join( sql_o += ' ORDER BY %s' % ', '.join(
[self.db[t][x].sqlsafe for t in tablenames for x in ( [self.db[t].sqlsafe + '.' + self.db[t][x].sqlsafe_name for t in tablenames for x in (
hasattr(self.db[t],'_primarykey') and self.db[t]._primarykey hasattr(self.db[t], '_primarykey') and self.db[t]._primarykey
or ['_id'] or ['_id']
) )
] ]
@@ -10129,7 +10129,8 @@ class Field(Expression):
@property @property
def sqlsafe(self): def sqlsafe(self):
if self._table: if self._table:
return self._table.sqlsafe + '.' + (self._rname or self._db._adapter.sqlsafe_field(self.name)) return self._table.sqlsafe + '.' + \
(self._rname or self._db._adapter.sqlsafe_field(self.name))
return '<no table>.%s' % self.name return '<no table>.%s' % self.name
@property @property