[limb-svn] r6834 - 3.x/trunk/limb/dbal/src/drivers/mysql

[svn at limb-project.com]

Author: svk
Date: 2008-03-14 16:19:28 +0300 (Fri, 14 Mar 2008)
New Revision: 6834
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6834

Modified:
   3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlRecordSet.class.php
Log:
-- lmbMysqlRecordSet::count() fixed (fails for queries without FROM)

Modified: 3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlRecordSet.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlRecordSet.class.php	2008-03-12 17:33:04 UTC (rev 6833)
+++ 3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlRecordSet.class.php	2008-03-14 13:19:28 UTC (rev 6834)
@@ -134,7 +134,7 @@
 
   function count()
   {
-    if(!(preg_match("/^\s*SELECT\s+DISTINCT/is", $this->query) || preg_match('/\s+GROUP\s+BY\s+/is',$this->query)))
+    if(!(preg_match("/^\s*SELECT\s+DISTINCT/is", $this->query) || preg_match('/\s+GROUP\s+BY\s+/is',$this->query)) && preg_match("/^\s*SELECT\s+.+\s+FROM\s+/Uis", $this->query))
     {
       $rewritesql = preg_replace('/^\s*SELECT\s.*\s+FROM\s/Uis','SELECT COUNT(*) FROM ', $this->query);
       $rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','', $rewritesql);