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

fixed 1779:Query class __str__ method should cast non string values, thanks Alan

Browse Source
This commit is contained in:
mdipierro
2013-11-18 15:41:32 -06:00
parent 8de6bff2fb
commit 6868ddeed5
2 changed files with 2 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.7.4-stable+timestamp.2013.11.18.15.36.55 Version 2.7.4-stable+timestamp.2013.11.18.15.40.40
gluon/dal.py
+1 -1
View File
@@ -10037,7 +10037,7 @@ class Query(object):
return '<Query %s>' % BaseAdapter.expand(self.db._adapter,self) return '<Query %s>' % BaseAdapter.expand(self.db._adapter,self)
def __str__(self): def __str__(self):
return self.db._adapter.expand(self) return str(self.db._adapter.expand(self))
def __and__(self, other): def __and__(self, other):
return Query(self.db,self.db._adapter.AND,self,other) return Query(self.db,self.db._adapter.AND,self,other)