adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix compliancy with more elaborate ORDER syntax, such as "DESC NULLS FIRST" in postgresql, in DboSource::order()

Browse source
This commit is contained in:
Dieter Plaetinck 2010-02-24 10:48:36 +01:00 committed by José Lorenzo Rodríguez
parent bed4027d37
commit a79ff508a6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/model/datasources/dbo_source.php
View file

@ -2333,9 +2333,9 @@ class DboSource extends DataSource {
continue; continue;
} }
if (preg_match('/\\x20ASC|\\x20DESC/i', $key, $_dir)) { if (preg_match('/\\x20(ASC|DESC).*/i', $key, $_dir)) {
$dir = $_dir[0]; $dir = $_dir[0];
$key = preg_replace('/\\x20ASC|\\x20DESC/i', '', $key); $key = preg_replace('/\\x20(ASC|DESC).*/i', '', $key);
} }
if (strpos($key, '.')) { if (strpos($key, '.')) {