Changeset 20314 for lang/php

Timestamp:

09/30/08 21:36:14 (2 months ago)

Author:

nowelium

Message:

 

Location:

lang/php/misc/Hermit

Files:

• src/Hermit/Hermit.php (modified) (3 diffs)
• src/Hermit/HermitCallWrapper.php (added)
• src/Hermit/HermitDelegater.php (added)
• src/Hermit/HermitListener.php (deleted)
• src/Hermit/HermitRegister.php (added)
• src/Hermit/HermitResponder.php (added)
• src/Hermit/HermitTransactionManager.php (modified) (1 diff)
• src/Hermit/command/HermitSqlCommandFactory.php (modified) (1 diff)
• src/Hermit/meta/HermitMySQLDatabaseMeta.php (modified) (3 diffs)
• src/Hermit/meta/HermitProcedureInfo.php (added)
• src/Hermit/valuetype/HermitValueTypeFactory.php (modified) (2 diffs)
• test/HermitProcedureInfo_mysqlTest.php (added)
• test/HermitRegisterTest.php (added)
• test/HermitTableInfo_mysqlTest.php (added)
• test/Hermit_TransactionManagerWrapTest.php (modified) (1 diff)
• test/Hermit_WrapTest.php (deleted)
• test/db_init.php (added)
• test/resource (added)
• test/resource/procedure-mysql.sql (added)
• test/resource/procedure-mysql.sql.php (added)
• test/resource/test-mysql.sql (added)
• test/resource/test-mysql.sql.php (added)

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

@@ -6 +6 @@
 class Hermit {
     protected $proxy;
-    protected $listeners = array();
-    protected $delegators = array();
-    protected static $wrappers = array();
+    protected $calls = array();
+    protected static $behaviors = array();
     public function __construct($class = null){
         if(is_null($class)){
@@ -21 +20 @@
     }
     public function __call($name, $parameters = array()){
-        if(isset($this->delegators[$name])){
-            $delegator = $this->delegators[$name];
-            return self::__request($delegator, $name, $parameters);
-        }
-        if(isset($this->listeners[$name])){
-            $response = self::__request($this->proxy, $name, $parameters);
-            $listeners = $this->listeners[$name];
-            foreach($listeners as $listener){
-                self::__request($listener, $name, array($response));
+        if(0 < count($this->calls)){
+            foreach($this->calls as $call){
+                if($call->has($name)){
+                    return $call->execute($this->proxy, $name, $parameters);
+                }
             }
-            return $response;
         }
         return self::__request($this->proxy, $name, $parameters);
@@ -49 +43 @@
     }
     protected static function wrap(HermitProxy $proxy, $targetClass){
-        if(HermitTransactionManager::has($targetClass)){
-            return HermitTransactionManager::createProxy($proxy, $targetClass);
+        if(0 < count(self::$behaviors)){
+            foreach(self::$behaviors as $behavior){
+                if($behavior->has($targetClass)){
+                    return $behavior->createProxy($proxy, $targetClass);
+                }
+            }
         }
         return $proxy;

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

@@ -4 +4 @@
  * @author nowelium
  */
-abstract class HermitTransactionManager {
-    private static $transactionScripts = array();
+class HermitTransactionManager implements HermitBehaviorWrapper {
+    private static $instance;
+    private $transactionScripts = array();
     private function __construct(){
         // nop
     }
-    public static function set($targetClass, HermitTx $tx){
+    protected static function getInstance(){
+        if(null === self::$instance){
+            self::$instance = new self;
+        }
+        if(!HermitRegister::hasBehavior(__CLASS__)){
+            HermitRegister::putBehavior(__CLASS__, self::$instance);
+        }
+        return self::$instance;
     }
-    public static function get($targetClass){
+    public function set($targetClass, HermitTx $tx){
+        $instance = self::getInstance();
+        $instance->transactionScripts[$targetClass] = $tx;
     }
-    public static function has($targetClass){
+    public function get($targetClass){
+        $instance = self::getInstance();
+        if(isset($instance->transactionScripts[$targetClass])){
+            return null;
+        }
+        return $instance->transactionScripts[$targetClass];
     }
-    public static function createProxy(HermitProxy $proxy, $targetClass){
+    public function has($targetClass){
+        $instance = self::getInstance();
+        return isset($instance->transactionScripts[$targetClass]);
+    }
+    public function createProxy(HermitProxy $proxy, $targetClass){
         $tx = self::get($targetClass);
         return new HermitCallableProxy($proxy, array($tx, 'proceed'));

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

@@ -18 +18 @@
     }
     public function create(PDO $pdo, $methodName){
+        if(isset($this->createdCommands[$methodName])){
+            return $this->createdCommands[$methodName];
+        }
         $method = $this->annote->getMethod($methodName);
-        $methodId = spl_object_hash($method);
-        if(isset($this->createdCommands[$methodId])){
-            return $this->createdCommands[$methodId];
-        }
         $command = $this->createCommand($pdo, $method);
-        return $this->createdCommands[$methodId] = $command;
+        return $this->createdCommands[$methodName] = $command;
     }
     protected function createCommand(PDO $pdo, ReflectionMethod $method){

lang/php/misc/Hermit/src/Hermit/meta/HermitMySQLDatabaseMeta.php

@@ -5 +5 @@
  */
 class HermitMySQLDatabaseMeta implements HermitDatabaseMeta {
-    const TABLE_INFO_SQL = 'SELECT * FROM :TABLE LIMIT 0';
+    const USING_DB_NAME_SQL = 'SELECT database()';
+    const TABLE_INFO_SQL = 'SELECT * FROM %s LIMIT 0';
+    const PROCEDIRE_INFO_SQL = 'SELECT param_list, returns FROM mysql.proc WHERE db = :db AND name = :name';
     private $tables = array();
+    private $procedures = array();
     private $pdo;
+    private $databaseName;
     public function __construct(PDO $pdo){
         $this->pdo = $pdo;
+        $this->databaseName = $this->getUsingDatabaseName();
     }
     public function getTableInfo($table){
@@ -15 +20 @@
             return $this->tables[$table];
         }
-
-        $stmt = $this->pdo->prepare(self::TABLE_INFO_SQL);
-        $stmt->execute(array(':TABLE' => $table));
+        
+        $sql = sprintf(self::TABLE_INFO_SQL, $table);
+        $stmt = $this->pdo->prepare($sql);
+        $stmt->execute();
         $count = $stmt->columnCount();
         $info = new HermitTableInfo;
@@ -34 +40 @@
     }
     public function getProcedureInfo($procedure){
-        throw new RuntimeException('T.B.D');
+        if(isset($this->procedures[$procedure])){
+            return $this->procedures[$procedure];
+        }
+        $stmt = $this->pdo->prepare(self::PROCEDIRE_INFO_SQL);
+        $stmt->execute(array(':db' => $this->databaseName, ':name' => $procedure));
+        $paramList = $stmt->fetchColumn(0);
+
+        $info = new HermitProcedureInfo;
+        $chunk = array_map('trim', explode(',', $paramList));
+        foreach($chunk as $field){
+            $sp = preg_split('/\s+/', $field);
+
+            $inoutType = null;
+            $paramName = null;
+            $paramType = null;
+
+            $upper = strtoupper($sp[0]);
+            if(in_array($upper, array('IN', 'OUT', 'INOUT'), true)){
+                $inoutType = $upper;
+                $paramName = $sp[1];
+                $paramType = $sp[2];
+            } else {
+                // default IN: http://dev.mysql.com/doc/refman/5.1/ja/create-procedure.html
+                $inoutType = 'IN';
+                $paramName = $sp[0];
+                $paramType = $sp[1];
+            }
+            $info->addParamName($paramName);
+            $info->putParamType($paramName, $paramType);
+            if(strcmp('IN', $inoutType) === 0){
+                $info->putInType($paramName);
+            } else if(strcmp('OUT', $inoutType) === 0){
+                $info->putOutType($paramName);
+            } else {
+                $info->putInOutType($paramName);
+            }
+        }
+
+        return $this->procedures[$procedure] = $info;
+    }
+
+    protected function getUsingDatabaseName(){
+        $stmt = $this->pdo->prepare(self::USING_DB_NAME_SQL);
+        $stmt->execute();
+        return $stmt->fetchColumn(0);
     }
 }

lang/php/misc/Hermit/src/Hermit/valuetype/HermitValueTypeFactory.php

@@ -11 +11 @@
     public static function create(HermitAnnote $annote, ReflectionMethod $method){
         $value = $annote->getValueType($method);
+        if(null === $value){
+          return new HermitNopValueType($annote, $method, null);
+        }
         foreach(self::$valueTypes as $type){
             if(call_user_func(array($type, 'accept'), $value)){
@@ -16 +19 @@
             }
         }
-        return new HermitNopValueType;
+        return new HermitNopValueType($annote, $method, $value);
     }
 }

lang/php/misc/Hermit/test/Hermit_TransactionManagerWrapTest.php

@@ -1 +1 @@
 <?php
 require dirname(__FILE__) . '/setup.php';
-