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

fixed issue 1246 with a nested select

Browse Source
This commit is contained in:
mdipierro
2013-04-06 09:38:16 -05:00
parent 6eea834777
commit 4a078705b3
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.5-stable+timestamp.2013.04.05.15.59.29 Version 2.4.5-stable+timestamp.2013.04.06.09.37.36
gluon/sqlhtml.py
+9 -7
View File
@@ -2121,13 +2121,15 @@ class SQLFORM(FORM):
if subquery: if subquery:
dbset = dbset(subquery) dbset = dbset(subquery)
try: try:
if left or groupby: if groupby:
if groupby: c = 'count(*)'
c = 'count(distinct %s)' % str(groupby) nrows = db.executesql(
else: 'select count(*) from (%s);' %
c = 'count(*)' dbset._select(c, left=left, cacheable=True,
nrows = dbset.select(c, left=left, cacheable=True, groupby=groupby)[:-1])[0][0]
groupby=groupby).first()[c] elif left:
c = 'count(*)'
nrows = dbset.select(c, left=left, cacheable=True).first()[c]
elif dbset._db._adapter.dbengine=='google:datastore': elif dbset._db._adapter.dbengine=='google:datastore':
#if we don't set a limit, this can timeout for a large table #if we don't set a limit, this can timeout for a large table
nrows = dbset.db._adapter.count(dbset.query, limit=1000) nrows = dbset.db._adapter.count(dbset.query, limit=1000)