[limb-svn] r6801 - in 3.x/trunk/limb/dbal/src/drivers: mysql oci pgsql sqlite

[svn at limb-project.com]

Author: pachanga
Date: 2008-02-17 21:27:54 +0300 (Sun, 17 Feb 2008)
New Revision: 6801
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6801

Modified:
   3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlRecordSet.class.php
   3.x/trunk/limb/dbal/src/drivers/oci/lmbOciQueryStatement.class.php
   3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlRecordSet.class.php
   3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteRecordSet.class.php
Log:
-- imroving regular expression for 'order by' checks

Modified: 3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlRecordSet.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlRecordSet.class.php	2008-02-14 20:57:21 UTC (rev 6800)
+++ 3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlRecordSet.class.php	2008-02-17 18:27:54 UTC (rev 6801)
@@ -55,7 +55,7 @@
 
       if(is_array($this->sort_params))
       {
-        if(preg_match('~\s+ORDER\s+BY\s+~i', $query))
+        if(preg_match('~(?<=FROM).+\s+ORDER\s+BY\s+~i', $query))
           $query .= ',';
         else
           $query .= ' ORDER BY ';

Modified: 3.x/trunk/limb/dbal/src/drivers/oci/lmbOciQueryStatement.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/oci/lmbOciQueryStatement.class.php	2008-02-14 20:57:21 UTC (rev 6800)
+++ 3.x/trunk/limb/dbal/src/drivers/oci/lmbOciQueryStatement.class.php	2008-02-17 18:27:54 UTC (rev 6801)
@@ -46,7 +46,7 @@
 
   function addOrder($sort_params)
   {
-    if(preg_match('~\s+ORDER\s+BY\s+~i', $this->sql))
+    if(preg_match('~(?<=FROM).+\s+ORDER\s+BY\s+~i', $this->sql))
       $this->sql .= ',';
     else
       $this->sql .= ' ORDER BY ';

Modified: 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlRecordSet.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlRecordSet.class.php	2008-02-14 20:57:21 UTC (rev 6800)
+++ 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlRecordSet.class.php	2008-02-17 18:27:54 UTC (rev 6801)
@@ -54,7 +54,7 @@
 
       if(is_array($this->sort_params))
       {
-        if(preg_match('~\s+ORDER\s+BY\s+~i', $query))
+        if(preg_match('~(?<=FROM).+\s+ORDER\s+BY\s+~i', $query))
           $query .= ',';
         else
           $query .= ' ORDER BY ';

Modified: 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteRecordSet.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteRecordSet.class.php	2008-02-14 20:57:21 UTC (rev 6800)
+++ 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteRecordSet.class.php	2008-02-17 18:27:54 UTC (rev 6801)
@@ -52,7 +52,7 @@
 
       if(is_array($this->sort_params))
       {
-        if(preg_match('~\s+ORDER\s+BY\s+~i', $query))
+        if(preg_match('~(?<=FROM).+\s+ORDER\s+BY\s+~i', $query))
           $query .= ',';
         else
           $query .= ' ORDER BY ';