Modify CONCAT() arguments, because + operator requires them to be of type varchar (#1488505)

With SQL Server 2012 we can use just CONCAT(), but we need to support older versions
pull/13/head
Aleksander Machniak 13 years ago
parent 1d5606617e
commit 46b6c5475b

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
- Fix SQL query for contacts listing on MS SQL Server (#1488505)
- Update to TinyMCE 3.5.2
- Fix window.resize handler on IE8 and Opera (#1488453)
- Don't let error message popups cover the login form (#1488500)

@ -691,6 +691,11 @@ class rcube_mdb2
case 'mssql':
case 'sqlsrv':
$delim = ' + ';
// Modify arguments, because + operator requires them to be of type varchar (#1488505)
// with SQL Server 2012 we can use just CONCAT(), but we need to support older versions
foreach ($args as $idx => $arg) {
$args[$idx] = "CAST($arg AS varchar)";
}
break;
default:
$delim = ' || ';

Loading…
Cancel
Save