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

fixed(?) count(*) problem in grid

Browse Source
This commit is contained in:
mdipierro
2013-08-07 04:14:18 -05:00
parent db9ff09ae7
commit 90069aacda
4 changed files with 8 additions and 3 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.06.17.14.00 Version 2.6.0-development+timestamp.2013.08.07.04.13.27
applications/admin/static/plugin_jqmobile/jquery.mobile-1.2.0.min.css
Vendored
+2
View File
File diff suppressed because one or more lines are too long
applications/admin/static/plugin_jqmobile/jquery.mobile-1.2.0.min.js
Vendored
+2
View File
File diff suppressed because one or more lines are too long
gluon/sqlhtml.py
+3 -2
View File
@@ -1834,11 +1834,12 @@ class SQLFORM(FORM):
## if it's not an integer ## if it's not an integer
if cache_count is None or isinstance(cache_count, tuple): if cache_count is None or isinstance(cache_count, tuple):
if groupby: if groupby:
c = 'count(*)' c = 'count(*) _tmp'
nrows = db.executesql( nrows = db.executesql(
'select count(*) from (%s);' % 'select count(*) from (%s);' %
dbset._select(c, left=left, cacheable=True, dbset._select(c, left=left, cacheable=True,
groupby=groupby, cache=cache_count)[:-1])[0][0] groupby=groupby,
cache=cache_count)[:-1])[0][0]
elif left: elif left:
c = 'count(*)' c = 'count(*)'
nrows = dbset.select(c, left=left, cacheable=True, cache=cache_count).first()[c] nrows = dbset.select(c, left=left, cacheable=True, cache=cache_count).first()[c]