Skip to content

D
doctrine-dbal
Commit 4d7b8838 authored by romanb's avatar romanb
Browse files
Options

Intermediate checkin. Refactoring towards namespaced structure.

parent ad4db34a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2871 additions and 462 deletions
lib/Doctrine/Adapter/Db2.php
View file @ 4d7b8838
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>.
*/
Doctrine::autoload('Doctrine_Adapter');
/**
* Doctrine_Adapter_Db2
* IBM DB2 Adapter [BORROWED FROM ZEND FRAMEWORK]
......@@ -30,6 +30,7 @@ Doctrine::autoload('Doctrine_Adapter');
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision: 1080 $
* @deprecated
*/
class Doctrine_Adapter_Db2 extends Doctrine_Adapter
{
......
lib/Doctrine/Adapter/Exception.php
View file @ 4d7b8838
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>.
*/
Doctrine::autoload('Doctrine_Exception');
/**
* Doctrine_Adapter_Exception
*
......@@ -29,6 +29,7 @@ Doctrine::autoload('Doctrine_Exception');
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
class Doctrine_Adapter_Exception extends Doctrine_Exception
{ }
lib/Doctrine/Adapter/Interface.php
View file @ 4d7b8838
......@@ -30,6 +30,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @deprecated
*/
interface Doctrine_Adapter_Interface {
public function prepare($prepareString);
......
lib/Doctrine/Adapter/Mock.php
View file @ 4d7b8838
......@@ -30,6 +30,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @deprecated
*/
class Doctrine_Adapter_Mock implements Doctrine_Adapter_Interface, Countable
{
......
lib/Doctrine/Adapter/Mysqli.php
View file @ 4d7b8838
......@@ -30,6 +30,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision: 1080 $
* @deprecated
*/
class Doctrine_Adapter_Mysqli extends Doctrine_Adapter
{
......
lib/Doctrine/Adapter/Resource.php
View file @ 4d7b8838
......@@ -29,6 +29,8 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision: 2702 $
* @deprecated
* @todo Remove
*/
class Doctrine_Adapter_Resource implements Doctrine_Adapter_Interface
{
......
lib/Doctrine/Adapter/Statement/Interface.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @deprecated
*/
interface Doctrine_Adapter_Statement_Interface
{
......
lib/Doctrine/Association/ManyToMany.php
View file @ 4d7b8838
<?php
#namespace Doctrine::ORM::Mappings;
#namespace Doctrine::ORM::Mapping;
/**
* A many-to-many mapping describes the mapping between two collections of
......
lib/Doctrine/Association/OneToMany.php
View file @ 4d7b8838
......@@ -19,7 +19,7 @@
* <http://www.phpdoctrine.org>.
*/
#namespace Doctrine::ORM::Mappings;
#namespace Doctrine::ORM::Mapping;
/**
* Represents a one-to-many mapping.
......
lib/Doctrine/Cache/Apc.php
View file @ 4d7b8838
......@@ -19,19 +19,16 @@
* <http://www.phpdoctrine.org>.
*/
#namespace Doctrine::Common::Cache;
#namespace Doctrine::ORM::Cache;
/**
* Doctrine_Cache_Apc
* APC cache driver.
*
* @package Doctrine
* @subpackage Cache
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @todo Rename to ApcCache
*/
class Doctrine_Cache_Apc extends Doctrine_Cache_Driver
{
......
lib/Doctrine/Cache/Array.php
View file @ 4d7b8838
......@@ -20,17 +20,15 @@
*/
/**
* Doctrine_Cache_Interface
* Array cache driver.
*
* @package Doctrine
* @subpackage Cache
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
*/
class Doctrine_Cache_Array implements Countable, Doctrine_Cache_Interface
class Doctrine_Cache_Array implements Doctrine_Cache_Interface
{
/**
* @var array $data an array of cached data
......
lib/Doctrine/Cache/Driver.php
View file @ 4d7b8838
......@@ -20,10 +20,8 @@
*/
/**
* Doctrine_Cache_Driver
* Base class for cache drivers.
*
* @package Doctrine
* @subpackage Cache
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.phpdoctrine.org
* @since 1.0
......
lib/Doctrine/Cache/Memcache.php
View file @ 4d7b8838
......@@ -20,10 +20,8 @@
*/
/**
* Doctrine_Cache_Memcache
* Memcache cache driver.
*
* @package Doctrine
* @subpackage Cache
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.phpdoctrine.org
* @since 1.0
......
lib/Doctrine/Cache/Xcache.php
View file @ 4d7b8838
......@@ -20,10 +20,8 @@
*/
/**
* Doctrine_Cache_Xcache
* Xcache cache driver.
*
* @package Doctrine
* @subpackage Cache
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.phpdoctrine.org
* @since 1.0
......
lib/Doctrine/ClassMetadata/CodeDriver.php
View file @ 4d7b8838
......@@ -19,14 +19,14 @@
* <http://www.phpdoctrine.org>.
*/
#namespace Doctrine::ORM::Internal;
/**
* The code metadata driver loads the metadata of the classes through invoking
* a static callback method that needs to be implemented when using this driver.
*
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @author Roman Borschel <roman@code-factory.org>
* @package Doctrine
* @subpackage ClassMetadata
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @version $Revision$
* @link www.phpdoctrine.org
......
lib/Doctrine/ClassMetadata/Exception.php
View file @ 4d7b8838
<?php
//@deprecated
class Doctrine_ClassMetadata_Exception extends Doctrine_Exception {}
\ No newline at end of file
lib/Doctrine/Collection.php
View file @ 4d7b8838
......@@ -22,7 +22,7 @@
#namespace Doctrine::ORM;
/**
* A persistent collection of entities.
* A persistent collection.
*
* A collection object is strongly typed in the sense that it can only contain
* entities of a specific type or one of it's subtypes. A collection object is
......
lib/Doctrine/Collection/Exception.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
class Doctrine_Collection_Exception extends Doctrine_Exception
{ }
\ No newline at end of file
lib/Doctrine/Collection/Iterator.php
View file @ 4d7b8838
......@@ -30,6 +30,7 @@
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
abstract class Doctrine_Collection_Iterator implements Iterator
{
......
lib/Doctrine/Collection/Iterator/Expandable.php
View file @ 4d7b8838
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>.
*/
Doctrine::autoload('Doctrine_Collection_Iterator');
/**
* Doctrine_Collection_Iterator_Normal
*
......@@ -29,6 +29,7 @@ Doctrine::autoload('Doctrine_Collection_Iterator');
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
class Doctrine_Collection_Iterator_Expandable extends Doctrine_Collection_Iterator
{
......
lib/Doctrine/Collection/Iterator/Normal.php
View file @ 4d7b8838
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>.
*/
Doctrine::autoload('Doctrine_Collection_Iterator');
/**
* Doctrine_Collection_Iterator_Normal
*
......@@ -29,6 +29,7 @@ Doctrine::autoload('Doctrine_Collection_Iterator');
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
class Doctrine_Collection_Iterator_Normal extends Doctrine_Collection_Iterator
{
......
lib/Doctrine/Collection/Iterator/Offset.php
View file @ 4d7b8838
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>.
*/
Doctrine::autoload('Doctrine_Collection_Iterator');
/**
* Doctrine_Collection_Iterator_Normal
*
......@@ -29,6 +29,7 @@ Doctrine::autoload('Doctrine_Collection_Iterator');
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
class Doctrine_Collection_Iterator_Offset extends Doctrine_Collection_Iterator
{
......
lib/Doctrine/Collection/Offset.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
class Doctrine_Collection_Offset extends Doctrine_Collection
{
......
lib/Doctrine/Compiler/Exception.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @deprecated
*/
class Doctrine_Compiler_Exception extends Doctrine_Exception
{ }
\ No newline at end of file
lib/Doctrine/Connection.php
View file @ 4d7b8838
This diff is collapsed.
lib/Doctrine/Connection/Common.php
View file @ 4d7b8838
......@@ -30,6 +30,7 @@
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @TODO Remove this class and move the modifyLimitQuery implementation to Connection.
* @deprecated
*/
class Doctrine_Connection_Common extends Doctrine_Connection
{
......
lib/Doctrine/Connection/Db2.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
class Doctrine_Connection_Db2 extends Doctrine_Connection
{
......
lib/Doctrine/Connection/Exception.php
View file @ 4d7b8838
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>.
*/
Doctrine::autoload('Doctrine_Exception');
/**
* Doctrine_Exception
*
......@@ -29,6 +29,7 @@ Doctrine::autoload('Doctrine_Exception');
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
class Doctrine_Connection_Exception extends Doctrine_Exception
{
......
lib/Doctrine/Connection/Firebird.php
View file @ 4d7b8838
......@@ -31,6 +31,7 @@
* @version $Revision$
* @link www.phpdoctrine.org
* @since 1.0
* @deprecated
*/
class Doctrine_Connection_Firebird extends Doctrine_Connection
{
......
lib/Doctrine/Connection/Informix.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
class Doctrine_Connection_Informix extends Doctrine_Connection
{
......
lib/Doctrine/Connection/Module.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
class Doctrine_Connection_Module
{
......
lib/Doctrine/Connection/Mssql.php
View file @ 4d7b8838
......@@ -30,6 +30,7 @@
* @version $Revision$
* @link www.phpdoctrine.org
* @since 1.0
* @deprecated
*/
class Doctrine_Connection_Mssql extends Doctrine_Connection
{
......
lib/Doctrine/Connection/Mysql.php
View file @ 4d7b8838
......@@ -30,6 +30,7 @@
* @version $Revision$
* @link www.phpdoctrine.org
* @since 1.0
* @deprecated
*/
class Doctrine_Connection_Mysql extends Doctrine_Connection_Common
{
......
lib/Doctrine/Connection/Oracle.php
View file @ 4d7b8838
......@@ -27,6 +27,7 @@
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
class Doctrine_Connection_Oracle extends Doctrine_Connection
{
......
lib/Doctrine/Connection/Pgsql.php
View file @ 4d7b8838
......@@ -30,6 +30,7 @@
* @version $Revision$
* @link www.phpdoctrine.org
* @since 1.0
* @deprecated
*/
class Doctrine_Connection_Pgsql extends Doctrine_Connection_Common
{
......
lib/Doctrine/Connection/Profiler.php
View file @ 4d7b8838
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>.
*/
Doctrine::autoload('Doctrine_Overloadable');
/**
* Doctrine_Connection_Profiler
*
......@@ -29,6 +29,8 @@ Doctrine::autoload('Doctrine_Overloadable');
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @deprecated
* @todo remove
*/
class Doctrine_Connection_Profiler implements Doctrine_Overloadable, IteratorAggregate, Countable
{
......
lib/Doctrine/Connection/Profiler/Exception.php
View file @ 4d7b8838
......@@ -18,7 +18,7 @@
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.org>.
*/
Doctrine::autoload('Doctrine_Connection_Profiler_Exception');
/**
* Doctrine_Connection_Profiler_Exception
*
......@@ -29,6 +29,7 @@ Doctrine::autoload('Doctrine_Connection_Profiler_Exception');
* @since 1.0
* @version $Revision: 1345 $
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @deprecated
*/
class Doctrine_Connection_Profiler_Exception extends Doctrine_Exception
{
......
lib/Doctrine/Connection/Sqlite.php
View file @ 4d7b8838
......@@ -32,6 +32,7 @@
* @version $Revision$
* @link www.phpdoctrine.org
* @since 1.0
* @deprecated
*/
class Doctrine_Connection_Sqlite extends Doctrine_Connection_Common
{
......
lib/Doctrine/Connection/Statement.php
View file @ 4d7b8838
......@@ -19,6 +19,8 @@
* <http://www.phpdoctrine.org>.
*/
#namespace Doctrine::DBAL;
/**
* A thin wrapper around PDOStatement.
*
......
lib/Doctrine/Connection/UnitOfWork.php
View file @ 4d7b8838
......@@ -19,7 +19,7 @@
* <http://www.phpdoctrine.org>.
*/
#namespace Doctrine::ORM::Internal;
#namespace Doctrine::ORM;
#use Doctrine::ORM::Entity;
#use Doctrine::ORM::EntityManager;
......@@ -36,7 +36,7 @@
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @author Roman Borschel <roman@code-factory.org>
* @todo Rename: Doctrine::ORM::(Internal::)UnitOfWork.
* @todo Rename: Doctrine::ORM::UnitOfWork.
* @todo Turn connection exceptions into UnitOfWorkExceptions.
*/
class Doctrine_Connection_UnitOfWork
......
lib/Doctrine/DBAL/Connection.php 0 → 100644
View file @ 4d7b8838
<?php
/**
* Connection interface.
* Drivers must implement this interface.
*
* This includes the full PDO interface as well as custom extensions of
* Doctrine's DBAL.
*
* @since 2.0
*/
interface Doctrine_DBAL_Connection
{
const TRANSACTION_READ_UNCOMMITTED = 1;
const TRANSACTION_READ_COMMITTED = 2;
const TRANSACTION_REPEATABLE_READ = 3;
const TRANSACTION_SERIALIZABLE = 4;
/* PDO interface */
public function prepare($prepareString);
public function query($queryString);
public function quote($input);
public function exec($statement);
public function lastInsertId();
public function beginTransaction();
public function commit();
public function rollBack();
public function errorCode();
public function errorInfo();
/* Doctrine DBAL extensions */
public function setTransactionIsolation($level);
public function getTransactionIsolation();
}
?>
\ No newline at end of file
lib/Doctrine/DBAL/Driver.php 0 → 100644
View file @ 4d7b8838
<?php
/**
* Driver interface.
* Interface that all DBAL drivers must implement.
*
* @since 2.0
*/
interface Doctrine_DBAL_Driver
{
/**
* Attempts to create a connection with the database.
*
* @param array $params All connection parameters passed by the user.
* @param string $username The username to use when connecting.
* @param string $password The password to use when connecting.
* @param array $driverOptions The driver options to use when connecting.
* @return Doctrine::DBAL::Connection The database connection.
*/
public function connect(array $params, $username = null, $password = null, array $driverOptions = array());
/**
* Gets the DatabasePlatform instance that provides all the metadata about
* the platform this driver connects to.
*
* @return Doctrine::DBAL::DatabasePlatform The database platform.
*/
public function getDatabasePlatform();
/**
* Gets the SchemaManager that can be used to inspect and change the underlying
* database schema of the platform this driver connects to.
*
* @return Doctrine::DBAL::SchemaManager
*/
public function getSchemaManager();
}
?>
\ No newline at end of file
lib/Doctrine/DBAL/Driver/PDOMsSql/Connection.php 0 → 100644
View file @ 4d7b8838
<?php
#namespace Doctrine::DBAL::Driver::PDOMsSql;
/**
* MsSql Connection implementation.
*
* @since 2.0
*/
class Doctrine_DBAL_Driver_PDOMsSql_Connection extends PDO implements Doctrine_DBAL_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.
*
* @override
*/
public function rollback()
{
$this->exec('ROLLBACK TRANSACTION');
}
/**
* Performs the commit.
*
* @override
*/
public function commit()
{
$this->exec('COMMIT TRANSACTION');
}
/**
* Begins a database transaction.
*
* @override
*/
public function beginTransaction()
{
$this->exec('BEGIN TRANSACTION');
}
}
?>
\ No newline at end of file
lib/Doctrine/DBAL/Driver/PDOMsSql/Driver.php 0 → 100644
View file @ 4d7b8838
<?php
#namespace Doctrine::DBAL::Driver::PDOMySql;
#use Doctrine::DBAL::Driver;
class Doctrine_DBAL_Driver_PDOMsSql_Driver implements Doctrine_DBAL_Driver
{
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
return new PDO($this->_constructPdoDsn($params), $username, $password, $driverOptions);
}
/**
* Constructs the MySql PDO DSN.
*
* Overrides Connection#_constructPdoDsn().
*
* @return string The DSN.
*/
private function _constructPdoDsn(array $params)
{
//TODO
}
public function getDatabasePlatform()
{
return new Doctrine_DatabasePlatform_MySqlPlatform();
}
public function getSchemaManager(Doctrine_Connection $conn)
{
return new Doctrine_Schema_MySqlSchemaManager($conn);
}
}
?>
\ No newline at end of file
lib/Doctrine/DBAL/Driver/PDOMySql/Connection.php 0 → 100644
View file @ 4d7b8838
<?php
class Doctrine_DBAL_Driver_PDOMySql_Connection extends PDO implements Doctrine_DBAL_Connection
{
private $_isolationLevel = Doctrine_DBAL_Connection::TRANSACTION_READ_COMMITTED;
/**
* Set the transacton isolation level.
*
* @param string standard isolation level
* READ UNCOMMITTED (allows dirty reads)
* READ COMMITTED (prevents dirty reads)
* REPEATABLE READ (prevents nonrepeatable reads)
* SERIALIZABLE (prevents phantom reads)
*
* @throws Doctrine_Transaction_Exception if using unknown isolation level
* @throws PDOException if something fails at the PDO level
* @return void
*/
public function setTransactionIsolation($level)
{
$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;
return $this->exec('SET SESSION TRANSACTION ISOLATION LEVEL ' . $sql);
}
/**
* getTransactionIsolation
*
* @return string returns the current session transaction isolation level
*/
public function getTransactionIsolation()
{
return $this->_isolationLevel;
}
}
?>
\ No newline at end of file
lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php 0 → 100644
View file @ 4d7b8838
<?php
#namespace Doctrine::DBAL::Driver::PDOMySql;
#use Doctrine::DBAL::Driver;
class Doctrine_DBAL_Driver_PDOMySql_Driver implements Doctrine_DBAL_Driver
{
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
return new PDO($this->_constructPdoDsn($params), $username, $password, $driverOptions);
}
/**
* Constructs the MySql PDO DSN.
*
* Overrides Connection#_constructPdoDsn().
*
* @return string The DSN.
*/
private function _constructPdoDsn(array $params)
{
$dsn = 'mysql:';
if (isset($params['host'])) {
$dsn .= 'host=' . $params['host'] . ';';
}
if (isset($params['port'])) {
$dsn .= 'port=' . $params['port'] . ';';
}
if (isset($params['dbname'])) {
$dsn .= 'dbname=' . $params['dbname'] . ';';
}
if (isset($params['unix_socket'])) {
$dsn .= 'unix_socket=' . $params['unix_socket'] . ';';
}
return $dsn;
}
public function getDatabasePlatform()
{
return new Doctrine_DatabasePlatform_MySqlPlatform();
}
public function getSchemaManager(Doctrine_Connection $conn)
{
return new Doctrine_Schema_MySqlSchemaManager($conn);
}
}
?>
\ No newline at end of file
lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php 0 → 100644
View file @ 4d7b8838
<?php
#namespace Doctrine::DBAL::Driver::PDOOracle;
#use Doctrine::DBAL::Driver;
class Doctrine_DBAL_Driver_PDOOracle_Driver implements Doctrine_DBAL_Driver
{
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
return new PDO($this->_constructPdoDsn($params), $username, $password, $driverOptions);
}
/**
* Constructs the Oracle PDO DSN.
*
* @return string The DSN.
*/
private function _constructPdoDsn(array $params)
{
//TODO
}
public function getDatabasePlatform()
{
return new Doctrine_DatabasePlatform_OraclePlatform();
}
public function getSchemaManager(Doctrine_Connection $conn)
{
return new Doctrine_Schema_OracleSchemaManager($conn);
}
}
?>
\ No newline at end of file
lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php 0 → 100644
View file @ 4d7b8838
<?php
#namespace Doctrine::DBAL::Driver::PDOPgSql;
/**
* Driver that connects through pdo_pgsql.
*
* @since 2.0
*/
class Doctrine_DBAL_Driver_PDOPgSql_Driver implements Doctrine_DBAL_Driver
{
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
return new PDO($this->_constructPdoDsn($params), $username, $password, $driverOptions);
}
/**
* Constructs the Postgres PDO DSN.
*
* @return string The DSN.
*/
private function _constructPdoDsn(array $params)
{
//TODO
}
public function getDatabasePlatform()
{
return new Doctrine_DatabasePlatform_PostgreSqlPlatform();
}
public function getSchemaManager(Doctrine_Connection $conn)
{
return new Doctrine_Schema_PostgreSqlSchemaManager($conn);
}
}
?>
\ No newline at end of file
lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php 0 → 100644
View file @ 4d7b8838
<?php
#namespace Doctrine::DBAL::Driver::PDOOracle;
#use Doctrine::DBAL::Driver;
class Doctrine_DBAL_Driver_PDOSqlite_Driver implements Doctrine_DBAL_Driver
{
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
return new PDO($this->_constructPdoDsn($params), $username, $password, $driverOptions);
}
/**
* Constructs the Sqlite PDO DSN.
*
* @return string The DSN.
* @override
*/
protected function _constructPdoDsn(array $params)
{
$dsn = 'sqlite:';
if (isset($params['path'])) {
$dsn .= $params['path'];
} else if (isset($params['memory'])) {
$dsn .= ':memory:';
}
return $dsn;
}
public function getDatabasePlatform()
{
return new Doctrine_DatabasePlatform_SqlitePlatform();
}
public function getSchemaManager(Doctrine_Connection $conn)
{
return new Doctrine_Schema_SqliteSchemaManager($conn);
}
}
?>
\ No newline at end of file
lib/Doctrine/DBAL/Platforms/AbstractPlatform.php 0 → 100644
View file @ 4d7b8838
This diff is collapsed.
lib/Doctrine/DBAL/Platforms/Db2Platform.php 0 → 100644
View file @ 4d7b8838
<?php
#namespace Doctrine::DBAL::Platforms;
class Doctrine_DBAL_Platforms_Db2Platform extends Doctrine_DBAL_Platforms_AbstractPlatform
{
public function getSequenceNextValSql($sequenceName) {
return 'SELECT NEXTVAL FOR ' . $this->quoteIdentifier($sequenceName)
. ' FROM SYSIBM.SYSDUMMY1';
}
}
?>
\ No newline at end of file
lib/Doctrine/DatabasePlatform/FirebirdPlatform.php → lib/Doctrine/DBAL/Platforms/FirebirdPlatform.php
View file @ 4d7b8838
......@@ -7,7 +7,7 @@
*
* @since 2.0
*/
class Doctrine_DatabasePlatform_FirebirdPlatform extends Doctrine_DatabasePlatform
class Doctrine_DBAL_Platforms_FirebirdPlatform extends Doctrine_DBAL_Platforms_AbstractPlatform
{
/**
......
lib/Doctrine/DatabasePlatform/InformixPlatform.php → lib/Doctrine/DBAL/Platforms/InformixPlatform.php
View file @ 4d7b8838
......@@ -7,7 +7,7 @@
*
* @since 2.0
*/
class Doctrine_DatabasePlatform_InformixPlatform extends Doctrine_DatabasePlatform
class Doctrine_DBAL_Platforms_InformixPlatform extends Doctrine_DBAL_Platforms_AbstractPlatform
{
public function __construct()
......
lib/Doctrine/DatabasePlatform/MockPlatform.php → lib/Doctrine/DBAL/Platforms/MockPlatform.php
View file @ 4d7b8838
<?php
#namespace Doctrine::DBAL::Platforms;
class Doctrine_DatabasePlatform_MockPlatform extends Doctrine_DatabasePlatform
class Doctrine_DBAL_Platforms_MockPlatform extends Doctrine_DBAL_Platforms_AbstractPlatform
{
public function getNativeDeclaration(array $field) {}
public function getPortableDeclaration(array $field) {}
......
lib/Doctrine/DatabasePlatform/MsSqlPlatform.php → lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php
View file @ 4d7b8838
<?php
class Doctrine_DatabasePlatform_MsSqlPlatform extends Doctrine_DatabasePlatform
#namespace Doctrine::DBAL::Platforms;
class Doctrine_DBAL_Platforms_MsSqlPlatform extends Doctrine_DBAL_Platforms_AbstractPlatform
{
/**
* the constructor
......@@ -279,6 +281,36 @@ class Doctrine_DatabasePlatform_MsSqlPlatform extends Doctrine_DatabasePlatform
'fixed' => $fixed);
}
/**
* Quote a string so it can be safely used as a table / column name
*
* Quoting style depends on which database driver is being used.
*
* @param string $identifier identifier name to be quoted
* @param bool $checkOption check the 'quote_identifier' option
*
* @return string quoted identifier string
* @override
*/
public function quoteIdentifier($identifier, $checkOption = false)
{
if ($checkOption && ! $this->getAttribute(Doctrine::ATTR_QUOTE_IDENTIFIER)) {
return $identifier;
}
if (strpos($identifier, '.') !== false) {
$parts = explode('.', $identifier);
$quotedParts = array();
foreach ($parts as $p) {
$quotedParts[] = $this->quoteIdentifier($p);
}
return implode('.', $quotedParts);
}
return '[' . str_replace(']', ']]', $identifier) . ']';
}
}
?>
\ No newline at end of file
lib/Doctrine/DatabasePlatform/MySqlPlatform.php → lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
View file @ 4d7b8838
......@@ -19,6 +19,8 @@
* <http://www.phpdoctrine.org>.
*/
#namespace Doctrine::DBAL::Platforms;
/**
* The MySqlPlatform provides the behavior, features and SQL dialect of the
* MySQL database platform.
......@@ -26,7 +28,7 @@
* @since 2.0
* @author Roman Borschel <roman@code-factory.org>
*/
class Doctrine_DatabasePlatform_MySqlPlatform extends Doctrine_DatabasePlatform
class Doctrine_DBAL_Platforms_MySqlPlatform extends Doctrine_DBAL_Platforms_AbstractPlatform
{
/**
* MySql reserved words.
......
lib/Doctrine/DatabasePlatform/OraclePlatform.php → lib/Doctrine/DBAL/Platforms/OraclePlatform.php
View file @ 4d7b8838
......@@ -19,6 +19,8 @@
* <http://www.phpdoctrine.org>.
*/
#namespace Doctrine::DBAL::Platforms;
/**
* Base class for all DatabasePlatforms. The DatabasePlatforms are the central
* point of abstraction of platform-specific behaviors, features and SQL dialects.
......@@ -28,7 +30,7 @@
* @author Roman Borschel <roman@code-factory.org>
* @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
*/
class Doctrine_DatabasePlatform_OraclePlatform extends Doctrine_DatabasePlatform
class Doctrine_DBAL_Platforms_OraclePlatform extends Doctrine_DBAL_Platforms_AbstractPlatform
{
/**
* Constructor.
......
lib/Doctrine/DatabasePlatform/PostgreSqlPlatform.php → lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
View file @ 4d7b8838
<?php
#namespace Doctrine::DBAL::Platforms;
class Doctrine_DatabasePlatform_PostgreSqlPlatform extends Doctrine_DatabasePlatform
class Doctrine_DBAL_Platforms_PostgreSqlPlatform extends Doctrine_DBAL_Platforms_AbstractPlatform
{
/**
* The reserved keywords by pgsql. Ordered alphabetically.
......
lib/Doctrine/DatabasePlatform/SqlitePlatform.php → lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
View file @ 4d7b8838
......@@ -7,7 +7,7 @@
*
* @since 2.0
*/
class Doctrine_DatabasePlatform_SqlitePlatform extends Doctrine_DatabasePlatform
class Doctrine_DBAL_Platforms_SqlitePlatform extends Doctrine_DBAL_Platforms_AbstractPlatform
{
/**
......
lib/Doctrine/DBAL/Statement.php 0 → 100644
View file @ 4d7b8838
This diff is collapsed.
lib/Doctrine/DataType/ArrayType.php → lib/Doctrine/DBAL/Types/ArrayType.php
View file @ 4d7b8838
......@@ -5,7 +5,7 @@
*
* @since 2.0
*/
class Doctrine_DataType_ArrayType extends Doctrine_DataType
class Doctrine_DBAL_Types_ArrayType extends Doctrine_DBAL_Types_Type
{
......
lib/Doctrine/DataType/BooleanType.php → lib/Doctrine/DBAL/Types/BooleanType.php
View file @ 4d7b8838
......@@ -4,7 +4,7 @@
* Type that maps an SQL boolean to a PHP boolean.
*
*/
class Doctrine_DataType_BooleanType extends Doctrine_DataType
class Doctrine_DBAL_Types_BooleanType extends Doctrine_DBAL_Types_Type
{
/**
* Enter description here...
......
lib/Doctrine/DataType/DateTimeType.php → lib/Doctrine/DBAL/Types/DateTimeType.php
View file @ 4d7b8838
......@@ -5,7 +5,7 @@
*
* @since 2.0
*/
class Doctrine_DataType_DateTimeType extends Doctrine_DataType
class Doctrine_DBAL_Types_DateTimeType extends Doctrine_DBAL_Types_Type
{
/**
* Enter description here...
......
lib/Doctrine/DataType/DecimalType.php → lib/Doctrine/DBAL/Types/DecimalType.php
View file @ 4d7b8838
......@@ -4,7 +4,7 @@
* Type that maps an SQL DECIMAL to a PHP double.
*
*/
class Doctrine_DataType_DecimalType extends Doctrine_DataType
class Doctrine_DBAL_Types_DecimalType extends Doctrine_DBAL_Types_Type
{
}
......
lib/Doctrine/DataType/IntegerType.php → lib/Doctrine/DBAL/Types/IntegerType.php
View file @ 4d7b8838
......@@ -4,7 +4,7 @@
* Type that maps an SQL INT/MEDIUMINT/BIGINT to a PHP integer.
*
*/
class Doctrine_DataType_IntegerType extends Doctrine_DataType
class Doctrine_DBAL_Types_IntegerType extends Doctrine_DBAL_Types_Type
{
......
lib/Doctrine/DataType/StringType.php → lib/Doctrine/DBAL/Types/StringType.php
View file @ 4d7b8838
......@@ -7,7 +7,7 @@
*
* @since 2.0
*/
class Doctrine_DataType_StringType extends Doctrine_DataType
class Doctrine_DBAL_Types_StringType extends Doctrine_DBAL_Types_Type
{
public function getSqlDeclaration(array $fieldDeclaration, Doctrine_DatabasePlatform $platform)
{
......
lib/Doctrine/DataType/TextType.php → lib/Doctrine/DBAL/Types/TextType.php
View file @ 4d7b8838
......@@ -5,7 +5,7 @@
*
* @since 2.0
*/
class Doctrine_DataType_TextType extends Doctrine_DataType
class Doctrine_DBAL_Types_TextType extends Doctrine_DBAL_Types_Type
{
/**
* Enter description here...
......
lib/Doctrine/DatabasePlatform.php
View file @ 4d7b8838
......@@ -1763,6 +1763,18 @@ abstract class Doctrine_DatabasePlatform
return $item;
}
/**
* Enter description here...
*
* @param unknown_type $charset
* @return string
*/
public function getSetCharsetSql($charset)
{
return 'SET NAMES ' . $this->quote($charset);
}
/* supports*() metods */
public function supportsSequences()
......
lib/Doctrine/Hydrator/ArrayDriver.php
View file @ 4d7b8838
......@@ -19,6 +19,8 @@
* <http://www.phpdoctrine.org>.
*/
#namespace Doctrine::ORM::Internal;
/**
* Defines an array hydration strategy.
*
......
lib/Doctrine/Schema/MySqlSchemaManger.php
View file @ 4d7b8838
......@@ -32,15 +32,6 @@
*/
class Doctrine_Schema_MySqlSchemaManager extends Doctrine_Schema_SchemaManager
{
/*protected $_sql = array(
'showDatabases' => 'SHOW DATABASES',
'listTableFields' => 'DESCRIBE %s',
'listSequences' => 'SHOW TABLES',
'listTables' => 'SHOW TABLES',
'listUsers' => 'SELECT DISTINCT USER FROM USER',
'listViews' => "SHOW FULL TABLES %s WHERE Table_type = 'VIEW'",
);*/
public function __construct(Doctrine_Connection $conn)
{
$this->_conn = $conn;
......
lib/Doctrine/Transaction.php
View file @ 4d7b8838
......@@ -31,6 +31,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @deprecated
*/
class Doctrine_Transaction extends Doctrine_Connection_Module
{
......@@ -110,29 +111,17 @@ class Doctrine_Transaction extends Doctrine_Connection_Module
public function begin($savepoint = null)
{
$this->conn->connect();
//$listener = $this->conn->getAttribute(Doctrine::ATTR_LISTENER);
if ( ! is_null($savepoint)) {
$this->savePoints[] = $savepoint;
//$event = new Doctrine_Event($this, Doctrine_Event::SAVEPOINT_CREATE);
//$listener->preSavepointCreate($event);
//if ( ! $event->skipOperation) {
$this->createSavePoint($savepoint);
//}
//$listener->postSavepointCreate($event);
} else {
if ($this->_nestingLevel == 0) {
//$event = new Doctrine_Event($this, Doctrine_Event::TX_BEGIN);
//$listener->preTransactionBegin($event);
//if ( ! $event->skipOperation) {
try {
$this->_doBeginTransaction();
} catch (Exception $e) {
throw new Doctrine_Transaction_Exception($e->getMessage());
}
//}
//$listener->postTransactionBegin($event);
}
}
......@@ -161,24 +150,12 @@ class Doctrine_Transaction extends Doctrine_Connection_Module
$this->conn->connect();
//$listener = $this->conn->getAttribute(Doctrine::ATTR_LISTENER);
if ( ! is_null($savepoint)) {
$this->_nestingLevel -= $this->removeSavePoints($savepoint);
//$event = new Doctrine_Event($this, Doctrine_Event::SAVEPOINT_COMMIT);
//$listener->preSavepointCommit($event);
//if ( ! $event->skipOperation) {
$this->releaseSavePoint($savepoint);
//}
//$listener->postSavepointCommit($event);
} else {
if ($this->_nestingLevel == 1) {
//$event = new Doctrine_Event($this, Doctrine_Event::TX_COMMIT);
//$listener->preTransactionCommit($event);
//if ( ! $event->skipOperation) {
$this->_doCommit();
//}
//$listener->postTransactionCommit($event);
}
if ($this->_nestingLevel > 0) {
......@@ -219,24 +196,14 @@ class Doctrine_Transaction extends Doctrine_Connection_Module
if ( ! is_null($savepoint)) {
$this->_nestingLevel -= $this->removeSavePoints($savepoint);
//$event = new Doctrine_Event($this, Doctrine_Event::SAVEPOINT_ROLLBACK);
//$listener->preSavepointRollback($event);
//if ( ! $event->skipOperation) {
$this->rollbackSavePoint($savepoint);
//}
//$listener->postSavepointRollback($event);
} else {
//$event = new Doctrine_Event($this, Doctrine_Event::TX_ROLLBACK);
//$listener->preTransactionRollback($event);
//if ( ! $event->skipOperation) {
$this->_nestingLevel = 0;
try {
$this->_doRollback();
} catch (Exception $e) {
throw new Doctrine_Transaction_Exception($e->getMessage());
}
//}
//$listener->postTransactionRollback($event);
}
return true;
......
lib/Doctrine/Transaction/Exception.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@ Doctrine::autoload('Doctrine_Exception');
* @since 1.0
* @version $Revision$
* @link www.phpdoctrine.org
* @todo remove
*/
class Doctrine_Transaction_Exception extends Doctrine_Exception
{ }
\ No newline at end of file
lib/Doctrine/Transaction/Firebird.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @todo remove
*/
class Doctrine_Transaction_Firebird extends Doctrine_Transaction
{
......
lib/Doctrine/Transaction/Informix.php
View file @ 4d7b8838
......@@ -27,6 +27,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @todo remove
*/
class Doctrine_Transaction_Informix extends Doctrine_Transaction
{ }
\ No newline at end of file
lib/Doctrine/Transaction/Mock.php
View file @ 4d7b8838
......@@ -31,6 +31,7 @@ Doctrine::autoload('Doctrine_Transaction');
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @todo remove
*/
class Doctrine_Transaction_Mock extends Doctrine_Transaction
{ }
\ No newline at end of file
lib/Doctrine/Transaction/Mssql.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @todo remove
*/
class Doctrine_Transaction_Mssql extends Doctrine_Transaction
{
......
lib/Doctrine/Transaction/Mysql.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @todo remove
*/
class Doctrine_Transaction_Mysql extends Doctrine_Transaction
{
......
lib/Doctrine/Transaction/Oracle.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @todo remove
*/
class Doctrine_Transaction_Oracle extends Doctrine_Transaction
{
......
lib/Doctrine/Transaction/Pgsql.php
View file @ 4d7b8838
......@@ -30,6 +30,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @todo remove
*/
class Doctrine_Transaction_Pgsql extends Doctrine_Transaction
{
......
lib/Doctrine/Transaction/Sqlite.php
View file @ 4d7b8838
......@@ -29,6 +29,7 @@
* @link www.phpdoctrine.org
* @since 1.0
* @version $Revision$
* @todo remove
*/
class Doctrine_Transaction_Sqlite extends Doctrine_Transaction
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment