Changeset 4951 for trunk/lib/Doctrine

Timestamp:

09/12/08 18:25:38 (4 months ago)

Author:

romanb

Message:

further cleanups

Location:

trunk/lib/Doctrine

Files:

• Connection (deleted)
• Connection.php (deleted)
• DBAL/Connection.php (added)
• DBAL/Driver.php (modified) (1 diff)
• DBAL/Driver/Connection.php (added)
• DBAL/Driver/PDOConnection.php (added)
• DBAL/Driver/PDOMsSql/Connection.php (modified) (1 diff)
• DBAL/Driver/PDOMsSql/Driver.php (modified) (1 diff)
• DBAL/Driver/PDOMySql/Connection.php (deleted)
• DBAL/Driver/PDOMySql/Driver.php (modified) (1 diff)
• DBAL/Driver/PDOOracle/Driver.php (modified) (1 diff)
• DBAL/Driver/PDOPgSql/Driver.php (modified) (1 diff)
• DBAL/Driver/PDOSqlite/Driver.php (modified) (2 diffs)
• DBAL/Driver/PDOStatement.php (added)
• DBAL/Driver/Statement.php (added)
• DBAL/DriverManager.php (added)
• DBAL/Exceptions/DBALException.php (added)
• DBAL/Platforms/AbstractPlatform.php (modified) (1 diff)
• DBAL/Platforms/FirebirdPlatform.php (modified) (1 diff)
• DBAL/Platforms/MsSqlPlatform.php (modified) (1 diff)
• DBAL/Platforms/MySqlPlatform.php (modified) (1 diff)
• DBAL/Platforms/OraclePlatform.php (modified) (1 diff)
• DBAL/Platforms/PostgreSqlPlatform.php (modified) (1 diff)
• DBAL/Platforms/SqlitePlatform.php (modified) (1 diff)
• DBAL/Statement.php (deleted)
• ORM/EntityManager.php (modified) (2 diffs)
• ORM/UnitOfWork.php (added)
• Query/Parser.php (modified) (1 diff)
• Query/SqlBuilder.php (modified) (4 diffs)
• Sequence (deleted)
• Transaction (deleted)

trunk/lib/Doctrine/DBAL/Driver.php

@@ -33 +33 @@
      * @return Doctrine::DBAL::SchemaManager
      */
-    public function getSchemaManager();
+    public function getSchemaManager(Doctrine_DBAL_Connection $conn);
 }
 

trunk/lib/Doctrine/DBAL/Driver/PDOMsSql/Connection.php

@@ -8 +8 @@
  * @since 2.0
  */
-class Doctrine_DBAL_Driver_PDOMsSql_Connection extends PDO implements Doctrine_DBAL_Connection
+class Doctrine_DBAL_Driver_PDOMsSql_Connection extends PDO implements Doctrine_DBAL_Driver_Connection
 {
-    private $_isolationLevel = Doctrine_DBAL_Connection::TRANSACTION_READ_COMMITTED;
-    
-    /**
-     * Set the transacton isolation level.
-     *
-     * @param   string  standard isolation level (SQL-92)
-     *      portable modes:
-     *                  READ UNCOMMITTED (allows dirty reads)
-     *                  READ COMMITTED (prevents dirty reads)
-     *                  REPEATABLE READ (prevents nonrepeatable reads)
-     *                  SERIALIZABLE (prevents phantom reads)
-     *
-     * @link http://msdn2.microsoft.com/en-us/library/ms173763.aspx
-     * @throws PDOException                         if something fails at the PDO level
-     * @throws Doctrine_Transaction_Exception       if using unknown isolation level or unknown wait option
-     * @return void
-     * @override
-     */
-    public function setTransactionIsolation($level, $options = array()) {
-        $sql = "";
-        switch ($level) {
-            case Doctrine_DBAL_Connection::TRANSACTION_READ_UNCOMMITTED:
-                $sql = 'READ UNCOMMITTED';
-                break;
-            case Doctrine_DBAL_Connection::TRANSACTION_READ_COMMITTED:
-                $sql = 'READ COMMITTED';
-                break;
-            case Doctrine_DBAL_Connection::TRANSACTION_REPEATABLE_READ:
-                $sql = 'REPEATABLE READ';
-                break;
-            case Doctrine_DBAL_Connection::TRANSACTION_SERIALIZABLE:
-                $sql = 'SERIALIZABLE';
-                break;
-            default:
-                throw new Doctrine_Transaction_Exception('isolation level is not supported: ' . $isolation);
-        }
-
-        $this->_isolationLevel = $level;
-        $this->exec('SET TRANSACTION ISOLATION LEVEL ' . $sql);
-    }
-    
-    public function getTransactionIsolation()
-    {
-        return $this->_isolationLevel;
-    }
-    
     /**
      * Performs the rollback.

trunk/lib/Doctrine/DBAL/Driver/PDOMsSql/Driver.php

@@ -10 +10 @@
     public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
     {
-        return new PDO($this->_constructPdoDsn($params), $username, $password, $driverOptions);
+        return new Doctrine_DBAL_Driver_MsSql_Connection(
+                $this->_constructPdoDsn($params),
+                $username,
+                $password,
+                $driverOptions);
     }
     

trunk/lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php

@@ -10 +10 @@
     public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
     {
-        return new PDO($this->_constructPdoDsn($params), $username, $password, $driverOptions);
+        return new Doctrine_DBAL_Driver_PDOConnection(
+                $this->_constructPdoDsn($params),
+                $username,
+                $password,
+                $driverOptions);
     }
     

trunk/lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php

@@ -10 +10 @@
     public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
     {
-        return new PDO($this->_constructPdoDsn($params), $username, $password, $driverOptions);
+        return new Doctrine_DBAL_Driver_PDOConnection(
+                $this->_constructPdoDsn($params),
+                $username,
+                $password,
+                $driverOptions);
     }
     

trunk/lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php

@@ -13 +13 @@
     public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
     {
-        return new PDO($this->_constructPdoDsn($params), $username, $password, $driverOptions);
+        return new Doctrine_DBAL_Driver_PDOConnection(
+                $this->_constructPdoDsn($params),
+                $username,
+                $password,
+                $driverOptions);
     }
     

trunk/lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php

@@ -10 +10 @@
     public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
     {
-        return new PDO($this->_constructPdoDsn($params), $username, $password, $driverOptions);
+        return new Doctrine_DBAL_Driver_PDOConnection(
+                $this->_constructPdoDsn($params),
+                $username,
+                $password,
+                $driverOptions);
     }
     
@@ -33 +37 @@
     public function getDatabasePlatform()
     {
-        return new Doctrine_DatabasePlatform_SqlitePlatform();
+        return new Doctrine_DBAL_Platforms_SqlitePlatform();
     }
     
-    public function getSchemaManager(Doctrine_Connection $conn)
+    public function getSchemaManager(Doctrine_DBAL_Connection $conn)
     {
-        return new Doctrine_Schema_SqliteSchemaManager($conn);
+        return new Doctrine_DBAL_Schema_SqliteSchemaManager($conn);
     }
     

trunk/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php

@@ -1775 +1775 @@
     }
     
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $level
+     */
+    protected function _getTransactionIsolationLevelSql($level)
+    {
+        switch ($level) {
+            case Doctrine_DBAL_Connection::TRANSACTION_READ_UNCOMMITTED:
+                return 'READ UNCOMMITTED';
+            case Doctrine_DBAL_Connection::TRANSACTION_READ_COMMITTED:
+                return 'READ COMMITTED';
+            case Doctrine_DBAL_Connection::TRANSACTION_REPEATABLE_READ:
+                return 'REPEATABLE READ';
+            case Doctrine_DBAL_Connection::TRANSACTION_SERIALIZABLE:
+                return 'SERIALIZABLE';
+            default:
+                throw new Doctrine_Common_Exceptions_DoctrineException('isolation level is not supported: ' . $isolation);
+        } 
+    }
+    
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $level
+     */
+    public function getSetTransactionIsolationSql($level)
+    {
+        throw new Doctrine_Export_Exception('Set transaction isolation not supported by this platform.');
+    }
+    
+    /**
+     * Gets the default transaction isolation level of the platform.
+     *
+     * @return integer The default isolation level.
+     * @see Doctrine::DBAL::Connection::TRANSACTION_* constants.
+     */
+    public function getDefaultTransactionIsolationLevel()
+    {
+        return Doctrine_DBAL_Connection::TRANSACTION_READ_COMMITTED;
+    }
+    
     
     /* supports*() metods */

trunk/lib/Doctrine/DBAL/Platforms/FirebirdPlatform.php

@@ -258 +258 @@
     }
     
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $level
+     * @override
+     */
+    protected function _getTransactionIsolationLevelSql($level)
+    {
+        switch ($level) {
+            case Doctrine_DBAL_Connection::TRANSACTION_READ_UNCOMMITTED:
+                return 'READ COMMITTED RECORD_VERSION';
+            case Doctrine_DBAL_Connection::TRANSACTION_READ_COMMITTED:
+                return 'READ COMMITTED NO RECORD_VERSION';
+            case Doctrine_DBAL_Connection::TRANSACTION_REPEATABLE_READ:
+                return 'SNAPSHOT';
+            case Doctrine_DBAL_Connection::TRANSACTION_SERIALIZABLE:
+                return 'SNAPSHOT TABLE STABILITY';
+            default:
+                return parent::_getTransactionIsolationLevelSql($level);
+        }
+    }
+    
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $level
+     * @override
+     */
+    public function getSetTransactionIsolationSql($level)
+    {
+        return 'SET TRANSACTION ISOLATION LEVEL ' . $this->_getTransactionIsolationLevelSql($level);
+    }
+    
 }
 

trunk/lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php

@@ -312 +312 @@
     }
     
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $level
+     * @override
+     */
+    public function getSetTransactionIsolationSql($level)
+    {
+        return 'SET TRANSACTION ISOLATION LEVEL ' . $this->_getTransactionIsolationLevelSql($level);
+    }
+    
 }
 

trunk/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php

@@ -1235 +1235 @@
         return 'DROP TABLE ' . $table;
     }
+    
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $level
+     * @override
+     */
+    public function getSetTransactionIsolationSql($level)
+    {
+        return 'SET SESSION TRANSACTION ISOLATION LEVEL ' . $this->_getTransactionIsolationLevelSql($level);
+    }
 }
 

trunk/lib/Doctrine/DBAL/Platforms/OraclePlatform.php

@@ -345 +345 @@
         return 'SELECT ' . $this->quoteIdentifier($sequenceName) . '.nextval FROM DUAL';
     }
+    
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $level
+     * @override
+     */
+    public function getSetTransactionIsolationSql($level)
+    {
+        return 'ALTER SESSION ISOLATION LEVEL ' . $this->_getTransactionIsolationLevelSql($level);
+    }
+    
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $level
+     * @override
+     */
+    protected function _getTransactionIsolationLevelSql($level)
+    {
+        switch ($level) {
+            case Doctrine_DBAL_Connection::TRANSACTION_READ_UNCOMMITTED:
+                return 'READ COMMITTED';
+            case Doctrine_DBAL_Connection::TRANSACTION_READ_COMMITTED:
+            case Doctrine_DBAL_Connection::TRANSACTION_REPEATABLE_READ:
+            case Doctrine_DBAL_Connection::TRANSACTION_SERIALIZABLE:
+                return 'SERIALIZABLE';
+            default:
+                return parent::_getTransactionIsolationLevelSql($level);
+        }
+    }
 }
 

trunk/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php

@@ -990 +990 @@
         return "SELECT NEXTVAL('" . $sequenceName . "')";
     }
+    
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $level
+     * @override
+     */
+    public function getSetTransactionIsolationSql($level)
+    {
+        return 'SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL '
+                . $this->_getTransactionIsolationLevelSql($level);
+    }
 }
 

trunk/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php

@@ -361 +361 @@
                      'fixed'    => $fixed);
     }
+    
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $level
+     * @override
+     */
+    protected function _getTransactionIsolationLevelSql($level)
+    {
+        switch ($level) {
+            case Doctrine_DBAL_Connection::TRANSACTION_READ_UNCOMMITTED:
+                return 0;
+            case Doctrine_DBAL_Connection::TRANSACTION_READ_COMMITTED:
+            case Doctrine_DBAL_Connection::TRANSACTION_REPEATABLE_READ:
+            case Doctrine_DBAL_Connection::TRANSACTION_SERIALIZABLE:
+                return 1;
+            default:
+                return parent::_getTransactionIsolationLevelSql($level);
+        }
+    }
+    
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $level
+     * @override
+     */
+    public function getSetTransactionIsolationSql($level)
+    {
+        return 'PRAGMA read_uncommitted = ' . $this->_getTransactionIsolationLevelSql($level);
+    }
 }
 

trunk/lib/Doctrine/ORM/EntityManager.php

@@ -149 +149 @@
      * @param string $name
      */
-    protected function __construct(Doctrine_Connection $conn, $name, Doctrine_Common_Configuration $config,
+    protected function __construct(Doctrine_DBAL_Connection $conn, $name, Doctrine_Common_Configuration $config,
             Doctrine_Common_EventManager $eventManager)
     {
@@ -158 +158 @@
         $this->_metadataFactory = new Doctrine_ClassMetadata_Factory(
                 $this, new Doctrine_ClassMetadata_CodeDriver());
-        $this->_unitOfWork = new Doctrine_Connection_UnitOfWork($this);
+        $this->_unitOfWork = new Doctrine_ORM_UnitOfWork($this);
         $this->_nullObject = Doctrine_ORM_Internal_Null::$INSTANCE;
     }

trunk/lib/Doctrine/Query/Parser.php

@@ -131 +131 @@
         $this->_input = $query->getDql();
         $this->_scanner = new Doctrine_Query_Scanner($this->_input);
-        $this->_sqlBuilder = Doctrine_Query_SqlBuilder::fromConnection($this->_em);
+        $this->_sqlBuilder = new Doctrine_Query_SqlBuilder($this->_em);
         $this->_keywordTable = new Doctrine_Query_Token();
 

trunk/lib/Doctrine/Query/SqlBuilder.php

@@ -22 +22 @@
 
 /**
- * Base class of each Sql Builder object
+ * The SqlBuilder. Creates SQL out of an AST.
+ * 
+ * INTERNAL: For platform-specific SQL, the platform of the connection should be used.
+ * ($this->_connection->getDatabasePlatform())
  *
  * @package     Doctrine
@@ -33 +36 @@
  * @version     $Revision$
  */
-abstract class Doctrine_Query_SqlBuilder
+class Doctrine_Query_SqlBuilder
 {
-    /**
-     * The Connection object.
-     *
-     * @var Doctrine_Connection
-     */
-    protected $_connection;
+    protected $_em;
+    protected $_conn;
 
-
-    public static function fromConnection(Doctrine_ORM_EntityManager $entityManager)
+    public function __construct(Doctrine_ORM_EntityManager $em)
     {
-        $connection = $entityManager->getConnection();
-
-        $className = "Doctrine_Query_SqlBuilder_" . $connection->getDriverName();
-        $sqlBuilder = new $className();
-        $sqlBuilder->_connection = $connection;
-
-        return $sqlBuilder;
+        $this->_em = $em;
+        $this->_conn = $this->_em->getConnection();
     }
-
 
     /**
@@ -65 +57 @@
     }
 
-
     /**
      * @nodoc
@@ -71 +62 @@
     public function quoteIdentifier($identifier)
     {
-        return $this->_connection->quoteIdentifier($identifier);
+        return $this->_conn->quoteIdentifier($identifier);
     }
-
-
-
-    // Start Common SQL generations
-    // Here we follow the SQL-99 specifications available at:
-    // http://savage.net.au/SQL/sql-99.bnf
-
-
-
-    // End of Common SQL generations
  
 }