Changeset 20417

Timestamp:

10/02/08 01:00:33 (3 months ago)

Author:

nowelium

Message:

fix:procedure & transaction scripts

Location:

lang/php/misc/Hermit

Files:

• src/Hermit/HermitTransactionManager.php (modified) (1 diff)
• src/Hermit/command/HermitProcedureCommand.php (modified) (1 diff)
• src/Hermit/parameter/HermitMySqlProcedureParameter.php (added)
• src/Hermit/parameter/HermitProcedureParameter.php (modified) (1 diff)
• src/Hermit/resultset/HermitDefaultResultSet.php (modified) (1 diff)
• src/Hermit/resultset/HermitListResultSet.php (modified) (1 diff)
• src/Hermit/resultset/HermitMySqlProcedureResultSet.php (added)
• src/Hermit/resultset/HermitProcedureResultSet.php (modified) (2 diffs)
• src/Hermit/resultset/HermitProcedureResultSetFactory.php (added)
• src/Hermit/resultset/HermitResultSet.php (modified) (1 diff)
• src/Hermit/statement/HermitProcedureStatementBuilder.php (modified) (4 diffs)
• src/Hermit/tx/AbstractHermitTx.php (modified) (1 diff)
• src/Hermit/tx/HermitMandatoryTx.php (modified) (1 diff)
• src/Hermit/tx/HermitNeverTx.php (modified) (1 diff)
• src/Hermit/tx/HermitNotSupportedTxt.php (added)
• src/Hermit/tx/HermitRequiredTx.php (modified) (1 diff)
• src/Hermit/tx/HermitRequiresNewTx.php (modified) (1 diff)
• test/HermitProcedure_mysqlTest.php (moved) (moved from lang/php/misc/Hermit/test/HermtProcedure_mysqlTest.php)
• test/db_init.php (modified) (1 diff)

lang/php/misc/Hermit/src/Hermit/HermitTransactionManager.php

@@ -36 +36 @@
     public function createProxy(HermitProxy $proxy, $targetClass){
         $tx = self::get($targetClass);
+        $tx->resume(HermitDataSourceManager::get($targetClass));
         return new HermitCallableProxy($proxy, array($tx, 'proceed'));
     }

lang/php/misc/Hermit/src/Hermit/command/HermitProcedureCommand.php

@@ -26 +26 @@
         $stmt = $builder->build($pdo);
         $stmt->execute($parameters);
-        $rs = new HermitProcedureResultSet($stmt->getSqlParameter());
-        $rs->bindParameter($pdo, $parameters);
-        return $rs->create($stmt, $this->type);
+        $rs = HermitProcedureResultSetFactory::create($pdo, $stmt->getSqlParameter());
+        if($rs instanceof HermitParameterBind){
+            $rs->bindParameter($pdo, $parameters);
+        }
+        return $rs->execute($stmt, $this->type);
     }
 }

lang/php/misc/Hermit/src/Hermit/parameter/HermitProcedureParameter.php

@@ -5 +5 @@
  */
 class HermitProcedureParameter extends HermitSqlParameterHash {
-    private $info;
-    private $dbms;
-    private $outParams = array();
+    protected $info;
+    protected $dbms;
+    protected $outParams = array();
+    protected static $pdoTypes = array(
+        'boolean' => PDO::PARAM_BOOL,
+        'NULL' => PDO::PARAM_NULL,
+        'integer' => PDO::PARAM_INT,
+        'string' => PDO::PARAM_STR
+    );
     public function __construct(HermitProcedureInfo $info, $dbms){
         $this->info = $info;
         $this->dbms = $dbms;
     }
-    public function replace($key, $name, $defaultValue){
-        return call_user_func(array($this, 'replace_' . $this->dbms), $key, $name, $defaultValue);
-    }
-    public function replace_mysql($key, $name, $defaultValue){
-        if($this->info->typeofIn($name)){
-            $this->bindKeys[] = $name;
-            return ':' . $name;
-        }
-        if($this->info->typeofOut($name) || $this->info->typeofInOut($name)){
-            $this->bindKeys[] = $name;
-            $this->outParams[] = $name;
-            return '@' . $name;
-        }
-        throw new RuntimeException('unknown "' . $name . '" parameter');
-    }
-    public function bind(PDOStatement $stmt, $value){
-        return call_user_func(array($this, 'bind_' . $this->dbms), $stmt, $value);
-    }
-
-    public function bind_mysql(PDOStatement $stmt, $value){
-        $param = $value[0];
-        foreach($this->bindKeys as $index => $key){
-            $prefix = '';
-            if($this->info->typeofIn($key)){
-                $stmt->bindParam(':' . $key, $param->$key);
-            }
-        }
-    }
-
     public function getOutParameters(){
         return $this->outParams;
     }
-
+    public function replace($key, $name, $defaultValue){
+        $this->bindKeys[] = $name;
+        if($this->info->typeofOut($name) || $this->info->typeofInOut($name)){
+            $this->outParams[] = $name;
+        }
+        return ':' . $name;
+    }
+    public function bind(PDOStatement $stmt, $value){
+        $param = $value[0];
+        foreach($this->bindKeys as $index => $key){
+            $bindKey = ':' . $key;
+            if($this->info->typeofIn($key)){
+                $stmt->bindParam($bindKey, $param->$key);
+                continue;
+            }
+            $paramValue = $param->$key;
+            if(null === $paramValue){
+                $stmt->bindParam($bindKey, null, PDO::PARAM_NULL | PDO::PARAM_INPUT_OUTPUT);
+                continue;
+            }
+            $gettype = gettype($paramValue);
+            $paramType = -1;
+            if(isset(self::$pdoTypes[$gettype])){
+                $paramType = self::$pdoTypes[$gettype] | PDO::PARAM_INPUT_OUTPUT;
+            } else {
+                $paramType = PDO::PARAM_STR | PDO::PARAM_INPUT_OUTPUT;
+            }
+            $stmt->bindParam($bindKey, $paramValue, $paramType);
+        }
+    }
     public function hasBindParameters(){
-        return 'mysql' === $this->dbms && 0 < count($this->outParams);
+        return 0 < count($this->outParams);
     }
 }

lang/php/misc/Hermit/src/Hermit/resultset/HermitDefaultResultSet.php

@@ -5 +5 @@
  */
 class HermitDefaultResultSet implements HermitResultSet {
-    public function create(HermitStatement $stmt, HermitValueType $type){
+    public function execute(HermitStatement $stmt, HermitValueType $type){
         $type->apply($stmt);
         return $stmt->fetch();

lang/php/misc/Hermit/src/Hermit/resultset/HermitListResultSet.php

@@ -6 +6 @@
  */
 class HermitListResultSet implements HermitResultSet {
-    public function create(HermitStatement $stmt, HermitValueType $type){
+    public function execute(HermitStatement $stmt, HermitValueType $type){
         $type->apply($stmt);
         

lang/php/misc/Hermit/src/Hermit/resultset/HermitProcedureResultSet.php

@@ -5 +5 @@
  */
 class HermitProcedureResultSet implements HermitResultSet, HermitParameterBind {
-    private $procParameter;
+    protected $procParameter;
     public function __construct(HermitProcedureParameter $procParameter){
         $this->procParameter = $procParameter;
     }
-    public function create(HermitStatement $stmt, HermitValueType $type){
+    public function execute(HermitStatement $stmt, HermitValueType $type){
         $type->apply($stmt);
 
@@ -27 +27 @@
     }
     public function bindParameter(PDO $pdo, array $parameter){
-        $param = $parameter[0];
-        $dbms = HermitDatabaseMetaFactory::getDbms($pdo);
-        if('mysql' === $dbms){
-            if(!$this->procParameter->hasBindParameters()){
-                return;
-            }
-            $out = $this->procParameter->getOutParameters();
-            foreach($out as $name){
-                $stmt = $pdo->prepare('SELECT @' . $name);
-                $stmt->bindColumn(1, $param->$name);
-                $stmt->execute();
-                
-                $stmt->fetch(PDO::FETCH_BOUND);
-                $stmt->closeCursor();
-                unset($stmt);
-            }
-        }
     }
 }

lang/php/misc/Hermit/src/Hermit/resultset/HermitResultSet.php

@@ -5 +5 @@
  */
 interface HermitResultSet {
-    public function create(HermitStatement $stmt, HermitValueType $type);
+    public function execute(HermitStatement $stmt, HermitValueType $type);
 }

lang/php/misc/Hermit/src/Hermit/statement/HermitProcedureStatementBuilder.php

@@ -8 +8 @@
     private $annote;
     private $sqlCreator;
+
+    protected static $procedureParameters = array(
+        'mysql' => 'HermitMySqlProcedureParameter'
+    );
+
     public function __construct(ReflectionMethod $method, HermitAnnote $annote, HermitSqlCreator $sqlCreator){
         $this->method = $method;
@@ -15 +20 @@
 
     public function build(PDO $pdo){
-        $this->checkProcedureParameter();
+        self::checkProcedureParameter($this->method);
 
         $procedureName = $this->annote->getProcedure($this->method);
@@ -22 +27 @@
 
         $dbms = HermitDatabaseMetaFactory::getDbms($pdo);
-        $parameter = new HermitProcedureParameter($info, $dbms);
+        $parameter = null;
+        if(isset(self::$procedureParameters[$dbms])){
+            $className = self::$procedureParameters[$dbms];
+            $parameter = new $className($info, $dbms);
+        } else {
+            $parameter = new HermitProcedureParameter($info, $dbms);
+        }
         $sql = $this->sqlCreator->createSql($pdo);
         $sql = self::preparedSql($parameter, $sql);
@@ -28 +39 @@
     }
     
-    protected function checkProcedureParameter(){
-        $parameters = $this->method->getParameters();
+    protected function checkProcedureParameter(ReflectionMethod $method){
+        $parameters = $method->getParameters();
         $count = count($parameters);
         if(1 < $count){

lang/php/misc/Hermit/src/Hermit/tx/AbstractHermitTx.php

@@ -7 +7 @@
     private $txRule = array();
     private $connection;
-    public function hasTransaction(){
+    private $begin = false;
+    public final function hasTransaction(){
+        if($this->begin){
+            return true;
+        }
+        return $this->begin = $this->connection->beginTransaction();
     }
-    public function begin(){
+    public final function begin(){
+        try {
+            if(!$this->begin){
+                $this->begin = $this->connection->beginTransaction();
+            }
+        } catch(Exception $e){
+            // TODO: Nest transaction
+            throw $e;
+        }
     }
-    public function commit(){
+    public final function commit(){
+        try {
+            if($this->connection->commit()){
+                $this->begin = false;
+            }
+        } catch(Exception $e){
+            throw $e;
+        }    
     }
-    public function rollback(){
+    public final function rollback(){
+        try {
+            if ($this->hasTransaction()) {
+                return $this->connection->rollback();
+            }
+        } catch(Exception $e){
+            throw $e;
+        }
     }
-    public function suspend(){
+    public final function suspend(){
+        return $this->connection;
     }
-    public function resume(PDO $connection){
+    public final function resume(PDO $connection){
+        $this->connection = $connection;
     }
     public final function complete(Exception $e){

lang/php/misc/Hermit/src/Hermit/tx/HermitMandatoryTx.php

@@ -5 +5 @@
  */
 class HermitMandatoryTx extends AbstractHermitTx {
+    public function proceed(HermitProxy $proxy, $name, array $parameters){
+        if(!$this->hasTransaction()){
+            throw new LogicException('No transaction');
+        }
+        return $proxy->request($name, $parameters);
+    }
 }

lang/php/misc/Hermit/src/Hermit/tx/HermitNeverTx.php

@@ -5 +5 @@
  */
 class HermitNeverTx extends AbstractHermitTx {
+    public function proceed(HermitProxy $proxy, $name, array $parameters){
+        if($this->hasTransaction()){
+            throw new LogicException('Already associated with another transaction');
+        }
+        return $proxy->request($name, $parameters);
+    }
 }

lang/php/misc/Hermit/src/Hermit/tx/HermitRequiredTx.php

@@ -5 +5 @@
  */
 class HermitRequiredTx extends AbstractHermitTx {
+    public function proceed(HermitProxy $proxy, $name, array $parameters){
+        $began = false;
+
+        if(!$this->hasTransaction()){
+            $this->begin();
+            $began = true;
+        }
+        $ret = null;
+        try {
+            $ret = $proxy->request($name, $parameters);
+            if($began){
+                $this->commit();
+            }
+            return $ret;
+        } catch(Exception $e){
+            if($began){
+                $this->complete($e);
+            }
+            throw $e;
+        }
+    }
 }

lang/php/misc/Hermit/src/Hermit/tx/HermitRequiresNewTx.php

@@ -5 +5 @@
  */
 class HermitRequiresNewTx extends AbstractHermitTx {
+    public function proceed(HermitProxy $proxy, $name, array $parameters){
+        $this->begin();
+        try {
+            $ret = $proxy->request($name, $parameters);
+            $this->commit();
+            return $ret;
+        } catch(Exception $e){
+            $this->complete($e);
+            throw $e;
+        }
+    }
 }

lang/php/misc/Hermit/test/db_init.php

@@ -5 +5 @@
     $_db_init = 'db_' . $name . '_init';
     $_db_init($pdo);
-    
+
     $sqlpath = dirname(__FILE__) . '/resource/test-' . $name . '.sql.php';
     if(file_exists($sqlpath)){