From 6b3cdb5a9980cda8a49ccccd86796d9f20496cc9 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 3 Apr 2013 11:32:17 -0500 Subject: [PATCH] fixed string concatenation in MySQL --- VERSION | 2 +- gluon/dal.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1ce3eb84..47b5cd7e 100644 --- a/VERSION +++ b/VERSION @@ -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 diff --git a/gluon/dal.py b/gluon/dal.py index c96f04a9..46e395e7 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -2424,6 +2424,9 @@ class MySQLAdapter(BaseAdapter): def EPOCH(self, 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): return '(%s REGEXP %s)' % (self.expand(first), self.expand(second,'string'))