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

db().select(....) no longer ignores common_filters, issue 893

Browse Source
This commit is contained in:
mdipierro
2012-07-15 18:06:49 -05:00
parent 6f5648bbc2
commit e929659d64
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-07-15 17:32:22) dev Version 2.00.0 (2012-07-15 18:06:45) dev
gluon/dal.py
+2
View File
@@ -8310,6 +8310,8 @@ class Set(object):
return self.db._adapter.count(self.query,distinct) return self.db._adapter.count(self.query,distinct)
def select(self, *fields, **attributes): def select(self, *fields, **attributes):
if self.query is None:# and fields[0]._table._common_filter != None:
return self(fields[0]._table).select(*fields,**attributes)
adapter = self.db._adapter adapter = self.db._adapter
fields = adapter.expand_all(fields, adapter.tables(self.query)) fields = adapter.expand_all(fields, adapter.tables(self.query))
return adapter.select(self.query,fields,attributes) return adapter.select(self.query,fields,attributes)