Show
Ignore:
Timestamp:
10/01/08 21:02:13 (3 months ago)
Author:
nowelium
Message:
 
Files:
1 modified

Legend:

Unmodified
Added
Removed
  • lang/php/misc/Hermit/src/Hermit/command/HermitSqlCommandFactory.php

    r20325 r20387  
    4242    } 
    4343    protected function createProcedureCommand(PDO $pdo, ReflectionMethod $method){ 
    44         $dbName = HermitDatabaseMetaFactory::getDatabaseName($pdo); 
    45         $creator = $this->createProcedureSqlCreator($method, $dbName); 
     44        $dbms = HermitDatabaseMetaFactory::getDbms($pdo); 
     45        $creator = $this->createProcedureSqlCreator($method, $dbms); 
    4646        $creator->initialize($pdo, $method, $this->annote); 
    4747        $valueType = HermitValueTypeFactory::create($this->annote, $method); 
    48         return new HermitProcedureCommand($method, $creator, $valueType); 
     48 
     49        $command = new HermitProcedureCommand; 
     50        $command->setMethod($method); 
     51        $command->setSqlCreator($creator); 
     52        $command->setValueType($valueType); 
     53        $command->setAnnote($this->annote); 
     54        return $command; 
    4955    } 
    5056    protected function createProcedureSqlCreator(ReflectionMethod $method, $dbName){ 
    5157        $sql = $this->annote->getProcedure($method); 
    5258        if(null !== $sql){ 
    53             return new HermitStaticSqlCreator($sql); 
     59            return new HermitProcedureCallSqlCreator($sql); 
    5460        } 
    5561        $sql = $this->annote->getSql($method, $dbName); 
    5662        if(null !== $sql){ 
    57             return new HermitStaticSqlCreator($sql); 
     63            return new HermitProcedureCallSqlCreator($sql); 
    5864        } 
    5965        $sql = $this->annote->getFile($method); 
    6066        if(null !== $sql){ 
    61             return new HermitStaticSqlCreator($sql); 
     67            return new HermitProcedureCallSqlCreator($sql); 
    6268        } 
    6369        throw new BadMethodCallException('method: "' . $method->getName() . '" was not apply to Procedure command'); 
     
    7379    } 
    7480    protected function createSelectCommand(PDO $pdo, ReflectionMethod $method){ 
    75         $dbName = HermitDatabaseMetaFactory::getDatabaseName($pdo); 
    76         $creator = $this->createSelectSqlCreator($method, $dbName); 
     81        $dbms = HermitDatabaseMetaFactory::getDbms($pdo); 
     82        $creator = $this->createSelectSqlCreator($method, $dbms); 
    7783        $creator->initialize($pdo, $method, $this->annote); 
    7884        if($creator instanceof HermitAppendableSqlCreator){ 
     
    8288        return new HermitSelectCommand($method, $creator, $valueType); 
    8389    } 
    84     protected function createSelectSqlCreator(ReflectionMethod $method, $dbName){ 
    85         $sql = $this->annote->getSql($method, $dbName); 
     90    protected function createSelectSqlCreator(ReflectionMethod $method, $dbms){ 
     91        $sql = $this->annote->getSql($method, $dbms); 
    8692        if(null !== $sql){ 
    8793            return new HermitStaticSqlCreator($sql); 
    8894        } 
    89         $sql = $this->annote->getFile($method, $dbName); 
     95        $sql = $this->annote->getFile($method, $dbms); 
    9096        if(null !== $sql){ 
    9197            return new HermitStaticSqlCreator($sql);