Doctrine_Db_Statement no longer depends on PDOStatement

lib/Doctrine.php

@@ -150,7 +150,14 @@ final class Doctrine
     const ATTR_FIELD_CASE           = 102;
     const ATTR_IDXNAME_FORMAT       = 103;
     const ATTR_SEQNAME_FORMAT       = 104;
+    const ATTR_CMPNAME_FORMAT       = 118;
+    const ATTR_DBNAME_FORMAT        = 117;
+    const ATTR_TBLCLASS_FORMAT      = 119;
+
     const ATTR_SEQCOL_NAME          = 105;
+
+
+
     const ATTR_PORTABILITY          = 106;
     const ATTR_VLD                  = 107;
     const ATTR_COLL_KEY             = 108;
@@ -162,7 +169,7 @@ final class Doctrine
     const ATTR_DEF_VARCHAR_LENGTH   = 114;
     const ATTR_DEF_TABLESPACE       = 115;
     const ATTR_EMULATE_DATABASE     = 116;
-    const ATTR_DB_NAME_FORMAT       = 117;
+
 
     /** TODO: REMOVE THE FOLLOWING CONSTANTS AND UPDATE THE DOCS ! */
 

lib/Doctrine/Adapter/Statement/Interface.php

@@ -85,7 +85,7 @@ interface Doctrine_Adapter_Statement_Interface
      * @param mixed $driverOptions
      * @return boolean              Returns TRUE on success or FALSE on failure.
      */
-    public function bindParam($column, $variable, $type = null, $length = null, $driverOptions);
+    public function bindParam($column, $variable, $type = null, $length = null, $driverOptions = array());
     /**
      * closeCursor
      * Closes the cursor, enabling the statement to be executed again.
@@ -133,7 +133,7 @@ interface Doctrine_Adapter_Statement_Interface
      *                                  bound parameters in the SQL statement being executed.
      * @return boolean                  Returns TRUE on success or FALSE on failure.
      */
-    public function execute($params);
+    public function execute(array $params = array());
     /**
      * fetch
      *
@@ -161,26 +161,115 @@ interface Doctrine_Adapter_Statement_Interface
      *
      * @return mixed
      */
-    public function fetch($fetchStyle = Doctrine::FETCH_BOTH, 
+    public function fetch($fetchStyle = Doctrine::FETCH_BOTH,
                           $cursorOrientation = Doctrine::FETCH_ORI_NEXT,
                           $cursorOffset = null);
     /**
      * fetchAll
      * Returns an array containing all of the result set rows
      *
-     * 
+     * @param integer $fetchStyle           Controls how the next row will be returned to the caller.
+     *                                      This value must be one of the Doctrine::FETCH_* constants,
+     *                                      defaulting to Doctrine::FETCH_BOTH
      *
      * @param integer $columnIndex          Returns the indicated 0-indexed column when the value of $fetchStyle is
      *                                      Doctrine::FETCH_COLUMN. Defaults to 0.
      *
      * @return array
      */
-    public function fetchAll($fetchStyle = Doctrine::FETCH_BOTH,
-                             $columnIndex = 0);
+    public function fetchAll($fetchStyle = Doctrine::FETCH_BOTH);
+    /**
+     * fetchColumn
+     * Returns a single column from the next row of a
+     * result set or FALSE if there are no more rows.
+     *
+     * @param integer $columnIndex          0-indexed number of the column you wish to retrieve from the row. If no 
+     *                                      value is supplied, Doctrine_Adapter_Statement_Interface->fetchColumn() 
+     *                                      fetches the first column.
+     *
+     * @return string                       returns a single column in the next row of a result set.
+     */
+    public function fetchColumn($columnIndex = 0);
+    /**
+     * fetchObject
+     * Fetches the next row and returns it as an object.
+     *
+     * Fetches the next row and returns it as an object. This function is an alternative to 
+     * Doctrine_Adapter_Statement_Interface->fetch() with Doctrine::FETCH_CLASS or Doctrine::FETCH_OBJ style.
+     *
+     * @param string $className             Name of the created class, defaults to stdClass. 
+     * @param array $args                   Elements of this array are passed to the constructor.
+     *
+     * @return mixed                        an instance of the required class with property names that correspond 
+     *                                      to the column names or FALSE in case of an error.
+     */
+    public function fetchObject($className = 'stdClass', $args = array());
+    /**
+     * getAttribute
+     * Retrieve a statement attribute 
+     *
+     * @param integer $attribute
+     * @see Doctrine::ATTR_* constants
+     * @return mixed                        the attribute value
+     */
+    public function getAttribute($attribute);
+    /**
+     * getColumnMeta
+     * Returns metadata for a column in a result set
+     *
+     * @param integer $column               The 0-indexed column in the result set.
+     *
+     * @return array                        Associative meta data array with the following structure:
+     *
+     *          native_type                 The PHP native type used to represent the column value.
+     *          driver:decl_                type The SQL type used to represent the column value in the database. If the column in the result set is the result of a function, this value is not returned by PDOStatement->getColumnMeta().
+     *          flags                       Any flags set for this column.
+     *          name                        The name of this column as returned by the database.
+     *          len                         The length of this column. Normally -1 for types other than floating point decimals.
+     *          precision                   The numeric precision of this column. Normally 0 for types other than floating point decimals.
+     *          pdo_type                    The type of this column as represented by the PDO::PARAM_* constants.
+     */
+    public function getColumnMeta($column);
+    /**
+     * nextRowset
+     * Advances to the next rowset in a multi-rowset statement handle
+     * 
+     * Some database servers support stored procedures that return more than one rowset 
+     * (also known as a result set). The nextRowset() method enables you to access the second 
+     * and subsequent rowsets associated with a PDOStatement object. Each rowset can have a 
+     * different set of columns from the preceding rowset.
+     *
+     * @return boolean                      Returns TRUE on success or FALSE on failure.
+     */
     public function nextRowset();
-
-
+    /**
+     * rowCount
+     * rowCount() returns the number of rows affected by the last DELETE, INSERT, or UPDATE statement 
+     * executed by the corresponding object.
+     *
+     * If the last SQL statement executed by the associated Statement object was a SELECT statement, 
+     * some databases may return the number of rows returned by that statement. However, 
+     * this behaviour is not guaranteed for all databases and should not be 
+     * relied on for portable applications.
+     *
+     * @return integer                      Returns the number of rows.
+     */
     public function rowCount();
-    public function setFetchMode($mode);
-
+    /**
+     * setAttribute
+     * Set a statement attribute
+     *
+     * @param integer $attribute
+     * @param mixed $value                  the value of given attribute
+     * @return boolean                      Returns TRUE on success or FALSE on failure.
+     */
+    public function setAttribute($attribute, $value);
+    /**
+     * setFetchMode
+     * Set the default fetch mode for this statement 
+     *
+     * @param integer $mode                 The fetch mode must be one of the Doctrine::FETCH_* constants.
+     * @return boolean                      Returns 1 on success or FALSE on failure.
+     */
+    public function setFetchMode($mode, $arg1 = null, $arg2 = null);
 }

lib/Doctrine/Db.php

@@ -34,12 +34,6 @@
  *    to database. Connecting to database is only invoked when actually needed
  *    (for example when query() is being called)
  *
- * 3. Portable error codes
- *    Doctrine_Db_Exception drivers provide portable error code handling.
- *
- * 4. Easy-to-use fetching methods
- *    For convience Doctrine_Db provides methods such as fetchOne(), fetchAssoc() etc.
- *
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @package     Doctrine
@@ -84,6 +78,12 @@ class Doctrine_Db implements Countable, IteratorAggregate, Doctrine_Adapter_Inte
      * @var integer $querySequence
      */
     protected $querySequence  = 0;
+    /**
+     * @var string $name                name of this connection
+     * @see Doctrine_Manager::openConnection()
+     */
+    protected $name;
+
 
     private static $driverMap = array('oracle'     => 'oci8',
                                       'postgres'   => 'pgsql',
@@ -112,7 +112,7 @@ class Doctrine_Db implements Countable, IteratorAggregate, Doctrine_Adapter_Inte
                 $e[0] = 'odbc';
             }
 
-            $this->pendingAttributes[PDO::ATTR_DRIVER_NAME] = $e[0];
+            $this->pendingAttributes[Doctrine::ATTR_DRIVER_NAME] = $e[0];
 
         }
         $this->options['dsn']      = $dsn;
@@ -133,12 +133,43 @@ class Doctrine_Db implements Countable, IteratorAggregate, Doctrine_Adapter_Inte
         return $this->querySequence;
     }
     /**
-     * getDBH
+     * getDbh
      */
-    public function getDBH()
+    public function getDbh()
     {
         return $this->dbh;
     }
+    /**
+     * setAdapter
+     *
+     * @param Doctrine_Adapter_Interface|PDO $adapter
+     * @return void
+     */
+    public function setAdapter($adapter)
+    {
+        $this->dbh = $adapter;
+    }
+    /**
+     * setName
+     * this method should only be used by doctrine internally and
+     * also for testing purposes
+     *
+     * @param string $name      connection name
+     * @return void
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+    /**
+     * getName
+     *
+     * @return string           the name of the associated connection
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
     public function getOption($name)
     {
         if ( ! array_key_exists($name, $this->options)) {
@@ -203,13 +234,32 @@ class Doctrine_Db implements Countable, IteratorAggregate, Doctrine_Adapter_Inte
 
         $this->listener->onPreConnect($event);
 
-        $this->dbh = new PDO($this->options['dsn'], $this->options['username'], $this->options['password']);
-        $this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        $this->dbh->setAttribute(PDO::ATTR_STATEMENT_CLASS, array('Doctrine_Db_Statement', array($this)));
+        $e     = explode(':', $this->options['dsn']);
+        $found = false;
+        
+        if (extension_loaded('pdo')) {
+            if (in_array($e[0], PDO::getAvailableDrivers())) {
+                $this->dbh = new PDO($this->options['dsn'], $this->options['username'], $this->options['password']);
+                $this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+                //$this->dbh->setAttribute(PDO::ATTR_STATEMENT_CLASS, array('Doctrine_Db_Statement', array($this)));
+                $found = true;
+            }
+        }
+
+        if ( ! $found) {
+            $class = 'Doctrine_Adapter_' . ucwords($e[0]);
+
+            if (class_exists($class)) {
+                $this->dbh = new $class($this->options['dsn'], $this->options['username'], $this->options['password']);
+            } else {
+                throw new Doctrine_Db_Exception("Couldn't locate driver named " . $e[0]);      	
+            }
+        }
+
         
         foreach($this->pendingAttributes as $attr => $value) {
             // some drivers don't support setting this so we just skip it
-            if($attr == PDO::ATTR_DRIVER_NAME) {
+            if($attr == Doctrine::ATTR_DRIVER_NAME) {
                 continue;
             }
             $this->dbh->setAttribute($attr, $value);
@@ -362,7 +412,7 @@ class Doctrine_Db implements Countable, IteratorAggregate, Doctrine_Adapter_Inte
 
         $this->querySequence++;
 
-        return $stmt;
+        return new Doctrine_Db_Statement($this, $stmt);
     }
     /**
      * query

lib/Doctrine/Db/Event.php

@@ -42,6 +42,8 @@ class Doctrine_Db_Event
     const COMMIT    = 6;
     const ROLLBACK  = 7;
     const CONNECT   = 8;
+    const FETCH     = 9;
+    const FETCHALL  = 10;
     /**
      * @var Doctrine_Db $invoker        the handler which invoked this event
      */
@@ -78,7 +80,7 @@ class Doctrine_Db_Event
     {
         $this->invoker = $invoker;
         $this->code    = $code;
-        $this->query   = $query;
+        $this->query   = $query;
         $this->params = $params;
     }
     /**

lib/Doctrine/Db/EventListener/Interface.php

@@ -21,9 +21,13 @@
 /**
  * Doctrine_Db_EventListener
  *
- * @author      Konsta Vesterinen
- * @license     LGPL
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @package     Doctrine
+ * @category    Object Relational Mapping
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ * @version     $Revision$
  */
 interface Doctrine_Db_EventListener_Interface {
     public function onPreConnect(Doctrine_Db_Event $event);
@@ -40,7 +44,7 @@ interface Doctrine_Db_EventListener_Interface {
 
     public function onPreFetch(Doctrine_Db_Event $event);
     public function onFetch(Doctrine_Db_Event $event);
-    
+
     public function onPreFetchAll(Doctrine_Db_Event $event);
     public function onFetchAll(Doctrine_Db_Event $event);
 

lib/Doctrine/Hydrate.php

@@ -395,8 +395,9 @@ abstract class Doctrine_Hydrate extends Doctrine_Access
         }
         $stmt  = $this->conn->execute($query, $params);
 
-        if ($this->aggregate)
-            return $stmt->fetchAll(PDO::FETCH_ASSOC);
+        if ($this->aggregate) {
+            return $stmt->fetchAll(Doctrine::FETCH_ASSOC);
+        }
 
         if (count($this->tables) == 0) {
             throw new Doctrine_Query_Exception("No components selected");
@@ -669,12 +670,12 @@ abstract class Doctrine_Hydrate extends Doctrine_Access
     }
     /**
      * parseData
-     * parses the data returned by PDOStatement
+     * parses the data returned by statement object
      *
-     * @param PDOStatement $stmt
+     * @param mixed $stmt
      * @return array
      */
-    public function parseData(PDOStatement $stmt)
+    public function parseData($stmt)
     {
         $array = array();
 

lib/Doctrine/Locking/Manager/Pessimistic.php

@@ -109,7 +109,7 @@ class Doctrine_Locking_Manager_Pessimistic
         }
 
         try {
-            $dbh = $this->conn->getDBH();
+            $dbh = $this->conn->getDbh();
             $dbh->beginTransaction();
 
             $stmt = $dbh->prepare("INSERT INTO $this->_lockTable

lib/Doctrine/Manager.php

@@ -187,6 +187,10 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
             throw new Doctrine_Manager_Exception("First argument should be an instance of PDO or implement Doctrine_Adapter_Interface");
         }
 
+        if ($adapter instanceof Doctrine_Db) {
+            $adapter->setName($name);
+        }
+
         // initialize the default attributes
         $this->setDefaultAttributes();
 
@@ -229,9 +233,9 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
             default:
                 throw new Doctrine_Manager_Exception('Unknown connection driver '. $adapter->getAttribute(PDO::ATTR_DRIVER_NAME));
         };
-
+
         if ($setCurrent) {
-            $this->currIndex = $name;
+            $this->currIndex = $name;
         }
         return $this->connections[$name];
     }

tests/Cache/ApcTestCase.php

@@ -31,7 +31,7 @@
  * @since       1.0
  * @version     $Revision$
  */
-class Doctrine_Cache_Apc_TestCase 
+class Doctrine_Cache_Apc_TestCase extends Doctrine_UnitTestCase 
 {
 
 }

tests/Cache/MemcacheTestCase.php

@@ -31,10 +31,17 @@
  * @since       1.0
  * @version     $Revision$
  */
-class Doctrine_Cache_Memcache_TestCase 
+class Doctrine_Cache_Memcache_TestCase extends Doctrine_UnitTestCase 
 {
-
+    public function prepareTables() 
+    { }
+    public function prepareData()
+    { }
 }
 class Doctrine_Cache_Memcache_Mock extends Doctrine_Cache_Memcache 
-{   
+{
+}
+class Memcache 
+{ 
+
 }

tests/Cache/SqliteTestCase.php

@@ -31,7 +31,10 @@
  * @since       1.0
  * @version     $Revision$
  */
-class Doctrine_Cache_Sqlite_TestCase 
+class Doctrine_Cache_Sqlite_TestCase extends Doctrine_UnitTestCase
 {
-
+    public function prepareTables() 
+    { }
+    public function prepareData()
+    { }
 }

tests/CacheTestCase.php

@@ -31,7 +31,40 @@
  * @since       1.0
  * @version     $Revision$
  */
-class Doctrine_Cache_TestCase 
+class Doctrine_Cache_TestCase extends Doctrine_UnitTestCase
 {
+    protected $cache;
 
+    public function prepareTables()
+    { }
+    public function prepareData()
+    { }
+
+    public function testAdapterQueryAddsQueriesToCacheStack()
+    {
+        $this->dbh->query('SELECT * FROM user');
+
+        $this->assertEqual($this->cache->getAll(), array('main' => array('SELECT * FROM user')));
+    }
+    public function testAdapterStatementExecuteAddsQueriesToCacheStack()
+    {
+        $stmt = $this->dbh->prepare('SELECT * FROM user');
+
+        $stmt->execute();
+
+        $this->assertEqual($this->cache->getAll(), array('main' => array('SELECT * FROM user')));
+    }
+    public function setUp()
+    {
+        parent::setUp();
+
+    	if ( ! isset($this->cache)) {
+            $this->cache = new Doctrine_Cache('Array');
+    
+            $this->dbh->setAdapter(new Doctrine_Adapter_Mock());
+            $this->dbh->addListener($this->cache);
+        }
+
+        $this->cache->reset();
+    }
 }

tests/run.php

@@ -62,7 +62,7 @@ $test = new GroupTest('Doctrine Framework Unit Tests');
 
 
 // DATABASE ABSTRACTION tests
-/**
+
 // Connection drivers (not yet fully tested)
 $test->addTestCase(new Doctrine_Connection_Pgsql_TestCase());
 $test->addTestCase(new Doctrine_Connection_Oracle_TestCase());
@@ -214,12 +214,12 @@ $test->addTestCase(new Doctrine_Query_JoinCondition_TestCase());
 $test->addTestCase(new Doctrine_ColumnAlias_TestCase());
 $test->addTestCase(new Doctrine_Query_Subquery_TestCase());
 $test->addTestCase(new Doctrine_Query_Orderby_TestCase());
-*/
+/**
 $test->addTestCase(new Doctrine_Cache_TestCase());
 $test->addTestCase(new Doctrine_Cache_Apc_TestCase());
 $test->addTestCase(new Doctrine_Cache_Memcache_TestCase());
 $test->addTestCase(new Doctrine_Cache_Sqlite_TestCase());
-
+*/
 // Cache tests
 //$test->addTestCase(new Doctrine_Cache_Query_SqliteTestCase());
 //$test->addTestCase(new Doctrine_Cache_FileTestCase());