baculum: Fix OFFSET parameter in PHP framework

Ticket in the PRADO framework GitHub project:

Support for OFFSET parameter without LIMIT clause in SQL query for TActiveRecord

https://github.com/pradosoft/prado/issues/819

diff --git a/gui/baculum/protected/vendor/pradosoft/prado/framework/Data/DataGateway/TSqlCriteria.php b/gui/baculum/protected/vendor/pradosoft/prado/framework/Data/DataGateway/TSqlCriteria.php
index 4d0acc220dadf02272d1933b34e60895a6afd598..07a20508a606d03ac248c6023838f4952fcb5b40 100644 (file)
--- a/gui/baculum/protected/vendor/pradosoft/prado/framework/Data/DataGateway/TSqlCriteria.php
+++ b/gui/baculum/protected/vendor/pradosoft/prado/framework/Data/DataGateway/TSqlCriteria.php
@@ -144,7 +144,7 @@ class TSqlCriteria extends \Prado\TComponent
                //    [LIMIT {[offset,] row_count | row_count OFFSET offset}]
                // See: http://dev.mysql.com/doc/refman/5.0/en/select.html
 
-               if (preg_match('/ORDER\s+BY\s+(.*?)(?=LIMIT)|ORDER\s+BY\s+(.*?)$/i', $value, $matches) > 0) {
+               if (preg_match('/ORDER\s+BY\s+(.*?)(?=\s+(?:LIMIT|OFFSET))|ORDER\s+BY\s+(.*?)$/i', $value, $matches) > 0) {
                        // condition contains ORDER BY
                        $value = str_replace($matches[0], '', $value);
                        if (strlen($matches[1]) > 0) {