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

fixed string concatenation in MySQL

Browse Source
This commit is contained in:
mdipierro
2013-04-03 11:32:17 -05:00
parent e2191175da
commit 6b3cdb5a99
2 changed files with 4 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.4.5-stable+timestamp.2013.04.03.09.49.46 Version 2.4.5-stable+timestamp.2013.04.03.11.31.36
gluon/dal.py
+3
View File
@@ -2424,6 +2424,9 @@ class MySQLAdapter(BaseAdapter):
def EPOCH(self, first): def EPOCH(self, first):
return "UNIX_TIMESTAMP(%s)" % self.expand(first) return "UNIX_TIMESTAMP(%s)" % self.expand(first)
def CONCAT(self, *items):
return 'CONCAT(%s)' % ','.join(self.expand(x,'string') for x in items)
def REGEXP(self,first,second): def REGEXP(self,first,second):
return '(%s REGEXP %s)' % (self.expand(first), return '(%s REGEXP %s)' % (self.expand(first),
self.expand(second,'string')) self.expand(second,'string'))