Permalink
Browse files

[2.0] Another step towards finishing namespace refactoring

  • Loading branch information...
1 parent 43b6791 commit d458197e3a78aba49e7aa759e8d5c1ad86fb0a59 jwage committed Feb 20, 2009
Showing with 460 additions and 1,009 deletions.
  1. +0 −39 lib/Doctrine/Common/Configurable.php
  2. +6 −6 lib/Doctrine/DBAL/Connection.php
  3. +3 −4 lib/Doctrine/DBAL/Driver.php
  4. +1 −1 lib/Doctrine/DBAL/Driver/PDOConnection.php
  5. +4 −5 lib/Doctrine/DBAL/Driver/PDOMsSql/Connection.php
  6. +12 −14 lib/Doctrine/DBAL/Driver/PDOMsSql/Driver.php
  7. +9 −10 lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php
  8. +11 −11 lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php
  9. +17 −18 lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php
  10. +9 −13 lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php
  11. +1 −1 lib/Doctrine/DBAL/Driver/PDOStatement.php
  12. +10 −10 lib/Doctrine/DBAL/Driver/Statement.php
  13. +3 −4 lib/Doctrine/DBAL/DriverManager.php
  14. +1 −3 lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
  15. +1 −4 lib/Doctrine/DBAL/Platforms/Db2Platform.php
  16. +1 −5 lib/Doctrine/DBAL/Platforms/FirebirdPlatform.php
  17. +1 −5 lib/Doctrine/DBAL/Platforms/InformixPlatform.php
  18. +1 −2 lib/Doctrine/DBAL/Platforms/MockPlatform.php
  19. +1 −3 lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php
  20. +1 −3 lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
  21. +1 −3 lib/Doctrine/DBAL/Platforms/OraclePlatform.php
  22. +2 −4 lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
  23. +1 −3 lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
  24. +3 −5 lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
  25. +3 −6 lib/Doctrine/DBAL/Schema/FirebirdSchemaManager.php
  26. +20 −25 lib/Doctrine/DBAL/Schema/InformixSchemaManager.php
  27. +1 −4 lib/Doctrine/DBAL/Schema/MsSqlSchemaManager.php
  28. +3 −6 lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
  29. +1 −4 lib/Doctrine/DBAL/Schema/OracleSchemaManager.php
  30. +2 −4 lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
  31. +3 −4 lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php
  32. +10 −10 lib/Doctrine/DBAL/Statement.php
  33. +1 −4 lib/Doctrine/DBAL/Types/ArrayType.php
  34. +1 −2 lib/Doctrine/DBAL/Types/BigIntType.php
  35. +1 −2 lib/Doctrine/DBAL/Types/BooleanType.php
  36. +1 −2 lib/Doctrine/DBAL/Types/CharType.php
  37. +1 −3 lib/Doctrine/DBAL/Types/DateTimeType.php
  38. +1 −2 lib/Doctrine/DBAL/Types/DecimalType.php
  39. +0 −1 lib/Doctrine/DBAL/Types/IntegerType.php
  40. +1 −2 lib/Doctrine/DBAL/Types/MediumIntType.php
  41. +1 −2 lib/Doctrine/DBAL/Types/SmallIntType.php
  42. +1 −3 lib/Doctrine/DBAL/Types/TextType.php
  43. +1 −2 lib/Doctrine/DBAL/Types/TinyIntType.php
  44. +2 −3 lib/Doctrine/DBAL/Types/Type.php
  45. +5 −3 lib/Doctrine/DBAL/Types/VarcharType.php
  46. +0 −57 lib/Doctrine/Exception.php
  47. +1 −1 lib/Doctrine/ORM/Cache/ApcCache.php
  48. +1 −1 lib/Doctrine/ORM/Cache/ArrayCache.php
  49. +1 −1 lib/Doctrine/ORM/Cache/Cache.php
  50. +1 −1 lib/Doctrine/ORM/Cache/DbCache.php
  51. +1 −1 lib/Doctrine/ORM/Cache/MemcacheCache.php
  52. +1 −3 lib/Doctrine/ORM/Events.php
  53. +3 −3 lib/Doctrine/ORM/Id/AbstractIdGenerator.php
  54. +1 −2 lib/Doctrine/ORM/Id/Assigned.php
  55. +3 −3 lib/Doctrine/ORM/Id/IdentityGenerator.php
  56. +1 −2 lib/Doctrine/ORM/Id/SequenceGenerator.php
  57. +1 −3 lib/Doctrine/ORM/Id/SequenceIdentityGenerator.php
  58. +1 −4 lib/Doctrine/ORM/Id/TableGenerator.php
  59. +0 −34 lib/Doctrine/ORM/Import/Exception.php
  60. +4 −16 lib/Doctrine/ORM/Import/{Reader.php → Reader/AbstractReader.php}
  61. +3 −7 lib/Doctrine/ORM/Import/Reader/Db.php
  62. +0 −42 lib/Doctrine/ORM/Import/Reader/Exception.php
  63. +4 −9 lib/Doctrine/ORM/Import/Reader/Propel.php
  64. +1 −3 lib/Doctrine/ORM/Internal/CommitOrderCalculator.php
  65. +1 −2 lib/Doctrine/ORM/Internal/CommitOrderNode.php
  66. +1 −1 lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
  67. +1 −2 lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
  68. +0 −49 lib/Doctrine/ORM/Internal/Hydration/Exception.php
  69. +1 −4 lib/Doctrine/ORM/Internal/Hydration/HydrationException.php
  70. +1 −2 lib/Doctrine/ORM/Internal/Hydration/IterableResult.php
  71. +1 −2 lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
  72. +1 −2 lib/Doctrine/ORM/Internal/Hydration/ScalarHydrator.php
  73. +1 −2 lib/Doctrine/ORM/Internal/Hydration/SingleScalarHydrator.php
  74. +1 −2 lib/Doctrine/ORM/Mapping/AssociationMapping.php
  75. +1 −2 lib/Doctrine/ORM/Mapping/ClassMetadata.php
  76. +1 −4 lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
  77. +1 −1 lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
  78. +1 −1 lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
  79. +1 −2 lib/Doctrine/ORM/Mapping/ManyToManyMapping.php
  80. +1 −3 lib/Doctrine/ORM/Mapping/MappingException.php
  81. +1 −3 lib/Doctrine/ORM/Mapping/OneToManyMapping.php
  82. +1 −3 lib/Doctrine/ORM/Mapping/OneToOneMapping.php
  83. +1 −1 lib/Doctrine/ORM/PersistentCollection.php
  84. +1 −2 lib/Doctrine/ORM/Persisters/AbstractCollectionPersister.php
  85. +1 −1 lib/Doctrine/ORM/Persisters/AbstractEntityPersister.php
  86. +1 −2 lib/Doctrine/ORM/Persisters/ElementCollectionPersister.php
  87. +0 −38 lib/Doctrine/ORM/Persisters/Exception.php
  88. +1 −2 lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php
  89. +1 −2 lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
  90. +1 −3 lib/Doctrine/ORM/Persisters/OneToManyPersister.php
  91. +6 −1 lib/Doctrine/ORM/Persisters/SingleTablePersister.php
  92. +6 −1 lib/Doctrine/ORM/Persisters/UnionSubclassPersister.php
  93. +1 −1 lib/Doctrine/ORM/Query.php
  94. +1 −2 lib/Doctrine/ORM/Query/AST/AggregateExpression.php
  95. +9 −6 lib/Doctrine/ORM/Query/AST/ArithmeticExpression.php
  96. +1 −2 lib/Doctrine/ORM/Query/AST/ArithmeticFactor.php
  97. +1 −2 lib/Doctrine/ORM/Query/AST/ArithmeticTerm.php
  98. +1 −2 lib/Doctrine/ORM/Query/AST/ComparisonExpression.php
  99. +1 −2 lib/Doctrine/ORM/Query/AST/ComparisonOperator.php
  100. +1 −2 lib/Doctrine/ORM/Query/AST/ConditionalExpression.php
  101. +1 −2 lib/Doctrine/ORM/Query/AST/ConditionalFactor.php
  102. +3 −4 lib/Doctrine/ORM/Query/AST/ConditionalPrimary.php
  103. +1 −2 lib/Doctrine/ORM/Query/AST/ConditionalTerm.php
  104. +1 −7 lib/Doctrine/ORM/Query/AST/DeleteStatement.php
  105. +1 −5 lib/Doctrine/ORM/Query/AST/FromClause.php
  106. +1 −4 lib/Doctrine/ORM/Query/AST/Function.php
  107. +1 −2 lib/Doctrine/ORM/Query/AST/GroupByClause.php
  108. +0 −1 lib/Doctrine/ORM/Query/AST/IdentificationVariableDeclaration.php
  109. +1 −2 lib/Doctrine/ORM/Query/AST/InputParameter.php
  110. +1 −13 lib/Doctrine/ORM/Query/AST/Join.php
  111. +1 −2 lib/Doctrine/ORM/Query/AST/JoinPathExpression.php
  112. +0 −4 lib/Doctrine/ORM/Query/AST/JoinVariableDeclaration.php
  113. +1 −2 lib/Doctrine/ORM/Query/AST/LikeExpression.php
  114. +1 −2 lib/Doctrine/ORM/Query/AST/PathExpression.php
  115. +0 −2 lib/Doctrine/ORM/Query/AST/RangeVariableDeclaration.php
  116. +1 −6 lib/Doctrine/ORM/Query/AST/SelectClause.php
  117. +0 −1 lib/Doctrine/ORM/Query/AST/SelectExpression.php
  118. +0 −6 lib/Doctrine/ORM/Query/AST/SelectStatement.php
  119. +1 −2 lib/Doctrine/ORM/Query/AST/SimpleArithmeticExpression.php
  120. +0 −2 lib/Doctrine/ORM/Query/AST/SimpleStateFieldPathExpression.php
  121. +0 −7 lib/Doctrine/ORM/Query/AST/UpdateStatetement.php
  122. +1 −2 lib/Doctrine/ORM/Query/AST/WhereClause.php
  123. +0 −16 lib/Doctrine/ORM/Query/AbstractResult.php
  124. +6 −11 lib/Doctrine/ORM/Query/CacheHandler.php
  125. +0 −37 lib/Doctrine/ORM/Query/Exception.php
  126. +0 −2 lib/Doctrine/ORM/Query/Exec/AbstractExecutor.php
  127. +5 −3 lib/Doctrine/ORM/Query/Exec/MultiTableDeleteExecutor.php
  128. +5 −3 lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php
  129. +1 −1 lib/Doctrine/ORM/Query/Lexer.php
  130. +1 −3 lib/Doctrine/ORM/Query/Parser.php
  131. +7 −8 lib/Doctrine/ORM/Query/Parser/AbstractSchemaName.php
  132. +4 −3 lib/Doctrine/ORM/Query/Parser/AliasIdentificationVariable.php
  133. +5 −2 lib/Doctrine/ORM/Query/Parser/CollectionValuedAssociationField.php
  134. +4 −2 lib/Doctrine/ORM/Query/Parser/DeleteStatement.php
  135. +5 −2 lib/Doctrine/ORM/Query/Parser/EmbeddedClassStateField.php
  136. +0 −35 lib/Doctrine/ORM/Query/Parser/Exception.php
  137. +4 −2 lib/Doctrine/ORM/Query/Parser/FieldAliasIdentificationVariable.php
  138. +4 −2 lib/Doctrine/ORM/Query/Parser/FieldIdentificationVariable.php
  139. +4 −3 lib/Doctrine/ORM/Query/Parser/FromClause.php
  140. +4 −4 lib/Doctrine/ORM/Query/Parser/IdentificationVariable.php
  141. +7 −5 lib/Doctrine/ORM/Query/Parser/IdentificationVariableDeclaration.php
  142. +5 −5 lib/Doctrine/ORM/Query/Parser/IndexBy.php
  143. +17 −16 lib/Doctrine/ORM/Query/Parser/Join.php
  144. +5 −4 lib/Doctrine/ORM/Query/Parser/JoinAssociationPathExpression.php
  145. +5 −5 lib/Doctrine/ORM/Query/Parser/JoinCollectionValuedPathExpression.php
  146. +4 −4 lib/Doctrine/ORM/Query/Parser/JoinSingleValuedAssociationPathExpression.php
  147. +4 −4 lib/Doctrine/ORM/Query/Parser/JoinVariableDeclaration.php
  148. +6 −4 lib/Doctrine/ORM/Query/Parser/QueryLanguage.php
  149. +5 −5 lib/Doctrine/ORM/Query/Parser/RangeVariableDeclaration.php
  150. +6 −9 lib/Doctrine/ORM/Query/Parser/SelectClause.php
  151. +7 −10 lib/Doctrine/ORM/Query/Parser/SelectExpression.php
  152. +7 −8 lib/Doctrine/ORM/Query/Parser/SelectStatement.php
  153. +5 −2 lib/Doctrine/ORM/Query/Parser/SimpleStateField.php
  154. +5 −5 lib/Doctrine/ORM/Query/Parser/SimpleStateFieldPathExpression.php
  155. +5 −2 lib/Doctrine/ORM/Query/Parser/SingleValuedAssociationField.php
  156. +6 −5 lib/Doctrine/ORM/Query/Parser/StateField.php
  157. +5 −3 lib/Doctrine/ORM/Query/Parser/UpdateStatement.php
  158. +1 −9 lib/Doctrine/ORM/Query/ParserDataHolder.php
  159. +1 −10 lib/Doctrine/ORM/Query/ParserResult.php
  160. +1 −5 lib/Doctrine/ORM/Query/ParserResultDummy.php
  161. +2 −12 lib/Doctrine/ORM/Query/ParserRule.php
  162. +4 −2 lib/Doctrine/ORM/Query/Printer.php
  163. +13 −12 lib/Doctrine/ORM/Query/Production/AggregateExpression.php
  164. +4 −5 lib/Doctrine/ORM/Query/Production/Factor.php
  165. +7 −4 lib/Doctrine/ORM/Query/QueryException.php
  166. +4 −3 lib/Doctrine/ORM/Query/QueryResult.php
  167. +1 −2 lib/Doctrine/ORM/Query/SqlWalker.php
  168. +1 −6 lib/Doctrine/ORM/Query/Token.php
  169. +1 −2 lib/Doctrine/ORM/VirtualProxy.php
@@ -1,39 +0,0 @@
-<?php
-/*
- * $Id: Configurable.php 4523 2008-06-15 15:56:28Z romanb $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.org>.
- */
-
-#namespace Doctrine::Common;
-
-/**
- * Doctrine_Configurable
- *
- * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link www.phpdoctrine.org
- * @since 2.0
- * @version $Revision: 4523 $
- * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @author Roman Borschel <roman@code-factory.org>
- */
-interface Doctrine_Common_Configurable
-{
- public function getAttribute($name);
- public function setAttribute($name, $value);
- public function hasAttribute($name);
-}
@@ -284,7 +284,7 @@ public function delete($tableName, array $identifier)
/**
* Updates table row(s) with specified data
*
- * @throws Doctrine_Connection_Exception if something went wrong at the database level
+ * @throws Doctrine\DBAL\ConnectionException if something went wrong at the database level
* @param string $table The table to insert data into
* @param array $values An associateve array containing column-value pairs.
* @return mixed boolean false if empty value array was given,
@@ -509,7 +509,7 @@ public function select($query, $limit = 0, $offset = 0)
* @param string $query sql query
* @param array $params query parameters
*
- * @return PDOStatement|Doctrine_Adapter_Statement
+ * @return PDOStatement
*/
public function execute($query, array $params = array())
{
@@ -536,7 +536,7 @@ public function execute($query, array $params = array())
* @param string $query sql query
* @param array $params query parameters
*
- * @return PDOStatement|Doctrine_Adapter_Statement
+ * @return PDOStatement
* @todo Rename to executeUpdate().
*/
public function exec($query, array $params = array()) {
@@ -562,7 +562,7 @@ public function exec($query, array $params = array()) {
/**
* Wraps the given exception into a driver-specific exception and rethrows it.
*
- * @throws Doctrine_Connection_Exception
+ * @throws Doctrine\DBAL\ConnectionException
*/
public function rethrowException(Exception $e, $invoker)
{
@@ -711,7 +711,7 @@ public function commit()
* eventlistener methods
*
* @param string $savepoint Name of a savepoint to rollback to.
- * @throws Doctrine_Transaction_Exception If the rollback operation fails at database level.
+ * @throws Doctrine\DBAL\ConnectionException If the rollback operation fails at database level.
* @return boolean FALSE if rollback couldn't be performed, TRUE otherwise.
*/
public function rollback()
@@ -772,4 +772,4 @@ public function getSchemaManager()
}
return $this->_schemaManager;
}
-}
+}
@@ -20,21 +20,20 @@
* @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(Connection $conn);
-}
-
+}
@@ -19,4 +19,4 @@ public function __construct($dsn, $user = null, $password = null, array $options
$this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$this->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
}
-}
+}
@@ -7,7 +7,7 @@
*
* @since 2.0
*/
-class Connection extends PDO implements \Doctrine\DBAL\Driver\Connection
+class Connection extends PDO implements \Doctrine\DBAL\Driver\PDOConnection
{
/**
* Performs the rollback.
@@ -18,7 +18,7 @@ public function rollback()
{
$this->exec('ROLLBACK TRANSACTION');
}
-
+
/**
* Performs the commit.
*
@@ -28,7 +28,7 @@ public function commit()
{
$this->exec('COMMIT TRANSACTION');
}
-
+
/**
* Begins a database transaction.
*
@@ -38,5 +38,4 @@ public function beginTransaction()
{
$this->exec('BEGIN TRANSACTION');
}
-}
-
+}
@@ -4,16 +4,16 @@
class Driver implements \Doctrine\DBAL\Driver
{
-
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
return new Connection(
- $this->_constructPdoDsn($params),
- $username,
- $password,
- $driverOptions);
+ $this->_constructPdoDsn($params),
+ $username,
+ $password,
+ $driverOptions
+ );
}
-
+
/**
* Constructs the MySql PDO DSN.
*
@@ -25,16 +25,14 @@ private function _constructPdoDsn(array $params)
{
//TODO
}
-
+
public function getDatabasePlatform()
{
- return new Doctrine_DatabasePlatform_MySqlPlatform();
+ return new \Doctrine\DBAL\Platforms\MsSqlPlatform();
}
-
- public function getSchemaManager(Doctrine_Connection $conn)
+
+ public function getSchemaManager(\Doctrine\DBAL\Connection $conn)
{
- return new Doctrine_Schema_MySqlSchemaManager($conn);
+ return new \Doctrine\DBAL\Schema\MsSqlSchemaManager($conn);
}
-
-}
-
+}
@@ -40,14 +40,15 @@ class Driver implements \Doctrine\DBAL\Driver
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
$conn = new \Doctrine\DBAL\Driver\PDOConnection(
- $this->_constructPdoDsn($params),
- $username,
- $password,
- $driverOptions);
+ $this->_constructPdoDsn($params),
+ $username,
+ $password,
+ $driverOptions
+ );
$conn->setAttribute(\PDO::ATTR_AUTOCOMMIT, false);
return $conn;
}
-
+
/**
* Constructs the MySql PDO DSN.
*
@@ -73,16 +74,14 @@ private function _constructPdoDsn(array $params)
return $dsn;
}
-
+
public function getDatabasePlatform()
{
return new \Doctrine\DBAL\Platforms\MySqlPlatform();
}
-
+
public function getSchemaManager(\Doctrine\DBAL\Connection $conn)
{
return new \Doctrine\DBAL\Schema\MySqlSchemaManager($conn);
}
-
-}
-
+}
@@ -2,18 +2,20 @@
namespace Doctrine\DBAL\Driver\PDOOracle;
+use Doctrine\DBAL\Platforms;
+
class Driver implements \Doctrine\DBAL\Driver
{
-
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
return new \Doctrine\DBAL\Driver\PDOConnection(
- $this->_constructPdoDsn($params),
- $username,
- $password,
- $driverOptions);
+ $this->_constructPdoDsn($params),
+ $username,
+ $password,
+ $driverOptions
+ );
}
-
+
/**
* Constructs the Oracle PDO DSN.
*
@@ -23,16 +25,14 @@ private function _constructPdoDsn(array $params)
{
//TODO
}
-
+
public function getDatabasePlatform()
{
return new \Doctrine\DBAL\Platforms\OraclePlatform();
}
-
+
public function getSchemaManager(\Doctrine\DBAL\Connection $conn)
{
return new \Doctrine\DBAL\Schema\OracleSchemaManager($conn);
}
-
-}
-
+}
@@ -1,24 +1,26 @@
<?php
-#namespace Doctrine::DBAL::Driver::PDOPgSql;
+namespace Doctrine\DBAL\Driver\PDOPgSql;
+
+use Doctrine\DBAL\Platforms;
/**
* Driver that connects through pdo_pgsql.
*
* @since 2.0
*/
-class Doctrine_DBAL_Driver_PDOPgSql_Driver implements Doctrine_DBAL_Driver
+class Driver implements \Doctrine\DBAL\Driver
{
-
public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
{
- return new Doctrine_DBAL_Driver_PDOConnection(
- $this->_constructPdoDsn($params),
- $username,
- $password,
- $driverOptions);
+ return new \Doctrine\DBAL\Driver\PDOConnection(
+ $this->_constructPdoDsn($params),
+ $username,
+ $password,
+ $driverOptions
+ );
}
-
+
/**
* Constructs the Postgres PDO DSN.
*
@@ -28,17 +30,14 @@ private function _constructPdoDsn(array $params)
{
//TODO
}
-
+
public function getDatabasePlatform()
{
- return new Doctrine_DBAL_Platforms_PostgreSqlPlatform();
+ return new \Doctrine\DBAL\Platforms\PostgreSqlPlatform();
}
-
- public function getSchemaManager(Doctrine_DBAL_Connection $conn)
+
+ public function getSchemaManager(\Doctrine\DBAL\Connection $conn)
{
- return new Doctrine_DBAL_Schema_PostgreSqlSchemaManager($conn);
+ return new \Doctrine\DBAL\Schema\PostgreSqlSchemaManager($conn);
}
-
-}
-
-?>
+}
Oops, something went wrong.

0 comments on commit d458197

Please sign in to comment.