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

db(query)(other if cond else None).select()

Browse Source
This commit is contained in:
mdipierro
2013-05-04 10:24:26 -05:00
parent 9e46c3cbc4
commit d5bfaf83ee
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.6-stable+timestamp.2013.05.03.22.24.45 Version 2.4.6-stable+timestamp.2013.05.04.10.23.42
gluon/dal.py
+3 -1
View File
@@ -9744,7 +9744,9 @@ class Set(object):
return '<Set %s>' % BaseAdapter.expand(self.db._adapter,self.query) return '<Set %s>' % BaseAdapter.expand(self.db._adapter,self.query)
def __call__(self, query, ignore_common_filters=False): def __call__(self, query, ignore_common_filters=False):
if isinstance(query,Table): if query is None:
return self
elif isinstance(query,Table):
query = self.db._adapter.id_query(query) query = self.db._adapter.id_query(query)
elif isinstance(query,str): elif isinstance(query,str):
query = Expression(self.db,query) query = Expression(self.db,query)