diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php index 0d6a21980cb5f1edfbc8e9a42c6f9c43dabf8fe2..be66086aaf320730890b0b2b8d6d82bdfa439f7a 100644 --- a/lib/Doctrine/DBAL/Connection.php +++ b/lib/Doctrine/DBAL/Connection.php @@ -1104,7 +1104,7 @@ class Connection implements DriverConnection $func($this); $this->commit(); } catch (Exception $e) { - $this->rollback(); + $this->rollBack(); throw $e; } } @@ -1268,7 +1268,7 @@ class Connection implements DriverConnection $logger->startQuery('"ROLLBACK"'); } $this->_transactionNestingLevel = 0; - $this->_conn->rollback(); + $this->_conn->rollBack(); $this->_isRollbackOnly = false; if ($logger) { $logger->stopQuery(); diff --git a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php b/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php index 4c04bfb3e720398d91fed496fcf48b96da437e8f..84bcb6f5e8183b474bebccb8f02406622a90a260 100644 --- a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php +++ b/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php @@ -29,7 +29,7 @@ use Doctrine\DBAL\Driver\PDOConnection; class Connection extends PDOConnection implements \Doctrine\DBAL\Driver\Connection { /** - * @override + * {@inheritDoc} */ public function quote($value, $type=\PDO::PARAM_STR) { diff --git a/lib/Doctrine/DBAL/DriverManager.php b/lib/Doctrine/DBAL/DriverManager.php index 75004a40718d9c7e9d05dcb99296718a1dd4269a..d9a6a0c4cc5741bd60020df87e140a10db40fe64 100644 --- a/lib/Doctrine/DBAL/DriverManager.php +++ b/lib/Doctrine/DBAL/DriverManager.php @@ -218,9 +218,10 @@ final class DriverManager * * @param array $params The list of parameters. * - * @param array A modified list of parameters with info from a database - * URL extracted into indidivual parameter parts. + * @return array A modified list of parameters with info from a database + * URL extracted into indidivual parameter parts. * + * @throws DBALException */ private static function parseDatabaseUrl(array $params) { diff --git a/lib/Doctrine/DBAL/Id/TableGenerator.php b/lib/Doctrine/DBAL/Id/TableGenerator.php index 62d6fcb8ef1738a8f170e5bb44c8a69de48ab9df..fe66b07748e10578ff040f23ecc4356ab634f786 100644 --- a/lib/Doctrine/DBAL/Id/TableGenerator.php +++ b/lib/Doctrine/DBAL/Id/TableGenerator.php @@ -156,7 +156,7 @@ class TableGenerator $this->conn->commit(); } catch (\Exception $e) { - $this->conn->rollback(); + $this->conn->rollBack(); throw new \Doctrine\DBAL\DBALException("Error occurred while generating ID with TableGenerator, aborted generation: " . $e->getMessage(), 0, $e); } diff --git a/lib/Doctrine/DBAL/Platforms/DB2Platform.php b/lib/Doctrine/DBAL/Platforms/DB2Platform.php index 9cc794d16a1ffc7b859bbeaa177f074b2a31bfbd..b6ef11c1951cd8d45292e7efc0a49acc1da3b6b9 100644 --- a/lib/Doctrine/DBAL/Platforms/DB2Platform.php +++ b/lib/Doctrine/DBAL/Platforms/DB2Platform.php @@ -20,7 +20,6 @@ namespace Doctrine\DBAL\Platforms; use Doctrine\DBAL\DBALException; -use Doctrine\DBAL\Schema\Column; use Doctrine\DBAL\Schema\ColumnDiff; use Doctrine\DBAL\Schema\Identifier; use Doctrine\DBAL\Schema\Index; diff --git a/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php b/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php index 9824ca883ee9e2d13e630dbdf84b5c71b4cf4f3c..ae75979c30c5807bee09af4291d898280ba8fd0e 100644 --- a/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php +++ b/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php @@ -49,6 +49,12 @@ class MySqlPlatform extends AbstractPlatform /** * Adds MySQL-specific LIMIT clause to the query * 18446744073709551615 is 2^64-1 maximum of unsigned BIGINT the biggest limit possible + * + * @param string $query + * @param integer $limit + * @param integer $offset + * + * @return string */ protected function doModifyLimitQuery($query, $limit, $offset) { @@ -346,6 +352,9 @@ class MySqlPlatform extends AbstractPlatform return true; } + /** + * {@inheritDoc} + */ public function getListTablesSQL() { return "SHOW FULL TABLES WHERE Table_type = 'BASE TABLE'"; diff --git a/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php b/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php index cb512c4793980d0bf2db197e89229789f3f9c75e..8b3b284c932c40f3e3a28958e295b7feeb705579 100644 --- a/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php +++ b/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php @@ -517,7 +517,7 @@ class PostgreSqlPlatform extends AbstractPlatform } if ($columnDiff->hasChanged('notnull')) { - $query = 'ALTER ' . $oldColumnName . ' ' . ($column->getNotNull() ? 'SET' : 'DROP') . ' NOT NULL'; + $query = 'ALTER ' . $oldColumnName . ' ' . ($column->getNotnull() ? 'SET' : 'DROP') . ' NOT NULL'; $sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ' . $query; } diff --git a/lib/Doctrine/DBAL/Query/QueryBuilder.php b/lib/Doctrine/DBAL/Query/QueryBuilder.php index 0a6d59e374503d97dee5074205fbb5813208dede..a16496cebb5af1b0a4eade2a7a0b1939cb0cc9b3 100644 --- a/lib/Doctrine/DBAL/Query/QueryBuilder.php +++ b/lib/Doctrine/DBAL/Query/QueryBuilder.php @@ -1302,6 +1302,8 @@ class QueryBuilder * @param array $knownAliases * * @return string + * + * @throws QueryException */ private function getSQLForJoins($fromAlias, array &$knownAliases) { diff --git a/lib/Doctrine/DBAL/Schema/Schema.php b/lib/Doctrine/DBAL/Schema/Schema.php index b7e24fe9193c9b7225e4dbff72f26cf9b3e81119..3277ad72cf1b9c212b90c0beda681c38e6c4a014 100644 --- a/lib/Doctrine/DBAL/Schema/Schema.php +++ b/lib/Doctrine/DBAL/Schema/Schema.php @@ -313,6 +313,8 @@ class Schema extends AbstractAsset * @param string $namespaceName The name of the namespace to create. * * @return \Doctrine\DBAL\Schema\Schema This schema instance. + * + * @throws SchemaException */ public function createNamespace($namespaceName) { diff --git a/lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php b/lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php index 08c90cf984d03ffab47a30290f41278ed31c08ae..3e82f38a7f10ce2e25e22d79323f4851e19b8efa 100644 --- a/lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php +++ b/lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php @@ -418,6 +418,12 @@ class SqliteSchemaManager extends AbstractSchemaManager return $tableDiff; } + /** + * @param string $column + * @param string $sql + * + * @return string|false + */ private function parseColumnCollationFromSQL($column, $sql) { if (preg_match(