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

svn at limb-project.com svn at limb-project.com
Fri Mar 21 16:44:08 MSK 2008


Author: svk
Date: 2008-03-21 16:44:08 +0300 (Fri, 21 Mar 2008)
New Revision: 6848
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6848

Modified:
   3.x/trunk/limb/dbal/src/drivers/lmbAuditDbConnection.class.php
   3.x/trunk/limb/dbal/src/drivers/lmbDbConnection.interface.php
   3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlConnection.class.php
   3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlStatement.class.php
   3.x/trunk/limb/dbal/src/drivers/oci/lmbOciConnection.class.php
   3.x/trunk/limb/dbal/src/drivers/oci/lmbOciStatement.class.php
   3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlConnection.class.php
   3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlStatement.class.php
   3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteConnection.class.php
   3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteStatement.class.php
Log:
-- executeStatement() in the lmbDbConnection interface introduced

Modified: 3.x/trunk/limb/dbal/src/drivers/lmbAuditDbConnection.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/lmbAuditDbConnection.class.php	2008-03-21 10:41:38 UTC (rev 6847)
+++ 3.x/trunk/limb/dbal/src/drivers/lmbAuditDbConnection.class.php	2008-03-21 13:44:08 UTC (rev 6848)
@@ -9,7 +9,7 @@
 lmb_require('limb/dbal/src/drivers/lmbDbConnection.interface.php');
 lmb_require('limb/core/src/lmbDecorator.class.php');
 
-lmbDecorator :: generate('lmbDbConnection', 'lmbDbConnectionDecorator');
+lmbDecorator :: generate(get_class(lmbToolkit::instance()->getDefaultDbConnection()), 'lmbDbConnectionDecorator');
 
 /**
  * class lmbAuditDbConnection.
@@ -24,18 +24,23 @@
   function execute($sql)
   {
     $info = array('query' => $sql);
-    
     $start_time = microtime(true);
-
     $res = parent :: execute($sql);
-    
     $info['time'] = round(microtime(true) - $start_time, 6);
-    
     $this->stats[] = $info;
-    
     return $res;
   }
   
+  function executeStatement($stmt)
+  {
+    $info = array('query' => get_class($stmt));
+    $start_time = microtime(true);
+    $res = parent :: executeStatement($stmt);
+    $info['time'] = round(microtime(true) - $start_time, 6);
+    $this->stats[] = $info;
+    return $res;
+  }
+  
   function newStatement($sql)
   {
     $statement = parent :: newStatement($sql);

Modified: 3.x/trunk/limb/dbal/src/drivers/lmbDbConnection.interface.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/lmbDbConnection.interface.php	2008-03-21 10:41:38 UTC (rev 6847)
+++ 3.x/trunk/limb/dbal/src/drivers/lmbDbConnection.interface.php	2008-03-21 13:44:08 UTC (rev 6848)
@@ -25,6 +25,7 @@
   function rollbackTransaction();
   function newStatement($sql);
   function execute($sql);
+  function executeStatement($stmt);
   function getTypeInfo();
   function getDatabaseInfo();
   function getSequenceValue($table, $colname);

Modified: 3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlConnection.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlConnection.class.php	2008-03-21 10:41:38 UTC (rev 6847)
+++ 3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlConnection.class.php	2008-03-21 13:44:08 UTC (rev 6848)
@@ -119,6 +119,11 @@
     }
     return $result;
   }
+  
+  function executeStatement($stmt)
+  {
+    return (bool) $this->execute($stmt->getSQL());
+  }
 
   function beginTransaction()
   {

Modified: 3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlStatement.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlStatement.class.php	2008-03-21 10:41:38 UTC (rev 6847)
+++ 3.x/trunk/limb/dbal/src/drivers/mysql/lmbMysqlStatement.class.php	2008-03-21 13:44:08 UTC (rev 6848)
@@ -192,7 +192,7 @@
 
   function execute()
   {
-    return (bool) $this->connection->execute($this->getSQL());
+    return $this->connection->executeStatement($this);
   }
 }
 

Modified: 3.x/trunk/limb/dbal/src/drivers/oci/lmbOciConnection.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/oci/lmbOciConnection.class.php	2008-03-21 10:41:38 UTC (rev 6847)
+++ 3.x/trunk/limb/dbal/src/drivers/oci/lmbOciConnection.class.php	2008-03-21 13:44:08 UTC (rev 6848)
@@ -133,6 +133,7 @@
 
   function executeStatement($stmt)
   {
+    $stmt = $stmt->getStatement();
     $result = oci_execute($stmt, $this->tstate);
     if($result === false)
       $this->_raiseError($stmt);

Modified: 3.x/trunk/limb/dbal/src/drivers/oci/lmbOciStatement.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/oci/lmbOciStatement.class.php	2008-03-21 10:41:38 UTC (rev 6847)
+++ 3.x/trunk/limb/dbal/src/drivers/oci/lmbOciStatement.class.php	2008-03-21 13:44:08 UTC (rev 6848)
@@ -106,7 +106,7 @@
 
   function execute()
   {
-    return $this->connection->executeStatement($this->getStatement());
+    return $this->connection->executeStatement($this);
   }
 
   function free()

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-21 10:41:38 UTC (rev 6847)
+++ 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlConnection.class.php	2008-03-21 13:44:08 UTC (rev 6848)
@@ -130,6 +130,11 @@
     }
     return $result;
   }
+  
+  function executeStatement($stmt)
+  {
+      return $this->execute($stmt->getSQL());
+  }
 
   function beginTransaction()
   {

Modified: 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlStatement.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlStatement.class.php	2008-03-21 10:41:38 UTC (rev 6847)
+++ 3.x/trunk/limb/dbal/src/drivers/pgsql/lmbPgsqlStatement.class.php	2008-03-21 13:44:08 UTC (rev 6848)
@@ -194,7 +194,7 @@
 
   function execute()
   {
-    return $this->connection->execute($this->getSQL());
+    return $this->connection->executeStatement($this);
   }
 }
 

Modified: 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteConnection.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteConnection.class.php	2008-03-21 10:41:38 UTC (rev 6847)
+++ 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteConnection.class.php	2008-03-21 13:44:08 UTC (rev 6848)
@@ -99,6 +99,11 @@
     return $result;
   }
 
+  function executeStatement($stmt)
+  {
+    return (bool)$this->execute($stmt->getSQL());      
+  }
+  
   function beginTransaction()
   {
     $this->execute('BEGIN');

Modified: 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteStatement.class.php
===================================================================
--- 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteStatement.class.php	2008-03-21 10:41:38 UTC (rev 6847)
+++ 3.x/trunk/limb/dbal/src/drivers/sqlite/lmbSqliteStatement.class.php	2008-03-21 13:44:08 UTC (rev 6848)
@@ -192,7 +192,7 @@
 
   function execute()
   {
-    return (bool)$this->connection->execute($this->getSQL());
+    return $this->connection->executeStatement($this);
   }
 }
 



More information about the limb-svn mailing list