[limb-svn] r6833 - 3.x/trunk/limb/dbal/src/drivers/pgsql

[svn at limb-project.com]

Author: svk
Date: 2008-03-12 20:33:04 +0300 (Wed, 12 Mar 2008)
New Revision: 6833
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6833

Modified:
   3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlRecordSet.class.php
Log:
-- lmbPgsqlRecordSet::count() fixed

Modified: 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlRecordSet.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlRecordSet.class.php	2008-03-12 14:13:09 UTC (rev 6832)
+++ 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlRecordSet.class.php	2008-03-12 17:33:04 UTC (rev 6833)
@@ -131,7 +131,7 @@
 
   function count()
   {
-    if(!(preg_match("/^\s*SELECT\s+DISTINCT/is", $this->query) || preg_match('/\s+GROUP\s+BY\s+/is',$this->query)) && stripos($this->query, 'from') !== false)
+    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);