[limb-svn] r6839 - in 3.x/trunk/limb: active_record/src active_record/tests/cases dbal/src/drivers/pgsql

[svn at limb-project.com]

Author: svk
Date: 2008-03-15 11:57:44 +0300 (Sat, 15 Mar 2008)
New Revision: 6839
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6839

Modified:
   3.x/trunk/limb/active_record/src/lmbActiveRecord.class.php
   3.x/trunk/limb/active_record/tests/cases/lmbARBaseTestCase.class.php
   3.x/trunk/limb/active_record/tests/cases/lmbARDirtyTest.class.php
   3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlConnection.class.php
Log:
-- ActiveRecord::getInheritanceCondition fixed
-- ActiveRecord tests fixed (reconnect for pgsql)
-- isValid() method added to lmbPgsqlConnection

Modified: 3.x/trunk/limb/active_record/src/lmbActiveRecord.class.php
===================================================================
--- 3.x/trunk/limb/active_record/src/lmbActiveRecord.class.php	2008-03-14 16:16:22 UTC (rev 6838)
+++ 3.x/trunk/limb/active_record/src/lmbActiveRecord.class.php	2008-03-15 08:57:44 UTC (rev 6839)
@@ -1613,7 +1613,7 @@
 
   function getInheritanceCondition()
   {
-    return ' LIKE "' . $this->_getInheritancePath() . '%"';
+    return " LIKE '" . $this->_getInheritancePath() . "%'";
   }
 
   protected function _getInheritancePath()

Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARBaseTestCase.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARBaseTestCase.class.php	2008-03-14 16:16:22 UTC (rev 6838)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARBaseTestCase.class.php	2008-03-15 08:57:44 UTC (rev 6839)
@@ -34,6 +34,13 @@
     $this->conn->disconnect();
 
     lmbToolkit :: restore();
+    
+    $connection = lmbToolkit :: instance() -> getDefaultDbConnection();
+    
+    if (method_exists($connection, 'isValid'))
+      if (!$connection->isValid())
+        $connection->connect();
+    
   }
 
   protected function _cleanUp()

Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARDirtyTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARDirtyTest.class.php	2008-03-14 16:16:22 UTC (rev 6838)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARDirtyTest.class.php	2008-03-15 08:57:44 UTC (rev 6839)
@@ -7,6 +7,7 @@
  * @license    LGPL http://www.gnu.org/copyleft/lesser.html
  */
 require_once(dirname(__FILE__) . '/lmbARValueObjectTest.class.php');
+require_once(dirname(__FILE__) . '/lmbActiveRecordTest.class.php');
 
 class lmbARDirtyTest extends lmbARBaseTestCase
 {

Modified: 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlConnection.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlConnection.class.php	2008-03-14 16:16:22 UTC (rev 6838)
+++ 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlConnection.class.php	2008-03-15 08:57:44 UTC (rev 6839)
@@ -206,6 +206,11 @@
     $seq = "{$table}_{$colname}_seq";
     return (int)$this->newStatement("SELECT currval('$seq')")->getOneValue();
   }
+  
+  function isValid()
+  {
+    return @pg_ping($this->getConnectionId());
+  }
 }