Skip to content

D
doctrine-dbal
Unverified Commit 3f3551aa authored by Sergei Morozov's avatar Sergei Morozov
Browse files
Options

Fix too long lines

parent 0be2f9a5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2594 additions and 797 deletions
lib/Doctrine/DBAL/Configuration.php
View file @ 3f3551aa
......@@ -81,7 +81,8 @@ class Configuration
{
$this->_attributes['filterSchemaAssetsExpression'] = $filterExpression;
if ($filterExpression) {
$this->_attributes['filterSchemaAssetsExpressionCallable'] = $this->buildSchemaAssetsFilterFromExpression($filterExpression);
$this->_attributes['filterSchemaAssetsExpressionCallable']
= $this->buildSchemaAssetsFilterFromExpression($filterExpression);
} else {
$this->_attributes['filterSchemaAssetsExpressionCallable'] = null;
}
......
lib/Doctrine/DBAL/Connection.php
View file @ 3f3551aa
......@@ -911,7 +911,12 @@ class Connection implements DriverConnection
$stmt = $connection->query($sql);
}
} catch (Throwable $ex) {
throw DBALException::driverExceptionDuringQuery($this->_driver, $ex, $sql, $this->resolveParams($params, $types));
throw DBALException::driverExceptionDuringQuery(
$this->_driver,
$ex,
$sql,
$this->resolveParams($params, $types)
);
}
$stmt->setFetchMode($this->defaultFetchMode);
......@@ -961,7 +966,13 @@ class Connection implements DriverConnection
}
if (! isset($stmt)) {
$stmt = new ResultCacheStatement($this->executeQuery($sql, $params, $types), $resultCache, $cacheKey, $realKey, $qcp->getLifetime());
$stmt = new ResultCacheStatement(
$this->executeQuery($sql, $params, $types),
$resultCache,
$cacheKey,
$realKey,
$qcp->getLifetime()
);
}
$stmt->setFetchMode($this->defaultFetchMode);
......@@ -1069,7 +1080,12 @@ class Connection implements DriverConnection
$result = $connection->exec($sql);
}
} catch (Throwable $ex) {
throw DBALException::driverExceptionDuringQuery($this->_driver, $ex, $sql, $this->resolveParams($params, $types));
throw DBALException::driverExceptionDuringQuery(
$this->_driver,
$ex,
$sql,
$this->resolveParams($params, $types)
);
}
if ($logger) {
......
lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php
View file @ 3f3551aa
......@@ -65,7 +65,8 @@ use function func_get_args;
* )
* ));
*
* You can also pass 'driverOptions' and any other documented option to each of this drivers to pass additional information.
* You can also pass 'driverOptions' and any other documented option to each of this drivers
* to pass additional information.
*/
class MasterSlaveConnection extends Connection
{
......@@ -91,8 +92,12 @@ class MasterSlaveConnection extends Connection
*
* @throws InvalidArgumentException
*/
public function __construct(array $params, Driver $driver, ?Configuration $config = null, ?EventManager $eventManager = null)
{
public function __construct(
array $params,
Driver $driver,
?Configuration $config = null,
?EventManager $eventManager = null
) {
if (! isset($params['slaves'], $params['master'])) {
throw new InvalidArgumentException('master or slaves configuration missing');
}
......
lib/Doctrine/DBAL/DBALException.php
View file @ 3f3551aa
......@@ -219,7 +219,9 @@ class DBALException extends Exception
*/
public static function invalidDriverClass($driverClass)
{
return new self("The given 'driverClass' " . $driverClass . ' has to implement the ' . Driver::class . ' interface.');
return new self(
"The given 'driverClass' " . $driverClass . ' has to implement the ' . Driver::class . ' interface.'
);
}
/**
......@@ -288,7 +290,9 @@ class DBALException extends Exception
public static function typeNotRegistered(Type $type): self
{
return new self(sprintf('Type of the class %s@%s is not registered.', get_class($type), spl_object_hash($type)));
return new self(
sprintf('Type of the class %s@%s is not registered.', get_class($type), spl_object_hash($type))
);
}
public static function typeAlreadyRegistered(Type $type): self
......
lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
View file @ 3f3551aa
......@@ -70,7 +70,11 @@ class MysqliConnection implements Connection, PingableConnection, ServerInfoAwar
});
try {
if (! $this->conn->real_connect($params['host'], $username, $password, $dbname, $port, $socket, $flags)) {
throw new MysqliException($this->conn->connect_error, $this->conn->sqlstate ?? 'HY000', $this->conn->connect_errno);
throw new MysqliException(
$this->conn->connect_error,
$this->conn->sqlstate ?? 'HY000',
$this->conn->connect_errno
);
}
} finally {
restore_error_handler();
......
lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php
View file @ 3f3551aa
......@@ -223,7 +223,9 @@ class MysqliStatement implements IteratorAggregate, Statement
if ($types[$parameter - 1] === static::$_paramTypeMap[ParameterType::LARGE_OBJECT]) {
if (is_resource($value)) {
if (get_resource_type($value) !== 'stream') {
throw new InvalidArgumentException('Resources passed with the LARGE_OBJECT parameter type must be stream resources.');
throw new InvalidArgumentException(
'Resources passed with the LARGE_OBJECT parameter type must be stream resources.'
);
}
$streams[$parameter] = $value;
......
lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php
View file @ 3f3551aa
......@@ -177,10 +177,12 @@ class OCI8Statement implements IteratorAggregate, Statement
* @param string $statement The SQL statement to parse
* @param string $tokenOffset The offset to start searching from
* @param int $fragmentOffset The offset to build the next fragment from
* @param string[] $fragments Fragments of the original statement not containing placeholders
* @param string[] $fragments Fragments of the original statement
* not containing placeholders
* @param string|null $currentLiteralDelimiter The delimiter of the current string literal
* or NULL if not currently in a literal
* @param array<int, string> $paramMap Mapping of the original parameter positions to their named replacements
* @param array<int, string> $paramMap Mapping of the original parameter positions
* to their named replacements
*
* @return bool Whether the token was found
*/
......@@ -282,7 +284,9 @@ class OCI8Statement implements IteratorAggregate, Statement
{
if (is_int($param)) {
if (! isset($this->_paramMap[$param])) {
throw new OCI8Exception(sprintf('Could not find variable mapping with index %d, in the SQL statement', $param));
throw new OCI8Exception(
sprintf('Could not find variable mapping with index %d, in the SQL statement', $param)
);
}
$param = $this->_paramMap[$param];
......
lib/Doctrine/DBAL/Driver/ResultStatement.php
View file @ 3f3551aa
......@@ -70,13 +70,15 @@ interface ResultStatement extends Traversable
* @param int|null $fetchMode Controls how the next row will be returned to the caller.
* The value must be one of the {@link FetchMode} constants,
* defaulting to {@link FetchMode::MIXED}.
* @param int|null $fetchArgument This argument has a different meaning depending on the value of the $fetchMode parameter:
* @param int|null $fetchArgument This argument has a different meaning depending on the value
* of the $fetchMode parameter:
* * {@link FetchMode::COLUMN}:
* Returns the indicated 0-indexed column.
* * {@link FetchMode::CUSTOM_OBJECT}:
* Returns instances of the specified class, mapping the columns of each row
* to named properties in the class.
* * {@link PDO::FETCH_FUNC}: Returns the results of calling the specified function, using each row's
* * {@link PDO::FETCH_FUNC}: Returns the results of calling
* the specified function, using each row's
* columns as parameters in the call.
* @param mixed[]|null $ctorArgs Controls how the next row will be returned to the caller.
* The value must be one of the {@link FetchMode} constants,
......
lib/Doctrine/DBAL/Driver/SQLAnywhere/Driver.php
View file @ 3f3551aa
......@@ -64,8 +64,15 @@ class Driver extends AbstractSQLAnywhereDriver
*
* @return string
*/
private function buildDsn($host, $port, $server, $dbname, $username = null, $password = null, array $driverOptions = [])
{
private function buildDsn(
$host,
$port,
$server,
$dbname,
$username = null,
$password = null,
array $driverOptions = []
) {
$host = $host ?: 'localhost';
$port = $port ?: 2638;
......
lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php
View file @ 3f3551aa
......@@ -170,7 +170,9 @@ class SQLSrvStatement implements IteratorAggregate, Statement
public function bindParam($param, &$variable, $type = ParameterType::STRING, $length = null)
{
if (! is_numeric($param)) {
throw new SQLSrvException('sqlsrv does not support named parameters to queries, use question mark (?) placeholders instead.');
throw new SQLSrvException(
'sqlsrv does not support named parameters to queries, use question mark (?) placeholders instead.'
);
}
$this->variables[$param] =& $variable;
......
lib/Doctrine/DBAL/DriverManager.php
View file @ 3f3551aa
......@@ -227,7 +227,10 @@ final class DriverManager
throw DBALException::unknownDriver($params['driver'], array_keys(self::$_driverMap));
}
if (isset($params['driverClass']) && ! in_array(Driver::class, class_implements($params['driverClass'], true))) {
if (
isset($params['driverClass'])
&& ! in_array(Driver::class, class_implements($params['driverClass'], true))
) {
throw DBALException::invalidDriverClass($params['driverClass']);
}
}
......
lib/Doctrine/DBAL/Id/TableGenerator.php
View file @ 3f3551aa
......@@ -75,7 +75,8 @@ class TableGenerator
throw new DBALException('Cannot use TableGenerator with SQLite.');
}
$this->conn = DriverManager::getConnection($params, $conn->getConfiguration(), $conn->getEventManager());
$this->conn = DriverManager::getConnection($params, $conn->getConfiguration(), $conn->getEventManager());
$this->generatorTableName = $generatorTableName;
}
......@@ -145,7 +146,11 @@ class TableGenerator
} catch (Throwable $e) {
$this->conn->rollBack();
throw new DBALException('Error occurred while generating ID with TableGenerator, aborted generation: ' . $e->getMessage(), 0, $e);
throw new DBALException(
'Error occurred while generating ID with TableGenerator, aborted generation: ' . $e->getMessage(),
0,
$e
);
}
return $value;
......
lib/Doctrine/DBAL/Logging/DebugStack.php
View file @ 3f3551aa
......@@ -38,8 +38,14 @@ class DebugStack implements SQLLogger
return;
}
$this->start = microtime(true);
$this->queries[++$this->currentQuery] = ['sql' => $sql, 'params' => $params, 'types' => $types, 'executionMS' => 0];
$this->start = microtime(true);
$this->queries[++$this->currentQuery] = [
'sql' => $sql,
'params' => $params,
'types' => $types,
'executionMS' => 0,
];
}
/**
......
lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
View file @ 3f3551aa
......@@ -291,7 +291,8 @@ abstract class AbstractPlatform
if ($column['length'] > $maxLength) {
if ($maxLength > 0) {
@trigger_error(sprintf(
'Binary column length %d is greater than supported by the platform (%d). Reduce the column length or use a BLOB column instead.',
'Binary column length %d is greater than supported by the platform (%d).'
. ' Reduce the column length or use a BLOB column instead.',
$column['length'],
$maxLength
), E_USER_DEPRECATED);
......@@ -439,7 +440,9 @@ abstract class AbstractPlatform
$dbType = strtolower($dbType);
if (! isset($this->doctrineTypeMapping[$dbType])) {
throw new DBALException('Unknown database type ' . $dbType . ' requested, ' . static::class . ' may not support it.');
throw new DBALException(
'Unknown database type ' . $dbType . ' requested, ' . static::class . ' may not support it.'
);
}
return $this->doctrineTypeMapping[$dbType];
......@@ -1355,7 +1358,8 @@ abstract class AbstractPlatform
}
/**
* Honors that some SQL vendors such as MsSql use table hints for locking instead of the ANSI SQL FOR UPDATE specification.
* Honors that some SQL vendors such as MsSql use table hints for locking instead of the
* ANSI SQL FOR UPDATE specification.
*
* @param string $fromClause The FROM clause to append the hint for the given lock mode to.
* @param int|null $lockMode One of the Doctrine\DBAL\LockMode::* constants. If null is given, nothing will
......@@ -1543,7 +1547,9 @@ abstract class AbstractPlatform
public function getCreateTableSQL(Table $table, $createFlags = self::CREATE_INDEXES)
{
if (! is_int($createFlags)) {
throw new InvalidArgumentException('Second argument of AbstractPlatform::getCreateTableSQL() has to be integer.');
throw new InvalidArgumentException(
'Second argument of AbstractPlatform::getCreateTableSQL() has to be integer.'
);
}
if (count($table->getColumns()) === 0) {
......@@ -1571,7 +1577,10 @@ abstract class AbstractPlatform
$columns = [];
foreach ($table->getColumns() as $column) {
if ($this->_eventManager !== null && $this->_eventManager->hasListeners(Events::onSchemaCreateTableColumn)) {
if (
$this->_eventManager !== null
&& $this->_eventManager->hasListeners(Events::onSchemaCreateTableColumn)
) {
$eventArgs = new SchemaCreateTableColumnEventArgs($column, $table, $this);
$this->_eventManager->dispatchEvent(Events::onSchemaCreateTableColumn, $eventArgs);
......@@ -1582,10 +1591,11 @@ abstract class AbstractPlatform
}
}
$columnData = $column->toArray();
$columnData['name'] = $column->getQuotedName($this);
$columnData['version'] = $column->hasPlatformOption('version') ? $column->getPlatformOption('version') : false;
$columnData['comment'] = $this->getColumnComment($column);
$columnData = array_merge($column->toArray(), [
'name' => $column->getQuotedName($this),
'version' => $column->hasPlatformOption('version') ? $column->getPlatformOption('version') : false,
'comment' => $this->getColumnComment($column),
]);
if ($columnData['type'] instanceof Types\StringType && $columnData['length'] === null) {
$columnData['length'] = 255;
......@@ -2175,7 +2185,10 @@ abstract class AbstractPlatform
*/
protected function _getAlterTableIndexForeignKeySQL(TableDiff $diff)
{
return array_merge($this->getPreAlterTableIndexForeignKeySQL($diff), $this->getPostAlterTableIndexForeignKeySQL($diff));
return array_merge(
$this->getPreAlterTableIndexForeignKeySQL($diff),
$this->getPostAlterTableIndexForeignKeySQL($diff)
);
}
/**
......
lib/Doctrine/DBAL/Platforms/DB2Platform.php
View file @ 3f3551aa
......@@ -628,8 +628,12 @@ class DB2Platform extends AbstractPlatform
* @param string[] $sql The sequence of table alteration statements to fill.
* @param mixed[] $queryParts The sequence of column alteration clauses to fill.
*/
private function gatherAlterColumnSQL(Identifier $table, ColumnDiff $columnDiff, array &$sql, array &$queryParts): void
{
private function gatherAlterColumnSQL(
Identifier $table,
ColumnDiff $columnDiff,
array &$sql,
array &$queryParts
): void {
$alterColumnClauses = $this->getAlterColumnClausesSQL($columnDiff);
if (empty($alterColumnClauses)) {
......
lib/Doctrine/DBAL/Platforms/DrizzlePlatform.php
View file @ 3f3551aa
......@@ -329,8 +329,8 @@ class DrizzlePlatform extends AbstractPlatform
$databaseSQL = 'DATABASE()';
}
return 'SELECT COLUMN_NAME, DATA_TYPE, COLUMN_COMMENT, IS_NULLABLE, IS_AUTO_INCREMENT, CHARACTER_MAXIMUM_LENGTH, COLUMN_DEFAULT,' .
' NUMERIC_PRECISION, NUMERIC_SCALE, COLLATION_NAME' .
return 'SELECT COLUMN_NAME, DATA_TYPE, COLUMN_COMMENT, IS_NULLABLE, IS_AUTO_INCREMENT,' .
' CHARACTER_MAXIMUM_LENGTH, COLUMN_DEFAULT, NUMERIC_PRECISION, NUMERIC_SCALE, COLLATION_NAME' .
' FROM DATA_DICTIONARY.COLUMNS' .
' WHERE TABLE_SCHEMA=' . $databaseSQL . ' AND TABLE_NAME = ' . $this->quoteStringLiteral($table);
}
......@@ -349,9 +349,11 @@ class DrizzlePlatform extends AbstractPlatform
$databaseSQL = 'DATABASE()';
}
return 'SELECT CONSTRAINT_NAME, CONSTRAINT_COLUMNS, REFERENCED_TABLE_NAME, REFERENCED_TABLE_COLUMNS, UPDATE_RULE, DELETE_RULE' .
' FROM DATA_DICTIONARY.FOREIGN_KEYS' .
' WHERE CONSTRAINT_SCHEMA=' . $databaseSQL . ' AND CONSTRAINT_TABLE=' . $this->quoteStringLiteral($table);
return 'SELECT CONSTRAINT_NAME, CONSTRAINT_COLUMNS, REFERENCED_TABLE_NAME, REFERENCED_TABLE_COLUMNS,'
. ' UPDATE_RULE, DELETE_RULE'
. ' FROM DATA_DICTIONARY.FOREIGN_KEYS'
. ' WHERE CONSTRAINT_SCHEMA=' . $databaseSQL
. ' AND CONSTRAINT_TABLE=' . $this->quoteStringLiteral($table);
}
/**
......@@ -365,9 +367,12 @@ class DrizzlePlatform extends AbstractPlatform
$databaseSQL = 'DATABASE()';
}
return "SELECT INDEX_NAME AS 'key_name', COLUMN_NAME AS 'column_name', IS_USED_IN_PRIMARY AS 'primary', IS_UNIQUE=0 AS 'non_unique'" .
' FROM DATA_DICTIONARY.INDEX_PARTS' .
' WHERE TABLE_SCHEMA=' . $databaseSQL . ' AND TABLE_NAME=' . $this->quoteStringLiteral($table);
return "SELECT INDEX_NAME AS 'key_name',"
. " COLUMN_NAME AS 'column_name',"
. " IS_USED_IN_PRIMARY AS 'primary',"
. " IS_UNIQUE=0 AS 'non_unique'"
. ' FROM DATA_DICTIONARY.INDEX_PARTS'
. ' WHERE TABLE_SCHEMA=' . $databaseSQL . ' AND TABLE_NAME=' . $this->quoteStringLiteral($table);
}
/**
......@@ -499,9 +504,11 @@ class DrizzlePlatform extends AbstractPlatform
continue;
}
$columnArray = $column->toArray();
$columnArray['comment'] = $this->getColumnComment($column);
$queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
$columnArray = array_merge($column->toArray(), [
'comment' => $this->getColumnComment($column),
]);
$queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
}
foreach ($diff->removedColumns as $column) {
......@@ -554,7 +561,8 @@ class DrizzlePlatform extends AbstractPlatform
if (! $this->onSchemaAlterTable($diff, $tableSql)) {
if (count($queryParts) > 0) {
$sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ' . implode(', ', $queryParts);
$sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this)
. ' ' . implode(', ', $queryParts);
}
$sql = array_merge(
......
lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
View file @ 3f3551aa
......@@ -198,10 +198,9 @@ class MySqlPlatform extends AbstractPlatform
$databaseNameSql = $database ?? 'DATABASE()';
$sql .= ' AND k.table_schema = ' . $databaseNameSql . ' /*!50116 AND c.constraint_schema = ' . $databaseNameSql . ' */';
$sql .= ' AND k.`REFERENCED_COLUMN_NAME` is not NULL';
return $sql;
return $sql . ' AND k.table_schema = ' . $databaseNameSql
. ' /*!50116 AND c.constraint_schema = ' . $databaseNameSql . ' */'
. ' AND k.`REFERENCED_COLUMN_NAME` is not NULL';
}
/**
......@@ -566,9 +565,11 @@ SQL
continue;
}
$columnArray = $column->toArray();
$columnArray['comment'] = $this->getColumnComment($column);
$queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
$columnArray = array_merge($column->toArray(), [
'comment' => $this->getColumnComment($column),
]);
$queryParts[] = 'ADD ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnArray);
}
foreach ($diff->removedColumns as $column) {
......@@ -635,7 +636,8 @@ SQL
if (! $this->onSchemaAlterTable($diff, $tableSql)) {
if (count($queryParts) > 0) {
$sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ' . implode(', ', $queryParts);
$sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' '
. implode(', ', $queryParts);
}
$sql = array_merge(
......
lib/Doctrine/DBAL/Platforms/OraclePlatform.php
View file @ 3f3551aa
......@@ -508,14 +508,15 @@ class OraclePlatform extends AbstractPlatform
$idx = new Index($autoincrementIdentifierName, [$quotedName], true, true);
$sql[] = 'DECLARE
$sql[] = "DECLARE
constraints_Count NUMBER;
BEGIN
SELECT COUNT(CONSTRAINT_NAME) INTO constraints_Count FROM USER_CONSTRAINTS WHERE TABLE_NAME = \'' . $unquotedTableName . '\' AND CONSTRAINT_TYPE = \'P\';
IF constraints_Count = 0 OR constraints_Count = \'\' THEN
EXECUTE IMMEDIATE \'' . $this->getCreateConstraintSQL($idx, $quotedTableName) . '\';
SELECT COUNT(CONSTRAINT_NAME) INTO constraints_Count FROM USER_CONSTRAINTS WHERE TABLE_NAME = '" . $unquotedTableName
. "' AND CONSTRAINT_TYPE = 'P';
IF constraints_Count = 0 OR constraints_Count = '' THEN
EXECUTE IMMEDIATE '" . $this->getCreateConstraintSQL($idx, $quotedTableName) . "';
END IF;
END;';
END;";
$sequenceName = $this->getIdentitySequenceName(
$tableIdentifier->isQuoted() ? $quotedTableName : $unquotedTableName,
......@@ -819,7 +820,8 @@ SQL
}
if (count($fields)) {
$sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ADD (' . implode(', ', $fields) . ')';
$sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this)
. ' ADD (' . implode(', ', $fields) . ')';
}
$fields = [];
......@@ -868,7 +870,8 @@ SQL
}
if (count($fields)) {
$sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' MODIFY (' . implode(', ', $fields) . ')';
$sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this)
. ' MODIFY (' . implode(', ', $fields) . ')';
}
foreach ($diff->renamedColumns as $oldColumnName => $column) {
......@@ -892,7 +895,8 @@ SQL
}
if (count($fields)) {
$sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' DROP (' . implode(', ', $fields) . ')';
$sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this)
. ' DROP (' . implode(', ', $fields) . ')';
}
$tableSql = [];
......@@ -1217,7 +1221,9 @@ SQL
if ($database !== null && $database !== '/') {
$tableCommentsName = 'all_tab_comments';
$ownerCondition = ' AND owner = ' . $this->quoteStringLiteral($this->normalizeIdentifier($database)->getName());
$ownerCondition = ' AND owner = ' . $this->quoteStringLiteral(
$this->normalizeIdentifier($database)->getName()
);
}
return sprintf(
......
lib/Doctrine/DBAL/Platforms/PostgreSQL91Platform.php
View file @ 3f3551aa
......@@ -41,6 +41,8 @@ class PostgreSQL91Platform extends PostgreSqlPlatform
$sql = parent::getListTableColumnsSQL($table, $database);
$parts = explode('AS complete_type,', $sql, 2);
return $parts[0] . 'AS complete_type, (SELECT tc.collcollate FROM pg_catalog.pg_collation tc WHERE tc.oid = a.attcollation) AS collation,' . $parts[1];
return $parts[0] . 'AS complete_type, '
. '(SELECT tc.collcollate FROM pg_catalog.pg_collation tc WHERE tc.oid = a.attcollation) AS collation,'
. $parts[1];
}
}
lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php
View file @ 3f3551aa
......@@ -114,7 +114,8 @@ class PostgreSqlPlatform extends AbstractPlatform
if ($startPos !== false) {
$str = $this->getSubstringExpression($str, $startPos);
return 'CASE WHEN (POSITION(' . $substr . ' IN ' . $str . ') = 0) THEN 0 ELSE (POSITION(' . $substr . ' IN ' . $str . ') + ' . ($startPos - 1) . ') END';
return 'CASE WHEN (POSITION(' . $substr . ' IN ' . $str . ') = 0) THEN 0'
. ' ELSE (POSITION(' . $substr . ' IN ' . $str . ') + ' . ($startPos - 1) . ') END';
}
return 'POSITION(' . $substr . ' IN ' . $str . ')';
......@@ -355,7 +356,8 @@ SQL
WHERE oid IN (
SELECT indexrelid
FROM pg_index si, pg_class sc, pg_namespace sn
WHERE ' . $this->getTableWhereClause($table, 'sc', 'sn') . ' AND sc.oid=si.indrelid AND sc.relnamespace = sn.oid
WHERE ' . $this->getTableWhereClause($table, 'sc', 'sn') . '
AND sc.oid=si.indrelid AND sc.relnamespace = sn.oid
) AND pg_index.indexrelid = oid';
}
......@@ -544,7 +546,12 @@ SQL
$oldColumnName = $columnDiff->getOldColumnName()->getQuotedName($this);
$column = $columnDiff->column;
if ($columnDiff->hasChanged('type') || $columnDiff->hasChanged('precision') || $columnDiff->hasChanged('scale') || $columnDiff->hasChanged('fixed')) {
if (
$columnDiff->hasChanged('type')
|| $columnDiff->hasChanged('precision')
|| $columnDiff->hasChanged('scale')
|| $columnDiff->hasChanged('fixed')
) {
$type = $column->getType();
// SERIAL/BIGSERIAL are not "real" types and we can't alter a column to that type
......@@ -575,7 +582,8 @@ SQL
$seqName = $this->getIdentitySequenceName($diff->name, $oldColumnName);
$sql[] = 'CREATE SEQUENCE ' . $seqName;
$sql[] = "SELECT setval('" . $seqName . "', (SELECT MAX(" . $oldColumnName . ') FROM ' . $diff->getName($this)->getQuotedName($this) . '))';
$sql[] = "SELECT setval('" . $seqName . "', (SELECT MAX(" . $oldColumnName . ') FROM '
. $diff->getName($this)->getQuotedName($this) . '))';
$query = 'ALTER ' . $oldColumnName . " SET DEFAULT nextval('" . $seqName . "')";
$sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ' . $query;
} else {
......@@ -588,7 +596,10 @@ SQL
$newComment = $this->getColumnComment($column);
$oldComment = $this->getOldColumnComment($columnDiff);
if ($columnDiff->hasChanged('comment') || ($columnDiff->fromColumn !== null && $oldComment !== $newComment)) {
if (
$columnDiff->hasChanged('comment')
|| ($columnDiff->fromColumn !== null && $oldComment !== $newComment)
) {
$commentsSQL[] = $this->getCommentOnColumnSQL(
$diff->getName($this)->getQuotedName($this),
$column->getQuotedName($this),
......@@ -600,7 +611,8 @@ SQL
continue;
}
$query = 'ALTER ' . $oldColumnName . ' TYPE ' . $column->getType()->getSQLDeclaration($column->toArray(), $this);
$query = 'ALTER ' . $oldColumnName . ' TYPE '
. $column->getType()->getSQLDeclaration($column->toArray(), $this);
$sql[] = 'ALTER TABLE ' . $diff->getName($this)->getQuotedName($this) . ' ' . $query;
}
......
lib/Doctrine/DBAL/Platforms/SQLAnywherePlatform.php
View file @ 3f3551aa
......@@ -1150,7 +1150,8 @@ SQL
default:
return 'REVERSE(SUBSTR(REVERSE(SUBSTR(' . $str . ', PATINDEX(' . $pattern . ', ' . $str . '))), ' .
'PATINDEX(' . $pattern . ', REVERSE(SUBSTR(' . $str . ', PATINDEX(' . $pattern . ', ' . $str . '))))))';
'PATINDEX(' . $pattern . ', ' .
'REVERSE(SUBSTR(' . $str . ', PATINDEX(' . $pattern . ', ' . $str . '))))))';
}
}
......@@ -1272,7 +1273,8 @@ SQL
$flags = ' CLUSTERED ';
}
$columnListSql .= ', PRIMARY KEY' . $flags . ' (' . implode(', ', array_unique(array_values((array) $options['primary']))) . ')';
$columnListSql .= ', PRIMARY KEY' . $flags
. ' (' . implode(', ', array_unique(array_values((array) $options['primary']))) . ')';
}
if (! empty($options['foreignKeys'])) {
......@@ -1394,8 +1396,8 @@ SQL
if (! $constraint->isPrimary() && ! $constraint->isUnique()) {
throw new InvalidArgumentException(
'Can only create primary, unique or foreign key constraint declarations, no common index declarations ' .
'with getTableConstraintDeclarationSQL().'
'Can only create primary, unique or foreign key constraint declarations, no common index declarations'
. ' with getTableConstraintDeclarationSQL().'
);
}
......@@ -1418,7 +1420,8 @@ SQL
}
if ($constraint->isPrimary()) {
return $sql . 'PRIMARY KEY ' . $flags . '(' . $this->getIndexFieldDeclarationListSQL($constraintColumns) . ')';
return $sql . 'PRIMARY KEY ' . $flags
. '(' . $this->getIndexFieldDeclarationListSQL($constraintColumns) . ')';
}
return $sql . 'UNIQUE ' . $flags . '(' . $this->getIndexFieldDeclarationListSQL($constraintColumns) . ')';
......
lib/Doctrine/DBAL/Platforms/SQLServer2008Platform.php
View file @ 3f3551aa
......@@ -17,7 +17,8 @@ class SQLServer2008Platform extends SQLServer2005Platform
{
// "sysdiagrams" table must be ignored as it's internal SQL Server table for Database Diagrams
// Category 2 must be ignored as it is "MS SQL Server 'pseudo-system' object[s]" for replication
return "SELECT name, SCHEMA_NAME (uid) AS schema_name FROM sysobjects WHERE type = 'U' AND name != 'sysdiagrams' AND category != 2 ORDER BY name";
return 'SELECT name, SCHEMA_NAME (uid) AS schema_name FROM sysobjects'
. " WHERE type = 'U' AND name != 'sysdiagrams' AND category != 2 ORDER BY name";
}
/**
......
lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php
View file @ 3f3551aa
......@@ -289,7 +289,8 @@ SQL
$flags = ' NONCLUSTERED';
}
$columnListSql .= ', PRIMARY KEY' . $flags . ' (' . implode(', ', array_unique(array_values($options['primary']))) . ')';
$columnListSql .= ', PRIMARY KEY' . $flags
. ' (' . implode(', ', array_unique(array_values($options['primary']))) . ')';
}
$query = 'CREATE TABLE ' . $tableName . ' (' . $columnListSql;
......@@ -554,10 +555,12 @@ SQL
$columnDef = $column->toArray();
$queryParts[] = 'ALTER COLUMN ' .
$this->getColumnDeclarationSQL($column->getQuotedName($this), $columnDef);
$queryParts[] = 'ALTER COLUMN ' . $this->getColumnDeclarationSQL($column->getQuotedName($this), $columnDef);
if (! isset($columnDef['default']) || (! $requireDropDefaultConstraint && ! $columnDiff->hasChanged('default'))) {
if (
! isset($columnDef['default'])
|| (! $requireDropDefaultConstraint && ! $columnDiff->hasChanged('default'))
) {
continue;
}
......@@ -1084,15 +1087,6 @@ SQL
return $trimFn . '(' . $str . ')';
}
/** Original query used to get those expressions
declare @c varchar(100) = 'xxxBarxxx', @trim_char char(1) = 'x';
declare @pat varchar(10) = '%[^' + @trim_char + ']%';
select @c as string
, @trim_char as trim_char
, stuff(@c, 1, patindex(@pat, @c) - 1, null) as trim_leading
, reverse(stuff(reverse(@c), 1, patindex(@pat, reverse(@c)) - 1, null)) as trim_trailing
, reverse(stuff(reverse(stuff(@c, 1, patindex(@pat, @c) - 1, null)), 1, patindex(@pat, reverse(stuff(@c, 1, patindex(@pat, @c) - 1, null))) - 1, null)) as trim_both;
*/
$pattern = "'%[^' + " . $char . " + ']%'";
if ($pos === TrimMode::LEADING) {
......@@ -1100,10 +1094,13 @@ SQL
}
if ($pos === TrimMode::TRAILING) {
return 'reverse(stuff(reverse(' . $str . '), 1, patindex(' . $pattern . ', reverse(' . $str . ')) - 1, null))';
return 'reverse(stuff(reverse(' . $str . '), 1, '
. 'patindex(' . $pattern . ', reverse(' . $str . ')) - 1, null))';
}
return 'reverse(stuff(reverse(stuff(' . $str . ', 1, patindex(' . $pattern . ', ' . $str . ') - 1, null)), 1, patindex(' . $pattern . ', reverse(stuff(' . $str . ', 1, patindex(' . $pattern . ', ' . $str . ') - 1, null))) - 1, null))';
return 'reverse(stuff(reverse(stuff(' . $str . ', 1, patindex(' . $pattern . ', ' . $str . ') - 1, null)), 1, '
. 'patindex(' . $pattern . ', reverse(stuff(' . $str . ', 1, patindex(' . $pattern . ', ' . $str
. ') - 1, null))) - 1, null))';
}
/**
......@@ -1197,7 +1194,9 @@ SQL
*/
protected function getVarcharTypeDeclarationSQLSnippet($length, $fixed)
{
return $fixed ? ($length ? 'NCHAR(' . $length . ')' : 'CHAR(255)') : ($length ? 'NVARCHAR(' . $length . ')' : 'NVARCHAR(255)');
return $fixed
? ($length ? 'NCHAR(' . $length . ')' : 'CHAR(255)')
: ($length ? 'NVARCHAR(' . $length . ')' : 'NVARCHAR(255)');
}
/**
......
lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
View file @ 3f3551aa
......@@ -473,9 +473,13 @@ class SqlitePlatform extends AbstractPlatform
*/
public function getListTablesSQL()
{
return "SELECT name FROM sqlite_master WHERE type = 'table' AND name != 'sqlite_sequence' AND name != 'geometry_columns' AND name != 'spatial_ref_sys' "
. 'UNION ALL SELECT name FROM sqlite_temp_master '
. "WHERE type = 'table' ORDER BY name";
return 'SELECT name FROM sqlite_master'
. " WHERE type = 'table'"
. " AND name != 'sqlite_sequence'"
. " AND name != 'geometry_columns'"
. " AND name != 'spatial_ref_sys'"
. ' UNION ALL SELECT name FROM sqlite_temp_master'
. " WHERE type = 'table' ORDER BY name";
}
/**
......@@ -509,8 +513,18 @@ class SqlitePlatform extends AbstractPlatform
{
$query = parent::getAdvancedForeignKeyOptionsSQL($foreignKey);
$query .= ($foreignKey->hasOption('deferrable') && $foreignKey->getOption('deferrable') !== false ? ' ' : ' NOT ') . 'DEFERRABLE';
$query .= ' INITIALLY ' . ($foreignKey->hasOption('deferred') && $foreignKey->getOption('deferred') !== false ? 'DEFERRED' : 'IMMEDIATE');
if (! $foreignKey->hasOption('deferrable') || $foreignKey->getOption('deferrable') === false) {
$query .= ' NOT';
}
$query .= ' DEFERRABLE';
$query .= ' INITIALLY';
if ($foreignKey->hasOption('deferred') && $foreignKey->getOption('deferred') !== false) {
$query .= ' DEFERRED';
} else {
$query .= ' IMMEDIATE';
}
return $query;
}
......@@ -683,7 +697,9 @@ class SqlitePlatform extends AbstractPlatform
protected function getPreAlterTableIndexForeignKeySQL(TableDiff $diff)
{
if (! $diff->fromTable instanceof Table) {
throw new DBALException('Sqlite platform requires for alter table the table diff with reference to original table schema');
throw new DBALException(
'Sqlite platform requires for alter table the table diff with reference to original table schema'
);
}
$sql = [];
......@@ -704,7 +720,9 @@ class SqlitePlatform extends AbstractPlatform
protected function getPostAlterTableIndexForeignKeySQL(TableDiff $diff)
{
if (! $diff->fromTable instanceof Table) {
throw new DBALException('Sqlite platform requires for alter table the table diff with reference to original table schema');
throw new DBALException(
'Sqlite platform requires for alter table the table diff with reference to original table schema'
);
}
$sql = [];
......@@ -795,7 +813,10 @@ class SqlitePlatform extends AbstractPlatform
*/
public function getCreateForeignKeySQL(ForeignKeyConstraint $foreignKey, $table)
{
throw new DBALException('Sqlite platform does not support alter foreign key, the table must be fully recreated using getAlterTableSQL.');
throw new DBALException(
'Sqlite platform does not support alter foreign key, '
. 'the table must be fully recreated using getAlterTableSQL.'
);
}
/**
......@@ -803,7 +824,10 @@ class SqlitePlatform extends AbstractPlatform
*/
public function getDropForeignKeySQL($foreignKey, $table)
{
throw new DBALException('Sqlite platform does not support alter foreign key, the table must be fully recreated using getAlterTableSQL.');
throw new DBALException(
'Sqlite platform does not support alter foreign key, '
. 'the table must be fully recreated using getAlterTableSQL.'
);
}
/**
......@@ -851,7 +875,9 @@ class SqlitePlatform extends AbstractPlatform
$fromTable = $diff->fromTable;
if (! $fromTable instanceof Table) {
throw new DBALException('Sqlite platform requires for alter table the table diff with reference to original table schema');
throw new DBALException(
'Sqlite platform requires for alter table the table diff with reference to original table schema'
);
}
$table = clone $fromTable;
......@@ -934,16 +960,34 @@ class SqlitePlatform extends AbstractPlatform
if (! $this->onSchemaAlterTable($diff, $tableSql)) {
$dataTable = new Table('__temp__' . $table->getName());
$newTable = new Table($table->getQuotedName($this), $columns, $this->getPrimaryIndexInAlteredTable($diff), $this->getForeignKeysInAlteredTable($diff), 0, $table->getOptions());
$newTable = new Table(
$table->getQuotedName($this),
$columns,
$this->getPrimaryIndexInAlteredTable($diff),
$this->getForeignKeysInAlteredTable($diff),
0,
$table->getOptions()
);
$newTable->addOption('alter', true);
$sql = $this->getPreAlterTableIndexForeignKeySQL($diff);
//$sql = array_merge($sql, $this->getCreateTableSQL($dataTable, 0));
$sql[] = sprintf('CREATE TEMPORARY TABLE %s AS SELECT %s FROM %s', $dataTable->getQuotedName($this), implode(', ', $oldColumnNames), $table->getQuotedName($this));
$sql[] = sprintf(
'CREATE TEMPORARY TABLE %s AS SELECT %s FROM %s',
$dataTable->getQuotedName($this),
implode(', ', $oldColumnNames),
$table->getQuotedName($this)
);
$sql[] = $this->getDropTableSQL($fromTable);
$sql = array_merge($sql, $this->getCreateTableSQL($newTable));
$sql[] = sprintf('INSERT INTO %s (%s) SELECT %s FROM %s', $newTable->getQuotedName($this), implode(', ', $newColumnNames), implode(', ', $oldColumnNames), $dataTable->getQuotedName($this));
$sql[] = sprintf(
'INSERT INTO %s (%s) SELECT %s FROM %s',
$newTable->getQuotedName($this),
implode(', ', $newColumnNames),
implode(', ', $oldColumnNames),
$dataTable->getQuotedName($this)
);
$sql[] = $this->getDropTableSQL($dataTable);
$newName = $diff->getNewName();
......@@ -994,10 +1038,16 @@ class SqlitePlatform extends AbstractPlatform
}
if (
! empty($diff->renamedColumns) || ! empty($diff->addedForeignKeys) || ! empty($diff->addedIndexes)
|| ! empty($diff->changedColumns) || ! empty($diff->changedForeignKeys) || ! empty($diff->changedIndexes)
|| ! empty($diff->removedColumns) || ! empty($diff->removedForeignKeys) || ! empty($diff->removedIndexes)
|| ! empty($diff->renamedIndexes)
! empty($diff->renamedColumns)
|| ! empty($diff->addedForeignKeys)
|| ! empty($diff->addedIndexes)
|| ! empty($diff->changedColumns)
|| ! empty($diff->changedForeignKeys)
|| ! empty($diff->changedIndexes)
|| ! empty($diff->removedColumns)
|| ! empty($diff->removedForeignKeys)
|| ! empty($diff->removedIndexes)
|| ! empty($diff->renamedIndexes)
) {
return false;
}
......@@ -1013,8 +1063,13 @@ class SqlitePlatform extends AbstractPlatform
continue;
}
$definition = array_merge(['unique' => null, 'autoincrement' => null, 'default' => null], $column->toArray());
$type = $definition['type'];
$definition = array_merge([
'unique' => null,
'autoincrement' => null,
'default' => null,
], $column->toArray());
$type = $definition['type'];
switch (true) {
case isset($definition['columnDefinition']) || $definition['autoincrement'] || $definition['unique']:
......@@ -1029,13 +1084,16 @@ class SqlitePlatform extends AbstractPlatform
$definition['length'] = 255;
}
$sql[] = 'ALTER TABLE ' . $table->getQuotedName($this) . ' ADD COLUMN ' . $this->getColumnDeclarationSQL($definition['name'], $definition);
$sql[] = 'ALTER TABLE ' . $table->getQuotedName($this) . ' ADD COLUMN '
. $this->getColumnDeclarationSQL($definition['name'], $definition);
}
if (! $this->onSchemaAlterTable($diff, $tableSql)) {
if ($diff->newName !== false) {
$newTable = new Identifier($diff->newName);
$sql[] = 'ALTER TABLE ' . $table->getQuotedName($this) . ' RENAME TO ' . $newTable->getQuotedName($this);
$sql[] = 'ALTER TABLE ' . $table->getQuotedName($this) . ' RENAME TO '
. $newTable->getQuotedName($this);
}
}
......@@ -1120,7 +1178,13 @@ class SqlitePlatform extends AbstractPlatform
continue;
}
$indexes[$key] = new Index($index->getName(), $indexColumns, $index->isUnique(), $index->isPrimary(), $index->getFlags());
$indexes[$key] = new Index(
$index->getName(),
$indexColumns,
$index->isUnique(),
$index->isPrimary(),
$index->getFlags()
);
}
foreach ($diff->removedIndexes as $index) {
......@@ -1174,7 +1238,13 @@ class SqlitePlatform extends AbstractPlatform
continue;
}
$foreignKeys[$key] = new ForeignKeyConstraint($localColumns, $constraint->getForeignTableName(), $constraint->getForeignColumns(), $constraint->getName(), $constraint->getOptions());
$foreignKeys[$key] = new ForeignKeyConstraint(
$localColumns,
$constraint->getForeignTableName(),
$constraint->getForeignColumns(),
$constraint->getName(),
$constraint->getOptions()
);
}
foreach ($diff->removedForeignKeys as $constraint) {
......
lib/Doctrine/DBAL/Query/QueryBuilder.php
View file @ 3f3551aa
......@@ -427,7 +427,12 @@ class QueryBuilder
$this->state = self::STATE_DIRTY;
if ($append) {
if ($sqlPartName === 'orderBy' || $sqlPartName === 'groupBy' || $sqlPartName === 'select' || $sqlPartName === 'set') {
if (
$sqlPartName === 'orderBy'
|| $sqlPartName === 'groupBy'
|| $sqlPartName === 'select'
|| $sqlPartName === 'set'
) {
foreach ($sqlPart as $part) {
$this->sqlParts[$sqlPartName][] = $part;
}
......@@ -1212,7 +1217,8 @@ class QueryBuilder
*/
private function getSQLForUpdate()
{
$table = $this->sqlParts['from']['table'] . ($this->sqlParts['from']['alias'] ? ' ' . $this->sqlParts['from']['alias'] : '');
$table = $this->sqlParts['from']['table']
. ($this->sqlParts['from']['alias'] ? ' ' . $this->sqlParts['from']['alias'] : '');
return 'UPDATE ' . $table
. ' SET ' . implode(', ', $this->sqlParts['set'])
......@@ -1226,9 +1232,11 @@ class QueryBuilder
*/
private function getSQLForDelete()
{
$table = $this->sqlParts['from']['table'] . ($this->sqlParts['from']['alias'] ? ' ' . $this->sqlParts['from']['alias'] : '');
$table = $this->sqlParts['from']['table']
. ($this->sqlParts['from']['alias'] ? ' ' . $this->sqlParts['from']['alias'] : '');
return 'DELETE FROM ' . $table . ($this->sqlParts['where'] !== null ? ' WHERE ' . ((string) $this->sqlParts['where']) : '');
return 'DELETE FROM ' . $table
. ($this->sqlParts['where'] !== null ? ' WHERE ' . ((string) $this->sqlParts['where']) : '');
}
/**
......
lib/Doctrine/DBAL/SQLParserUtils.php
View file @ 3f3551aa
......@@ -89,7 +89,12 @@ class SQLParserUtils
$statement,
':',
self::NAMED_TOKEN,
static function (string $placeholder, int $placeholderPosition, int $fragmentPosition, array &$carry): void {
static function (
string $placeholder,
int $placeholderPosition,
int $fragmentPosition,
array &$carry
): void {
$carry[$placeholderPosition + $fragmentPosition] = substr($placeholder, 1);
}
);
......@@ -98,8 +103,12 @@ class SQLParserUtils
/**
* @return mixed[]
*/
private static function collectPlaceholders(string $statement, string $match, string $token, callable $collector): array
{
private static function collectPlaceholders(
string $statement,
string $match,
string $token,
callable $collector
): array {
if (strpos($statement, $match) === false) {
return [];
}
......
lib/Doctrine/DBAL/SQLParserUtilsException.php
View file @ 3f3551aa
......@@ -18,7 +18,9 @@ class SQLParserUtilsException extends DBALException
*/
public static function missingParam($paramName)
{
return new self(sprintf('Value for :%1$s not found in params array. Params array key should be "%1$s"', $paramName));
return new self(
sprintf('Value for :%1$s not found in params array. Params array key should be "%1$s"', $paramName)
);
}
/**
......@@ -28,6 +30,8 @@ class SQLParserUtilsException extends DBALException
*/
public static function missingType($typeName)
{
return new self(sprintf('Value for :%1$s not found in types array. Types array key should be "%1$s"', $typeName));
return new self(
sprintf('Value for :%1$s not found in types array. Types array key should be "%1$s"', $typeName)
);
}
}
lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
View file @ 3f3551aa
......@@ -529,7 +529,8 @@ abstract class AbstractSchemaManager
/**
* Drops and creates a new foreign key.
*
* @param ForeignKeyConstraint $foreignKey An associative array that defines properties of the foreign key to be created.
* @param ForeignKeyConstraint $foreignKey An associative array that defines properties
* of the foreign key to be created.
* @param Table|string $table The name of the table on which the foreign key is to be created.
*
* @return void
......@@ -892,7 +893,14 @@ abstract class AbstractSchemaManager
}
if (! $defaultPrevented) {
$index = new Index($data['name'], $data['columns'], $data['unique'], $data['primary'], $data['flags'], $data['options']);
$index = new Index(
$data['name'],
$data['columns'],
$data['unique'],
$data['primary'],
$data['flags'],
$data['options']
);
}
if (! $index) {
......
lib/Doctrine/DBAL/Schema/ColumnDiff.php
View file @ 3f3551aa
......@@ -25,8 +25,12 @@ class ColumnDiff
* @param string $oldColumnName
* @param string[] $changedProperties
*/
public function __construct($oldColumnName, Column $column, array $changedProperties = [], ?Column $fromColumn = null)
{
public function __construct(
$oldColumnName,
Column $column,
array $changedProperties = [],
?Column $fromColumn = null
) {
$this->oldColumnName = $oldColumnName;
$this->column = $column;
$this->changedProperties = $changedProperties;
......
lib/Doctrine/DBAL/Schema/Comparator.php
View file @ 3f3551aa
......@@ -68,7 +68,11 @@ class Comparator
if (! $fromSchema->hasTable($tableName)) {
$diff->newTables[$tableName] = $toSchema->getTable($tableName);
} else {
$tableDifferences = $this->diffTable($fromSchema->getTable($tableName), $toSchema->getTable($tableName));
$tableDifferences = $this->diffTable(
$fromSchema->getTable($tableName),
$toSchema->getTable($tableName)
);
if ($tableDifferences !== false) {
$diff->changedTables[$tableName] = $tableDifferences;
}
......@@ -225,7 +229,8 @@ class Comparator
continue;
}
$columnDiff = new ColumnDiff($column->getName(), $table2->getColumn($columnName), $changedProperties);
$columnDiff = new ColumnDiff($column->getName(), $table2->getColumn($columnName), $changedProperties);
$columnDiff->fromColumn = $column;
$tableDifferences->changedColumns[$column->getName()] = $columnDiff;
$changes++;
......@@ -394,11 +399,17 @@ class Comparator
*/
public function diffForeignKey(ForeignKeyConstraint $key1, ForeignKeyConstraint $key2)
{
if (array_map('strtolower', $key1->getUnquotedLocalColumns()) !== array_map('strtolower', $key2->getUnquotedLocalColumns())) {
if (
array_map('strtolower', $key1->getUnquotedLocalColumns())
!== array_map('strtolower', $key2->getUnquotedLocalColumns())
) {
return true;
}
if (array_map('strtolower', $key1->getUnquotedForeignColumns()) !== array_map('strtolower', $key2->getUnquotedForeignColumns())) {
if (
array_map('strtolower', $key1->getUnquotedForeignColumns())
!== array_map('strtolower', $key2->getUnquotedForeignColumns())
) {
return true;
}
......@@ -440,7 +451,8 @@ class Comparator
$changedProperties[] = $property;
}
// This is a very nasty hack to make comparator work with the legacy json_array type, which should be killed in v3
// This is a very nasty hack to make comparator work with the legacy json_array type,
// which should be killed in v3
if ($this->isALegacyJsonComparison($properties1['type'], $properties2['type'])) {
array_shift($changedProperties);
......@@ -525,8 +537,8 @@ class Comparator
return false;
}
return ( ! $one instanceof Types\JsonArrayType && $other instanceof Types\JsonArrayType)
|| ( ! $other instanceof Types\JsonArrayType && $one instanceof Types\JsonArrayType);
return (! $one instanceof Types\JsonArrayType && $other instanceof Types\JsonArrayType)
|| (! $other instanceof Types\JsonArrayType && $one instanceof Types\JsonArrayType);
}
/**
......
lib/Doctrine/DBAL/Schema/ForeignKeyConstraint.php
View file @ 3f3551aa
......@@ -63,8 +63,13 @@ class ForeignKeyConstraint extends AbstractAsset implements Constraint
* @param string|null $name Name of the foreign key constraint.
* @param mixed[] $options Options associated with the foreign key constraint.
*/
public function __construct(array $localColumnNames, $foreignTableName, array $foreignColumnNames, $name = null, array $options = [])
{
public function __construct(
array $localColumnNames,
$foreignTableName,
array $foreignColumnNames,
$name = null,
array $options = []
) {
if ($name !== null) {
$this->_setName($name);
}
......
lib/Doctrine/DBAL/Schema/Index.php
View file @ 3f3551aa
......@@ -54,8 +54,14 @@ class Index extends AbstractAsset implements Constraint
* @param string[] $flags
* @param mixed[] $options
*/
public function __construct($name, array $columns, $isUnique = false, $isPrimary = false, array $flags = [], array $options = [])
{
public function __construct(
$name,
array $columns,
$isUnique = false,
$isPrimary = false,
array $flags = [],
array $options = []
) {
$isUnique = $isUnique || $isPrimary;
$this->_setName($name);
......@@ -183,7 +189,10 @@ class Index extends AbstractAsset implements Constraint
$sameColumns = true;
for ($i = 0; $i < $numberOfColumns; $i++) {
if (isset($columnNames[$i]) && $this->trimQuotes(strtolower($columns[$i])) === $this->trimQuotes(strtolower($columnNames[$i]))) {
if (
isset($columnNames[$i])
&& $this->trimQuotes(strtolower($columns[$i])) === $this->trimQuotes(strtolower($columnNames[$i]))
) {
continue;
}
......@@ -251,7 +260,9 @@ class Index extends AbstractAsset implements Constraint
return false;
}
return $this->spansColumns($other->getColumns()) && ($this->isPrimary() || $this->isUnique()) && $this->samePartialIndex($other);
return $this->spansColumns($other->getColumns())
&& ($this->isPrimary() || $this->isUnique())
&& $this->samePartialIndex($other);
}
/**
......@@ -339,7 +350,11 @@ class Index extends AbstractAsset implements Constraint
*/
private function samePartialIndex(Index $other)
{
if ($this->hasOption('where') && $other->hasOption('where') && $this->getOption('where') === $other->getOption('where')) {
if (
$this->hasOption('where')
&& $other->hasOption('where')
&& $this->getOption('where') === $other->getOption('where')
) {
return true;
}
......
lib/Doctrine/DBAL/Schema/PostgreSqlSchemaManager.php
View file @ 3f3551aa
......@@ -43,7 +43,9 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
*/
public function getSchemaNames()
{
$statement = $this->_conn->executeQuery("SELECT nspname FROM pg_namespace WHERE nspname !~ '^pg_.*' AND nspname != 'information_schema'");
$statement = $this->_conn->executeQuery(
"SELECT nspname FROM pg_namespace WHERE nspname !~ '^pg_.*' AND nspname != 'information_schema'"
);
return $statement->fetchAll(FetchMode::COLUMN);
}
......@@ -302,7 +304,9 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
if (! isset($sequence['increment_by'], $sequence['min_value'])) {
/** @var string[] $data */
$data = $this->_conn->fetchAssoc('SELECT min_value, increment_by FROM ' . $this->_platform->quoteIdentifier($sequenceName));
$data = $this->_conn->fetchAssoc(
'SELECT min_value, increment_by FROM ' . $this->_platform->quoteIdentifier($sequenceName)
);
$sequence += $data;
}
......@@ -358,7 +362,10 @@ class PostgreSqlSchemaManager extends AbstractSchemaManager
$jsonb = null;
$dbType = strtolower($tableColumn['type']);
if (strlen($tableColumn['domain_type']) && ! $this->_platform->hasDoctrineTypeMappingFor($tableColumn['type'])) {
if (
strlen($tableColumn['domain_type'])
&& ! $this->_platform->hasDoctrineTypeMappingFor($tableColumn['type'])
) {
$dbType = strtolower($tableColumn['domain_type']);
$tableColumn['complete_type'] = $tableColumn['domain_complete_type'];
}
......
lib/Doctrine/DBAL/Schema/SQLServerSchemaManager.php
View file @ 3f3551aa
......@@ -156,20 +156,22 @@ class SQLServerSchemaManager extends AbstractSchemaManager
$foreignKeys = [];
foreach ($tableForeignKeys as $tableForeignKey) {
if (! isset($foreignKeys[$tableForeignKey['ForeignKey']])) {
$foreignKeys[$tableForeignKey['ForeignKey']] = [
$name = $tableForeignKey['ForeignKey'];
if (! isset($foreignKeys[$name])) {
$foreignKeys[$name] = [
'local_columns' => [$tableForeignKey['ColumnName']],
'foreign_table' => $tableForeignKey['ReferenceTableName'],
'foreign_columns' => [$tableForeignKey['ReferenceColumnName']],
'name' => $tableForeignKey['ForeignKey'],
'name' => $name,
'options' => [
'onUpdate' => str_replace('_', ' ', $tableForeignKey['update_referential_action_desc']),
'onDelete' => str_replace('_', ' ', $tableForeignKey['delete_referential_action_desc']),
],
];
} else {
$foreignKeys[$tableForeignKey['ForeignKey']]['local_columns'][] = $tableForeignKey['ColumnName'];
$foreignKeys[$tableForeignKey['ForeignKey']]['foreign_columns'][] = $tableForeignKey['ReferenceColumnName'];
$foreignKeys[$name]['local_columns'][] = $tableForeignKey['ColumnName'];
$foreignKeys[$name]['foreign_columns'][] = $tableForeignKey['ReferenceColumnName'];
}
}
......
lib/Doctrine/DBAL/Schema/SchemaException.php
View file @ 3f3551aa
......@@ -168,8 +168,8 @@ class SchemaException extends DBALException
return new self(
'The performed schema operation on ' . $localTable->getName() . ' requires a named foreign key, ' .
'but the given foreign key from (' . implode(', ', $foreignKey->getColumns()) . ') onto foreign table ' .
"'" . $foreignKey->getForeignTableName() . "' (" . implode(', ', $foreignKey->getForeignColumns()) . ') is currently ' .
'unnamed.'
"'" . $foreignKey->getForeignTableName() . "' (" . implode(', ', $foreignKey->getForeignColumns()) . ')' .
' is currently unnamed.'
);
}
......
lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php
View file @ 3f3551aa
......@@ -11,6 +11,7 @@ use Doctrine\DBAL\Types\Type;
use function array_change_key_case;
use function array_map;
use function array_merge;
use function array_reverse;
use function array_values;
use function explode;
......@@ -145,10 +146,13 @@ class SqliteSchemaManager extends AbstractSchemaManager
}
foreach ($tableForeignKeys as $key => $value) {
$id = $value['id'];
$tableForeignKeys[$key]['constraint_name'] = isset($names[$id]) && $names[$id] !== '' ? $names[$id] : $id;
$tableForeignKeys[$key]['deferrable'] = isset($deferrable[$id]) && strtolower($deferrable[$id]) === 'deferrable';
$tableForeignKeys[$key]['deferred'] = isset($deferred[$id]) && strtolower($deferred[$id]) === 'deferred';
$id = $value['id'];
$tableForeignKeys[$key] = array_merge($tableForeignKeys[$key], [
'constraint_name' => isset($names[$id]) && $names[$id] !== '' ? $names[$id] : $id,
'deferrable' => isset($deferrable[$id]) && strtolower($deferrable[$id]) === 'deferrable',
'deferred' => isset($deferred[$id]) && strtolower($deferred[$id]) === 'deferred',
]);
}
}
......@@ -283,7 +287,10 @@ class SqliteSchemaManager extends AbstractSchemaManager
$type = $column->getType();
if ($type instanceof StringType || $type instanceof TextType) {
$column->setPlatformOption('collation', $this->parseColumnCollationFromSQL($columnName, $createSql) ?: 'BINARY');
$column->setPlatformOption(
'collation',
$this->parseColumnCollationFromSQL($columnName, $createSql) ?: 'BINARY'
);
}
$comment = $this->parseColumnCommentFromSQL($columnName, $createSql);
......@@ -459,7 +466,9 @@ class SqliteSchemaManager extends AbstractSchemaManager
$tableDetails = $this->tryMethod('listTableDetails', $table);
if ($tableDetails === false) {
throw new DBALException(sprintf('Sqlite schema manager requires to modify foreign keys table definition "%s".', $table));
throw new DBALException(
sprintf('Sqlite schema manager requires to modify foreign keys table definition "%s".', $table)
);
}
$table = $tableDetails;
......@@ -473,7 +482,8 @@ class SqliteSchemaManager extends AbstractSchemaManager
private function parseColumnCollationFromSQL(string $column, string $sql): ?string
{
$pattern = '{(?:\W' . preg_quote($column) . '\W|\W' . preg_quote($this->_platform->quoteSingleIdentifier($column))
$pattern = '{(?:\W' . preg_quote($column) . '\W|\W'
. preg_quote($this->_platform->quoteSingleIdentifier($column))
. '\W)[^,(]+(?:\([^()]+\)[^,]*)?(?:(?:DEFAULT|CHECK)\s*(?:\(.*?\))?[^,]*)*COLLATE\s+["\']?([^\s,"\')]+)}is';
if (preg_match($pattern, $sql, $match) !== 1) {
......@@ -504,8 +514,8 @@ CREATE\sTABLE # Match "CREATE TABLE"
private function parseColumnCommentFromSQL(string $column, string $sql): ?string
{
$pattern = '{[\s(,](?:\W' . preg_quote($this->_platform->quoteSingleIdentifier($column)) . '\W|\W' . preg_quote($column)
. '\W)(?:\([^)]*?\)|[^,(])*?,?((?:(?!\n))(?:\s*--[^\n]*\n?)+)}i';
$pattern = '{[\s(,](?:\W' . preg_quote($this->_platform->quoteSingleIdentifier($column))
. '\W|\W' . preg_quote($column) . '\W)(?:\([^)]*?\)|[^,(])*?,?((?:(?!\n))(?:\s*--[^\n]*\n?)+)}i';
if (preg_match($pattern, $sql, $match) !== 1) {
return null;
......
lib/Doctrine/DBAL/Schema/Table.php
View file @ 3f3551aa
......@@ -53,8 +53,14 @@ class Table extends AbstractAsset
*
* @throws DBALException
*/
public function __construct($name, array $columns = [], array $indexes = [], array $fkConstraints = [], $idGeneratorType = 0, array $options = [])
{
public function __construct(
$name,
array $columns = [],
array $indexes = [],
array $fkConstraints = [],
$idGeneratorType = 0,
array $options = []
) {
if (strlen($name) === 0) {
throw DBALException::invalidTableName($name);
}
......@@ -263,8 +269,14 @@ class Table extends AbstractAsset
*
* @throws SchemaException
*/
private function _createIndex(array $columnNames, $indexName, $isUnique, $isPrimary, array $flags = [], array $options = [])
{
private function _createIndex(
array $columnNames,
$indexName,
$isUnique,
$isPrimary,
array $flags = [],
array $options = []
) {
if (preg_match('(([^a-zA-Z0-9_]+))', $this->normalizeIdentifier($indexName))) {
throw SchemaException::indexNameInvalid($indexName);
}
......@@ -357,11 +369,26 @@ class Table extends AbstractAsset
*
* @return self
*/
public function addForeignKeyConstraint($foreignTable, array $localColumnNames, array $foreignColumnNames, array $options = [], $constraintName = null)
{
$constraintName = $constraintName ?: $this->_generateIdentifierName(array_merge((array) $this->getName(), $localColumnNames), 'fk', $this->_getMaxIdentifierLength());
public function addForeignKeyConstraint(
$foreignTable,
array $localColumnNames,
array $foreignColumnNames,
array $options = [],
$constraintName = null
) {
$constraintName = $constraintName ?: $this->_generateIdentifierName(
array_merge((array) $this->getName(), $localColumnNames),
'fk',
$this->_getMaxIdentifierLength()
);
return $this->addNamedForeignKeyConstraint($constraintName, $foreignTable, $localColumnNames, $foreignColumnNames, $options);
return $this->addNamedForeignKeyConstraint(
$constraintName,
$foreignTable,
$localColumnNames,
$foreignColumnNames,
$options
);
}
/**
......@@ -378,8 +405,12 @@ class Table extends AbstractAsset
*
* @return self
*/
public function addUnnamedForeignKeyConstraint($foreignTable, array $localColumnNames, array $foreignColumnNames, array $options = [])
{
public function addUnnamedForeignKeyConstraint(
$foreignTable,
array $localColumnNames,
array $foreignColumnNames,
array $options = []
) {
return $this->addForeignKeyConstraint($foreignTable, $localColumnNames, $foreignColumnNames, $options);
}
......@@ -398,8 +429,13 @@ class Table extends AbstractAsset
*
* @throws SchemaException
*/
public function addNamedForeignKeyConstraint($name, $foreignTable, array $localColumnNames, array $foreignColumnNames, array $options = [])
{
public function addNamedForeignKeyConstraint(
$name,
$foreignTable,
array $localColumnNames,
array $foreignColumnNames,
array $options = []
) {
if ($foreignTable instanceof Table) {
foreach ($foreignColumnNames as $columnName) {
if (! $foreignTable->hasColumn($columnName)) {
......@@ -518,14 +554,17 @@ class Table extends AbstractAsset
$this->_fkConstraints[$name] = $constraint;
// add an explicit index on the foreign key columns. If there is already an index that fulfils this requirements drop the request.
// In the case of __construct calling this method during hydration from schema-details all the explicitly added indexes
// lead to duplicates. This creates computation overhead in this case, however no duplicate indexes are ever added (based on columns).
$indexName = $this->_generateIdentifierName(
// Add an explicit index on the foreign key columns.
// If there is already an index that fulfils this requirements drop the request.
// In the case of __construct calling this method during hydration from schema-details
// all the explicitly added indexes lead to duplicates. This creates computation overhead in this case,
// however no duplicate indexes are ever added (based on columns).
$indexName = $this->_generateIdentifierName(
array_merge([$this->getName()], $constraint->getColumns()),
'idx',
$this->_getMaxIdentifierLength()
);
$indexCandidate = $this->_createIndex($constraint->getColumns(), $indexName, false, false);
foreach ($this->_indexes as $existingIndex) {
......
lib/Doctrine/DBAL/Schema/Visitor/Graphviz.php
View file @ 3f3551aa
......@@ -71,17 +71,21 @@ class Graphviz extends AbstractVisitor
$label = '<<TABLE CELLSPACING="0" BORDER="1" ALIGN="LEFT">';
// The title
$label .= '<TR><TD BORDER="1" COLSPAN="3" ALIGN="CENTER" BGCOLOR="#fcaf3e"><FONT COLOR="#2e3436" FACE="Helvetica" POINT-SIZE="12">' . $table->getName() . '</FONT></TD></TR>';
$label .= '<TR><TD BORDER="1" COLSPAN="3" ALIGN="CENTER" BGCOLOR="#fcaf3e">'
. '<FONT COLOR="#2e3436" FACE="Helvetica" POINT-SIZE="12">' . $table->getName() . '</FONT></TD></TR>';
// The attributes block
foreach ($table->getColumns() as $column) {
$columnLabel = $column->getName();
$label .= '<TR>';
$label .= '<TD BORDER="0" ALIGN="LEFT" BGCOLOR="#eeeeec">';
$label .= '<FONT COLOR="#2e3436" FACE="Helvetica" POINT-SIZE="12">' . $columnLabel . '</FONT>';
$label .= '</TD><TD BORDER="0" ALIGN="LEFT" BGCOLOR="#eeeeec"><FONT COLOR="#2e3436" FACE="Helvetica" POINT-SIZE="10">' . strtolower($column->getType()) . '</FONT></TD>';
$label .= '<TD BORDER="0" ALIGN="RIGHT" BGCOLOR="#eeeeec" PORT="col' . $column->getName() . '">';
$label .= '<TR>'
. '<TD BORDER="0" ALIGN="LEFT" BGCOLOR="#eeeeec">'
. '<FONT COLOR="#2e3436" FACE="Helvetica" POINT-SIZE="12">' . $columnLabel . '</FONT>'
. '</TD>'
. '<TD BORDER="0" ALIGN="LEFT" BGCOLOR="#eeeeec">'
. '<FONT COLOR="#2e3436" FACE="Helvetica" POINT-SIZE="10">' . strtolower($column->getType()) . '</FONT>'
. '</TD>'
. '<TD BORDER="0" ALIGN="RIGHT" BGCOLOR="#eeeeec" PORT="col' . $column->getName() . '">';
$primaryKey = $table->getPrimaryKey();
......
lib/Doctrine/DBAL/Sharding/PoolingShardConnection.php
View file @ 3f3551aa
......@@ -65,8 +65,12 @@ class PoolingShardConnection extends Connection
*
* @throws InvalidArgumentException
*/
public function __construct(array $params, Driver $driver, ?Configuration $config = null, ?EventManager $eventManager = null)
{
public function __construct(
array $params,
Driver $driver,
?Configuration $config = null,
?EventManager $eventManager = null
) {
if (! isset($params['global'], $params['shards'])) {
throw new InvalidArgumentException("Connection Parameters require 'global' and 'shards' configurations.");
}
......@@ -80,14 +84,18 @@ class PoolingShardConnection extends Connection
}
if (! ($params['shardChoser'] instanceof ShardChoser)) {
throw new InvalidArgumentException("The 'shardChoser' configuration is not a valid instance of Doctrine\DBAL\Sharding\ShardChoser\ShardChoser");
throw new InvalidArgumentException(
"The 'shardChoser' configuration is not a valid instance of " . ShardChoser::class
);
}
$this->connectionParameters[0] = array_merge($params, $params['global']);
foreach ($params['shards'] as $shard) {
if (! isset($shard['id'])) {
throw new InvalidArgumentException("Missing 'id' for one configured shard. Please specify a unique shard-id.");
throw new InvalidArgumentException(
"Missing 'id' for one configured shard. Please specify a unique shard-id."
);
}
if (! is_numeric($shard['id']) || $shard['id'] < 1) {
......@@ -119,7 +127,9 @@ class PoolingShardConnection extends Connection
*/
public function getParams()
{
return $this->activeShardId ? $this->connectionParameters[$this->activeShardId] : $this->connectionParameters[0];
return $this->activeShardId
? $this->connectionParameters[$this->activeShardId]
: $this->connectionParameters[0];
}
/**
......
lib/Doctrine/DBAL/Sharding/SQLAzure/SQLAzureFederationsSynchronizer.php
View file @ 3f3551aa
......@@ -62,7 +62,9 @@ class SQLAzureFederationsSynchronizer extends AbstractSchemaSynchronizer
$defaultValue = $this->getFederationTypeDefaultValue();
$sql[] = $this->getCreateFederationStatement();
$sql[] = 'USE FEDERATION ' . $this->shardManager->getFederationName() . ' (' . $this->shardManager->getDistributionKey() . ' = ' . $defaultValue . ') WITH RESET, FILTERING = OFF;';
$sql[] = 'USE FEDERATION ' . $this->shardManager->getFederationName()
. ' (' . $this->shardManager->getDistributionKey() . ' = ' . $defaultValue . ')'
. ' WITH RESET, FILTERING = OFF;';
$sql = array_merge($sql, $federationSql);
}
......@@ -136,7 +138,9 @@ class SQLAzureFederationsSynchronizer extends AbstractSchemaSynchronizer
}
$sql[] = '-- Work on Federation ID ' . $shard['id'] . "\n" .
'USE FEDERATION ' . $this->shardManager->getFederationName() . ' (' . $this->shardManager->getDistributionKey() . ' = ' . $shard['rangeLow'] . ') WITH RESET, FILTERING = OFF;';
'USE FEDERATION ' . $this->shardManager->getFederationName()
. ' (' . $this->shardManager->getDistributionKey() . ' = ' . $shard['rangeLow'] . ')'
. ' WITH RESET, FILTERING = OFF;';
$sql = array_merge($sql, $federationSql);
}
......@@ -226,8 +230,10 @@ class SQLAzureFederationsSynchronizer extends AbstractSchemaSynchronizer
continue;
}
$sql[] = '-- Work on Federation ID ' . $shard['id'] . "\n" .
'USE FEDERATION ' . $this->shardManager->getFederationName() . ' (' . $this->shardManager->getDistributionKey() . ' = ' . $shard['rangeLow'] . ') WITH RESET, FILTERING = OFF;';
$sql[] = '-- Work on Federation ID ' . $shard['id'] . "\n"
. 'USE FEDERATION ' . $this->shardManager->getFederationName()
. ' (' . $this->shardManager->getDistributionKey() . ' = ' . $shard['rangeLow'] . ')'
. ' WITH RESET, FILTERING = OFF;';
$sql = array_merge($sql, $federationSql);
}
......@@ -266,7 +272,9 @@ class SQLAzureFederationsSynchronizer extends AbstractSchemaSynchronizer
$federationType = Type::getType($this->shardManager->getDistributionType());
$federationTypeSql = $federationType->getSQLDeclaration([], $this->conn->getDatabasePlatform());
return "--Create Federation\n" .
'CREATE FEDERATION ' . $this->shardManager->getFederationName() . ' (' . $this->shardManager->getDistributionKey() . ' ' . $federationTypeSql . ' RANGE)';
return "--Create Federation\n"
. 'CREATE FEDERATION ' . $this->shardManager->getFederationName()
. ' (' . $this->shardManager->getDistributionKey()
. ' ' . $federationTypeSql . ' RANGE)';
}
}
lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php
View file @ 3f3551aa
......@@ -159,7 +159,10 @@ EOT
$keywords[] = new $class();
}
$output->write('Checking keyword violations for <comment>' . implode(', ', $keywordLists) . '</comment>...', true);
$output->write(
'Checking keyword violations for <comment>' . implode(', ', $keywordLists) . '</comment>...',
true
);
$schema = $conn->getSchemaManager()->createSchema();
$visitor = new ReservedKeywordsValidator($keywords);
......@@ -167,7 +170,12 @@ EOT
$violations = $visitor->getViolations();
if (count($violations) !== 0) {
$output->write('There are <error>' . count($violations) . '</error> reserved keyword violations in your database schema:', true);
$output->write(
'There are <error>' . count($violations) . '</error> reserved keyword violations'
. ' in your database schema:',
true
);
foreach ($violations as $violation) {
$output->write(' - ' . $violation, true);
}
......
lib/Doctrine/DBAL/Types/DateTimeType.php
View file @ 3f3551aa
......@@ -61,7 +61,11 @@ class DateTimeType extends Type implements PhpDateTimeMappingType
}
if (! $val) {
throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getDateTimeFormatString());
throw ConversionException::conversionFailedFormat(
$value,
$this->getName(),
$platform->getDateTimeFormatString()
);
}
return $val;
......
lib/Doctrine/DBAL/Types/DateTimeTzType.php
View file @ 3f3551aa
......@@ -67,7 +67,11 @@ class DateTimeTzType extends Type implements PhpDateTimeMappingType
$val = DateTime::createFromFormat($platform->getDateTimeTzFormatString(), $value);
if (! $val) {
throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getDateTimeTzFormatString());
throw ConversionException::conversionFailedFormat(
$value,
$this->getName(),
$platform->getDateTimeTzFormatString()
);
}
return $val;
......
lib/Doctrine/DBAL/Types/DateType.php
View file @ 3f3551aa
......@@ -54,7 +54,11 @@ class DateType extends Type
$val = DateTime::createFromFormat('!' . $platform->getDateFormatString(), $value);
if (! $val) {
throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getDateFormatString());
throw ConversionException::conversionFailedFormat(
$value,
$this->getName(),
$platform->getDateFormatString()
);
}
return $val;
......
lib/Doctrine/DBAL/Types/TimeType.php
View file @ 3f3551aa
......@@ -54,7 +54,11 @@ class TimeType extends Type
$val = DateTime::createFromFormat('!' . $platform->getTimeFormatString(), $value);
if (! $val) {
throw ConversionException::conversionFailedFormat($value, $this->getName(), $platform->getTimeFormatString());
throw ConversionException::conversionFailedFormat(
$value,
$this->getName(),
$platform->getTimeFormatString()
);
}
return $val;
......
tests/Doctrine/Tests/DBAL/ConnectionTest.php
View file @ 3f3551aa
......@@ -184,7 +184,12 @@ class ConnectionTest extends DbalTestCase
public function testDriverExceptionIsWrapped(string $method): void
{
$this->expectException(DBALException::class);
$this->expectExceptionMessage("An exception occurred while executing 'MUUHAAAAHAAAA':\n\nSQLSTATE[HY000]: General error: 1 near \"MUUHAAAAHAAAA\"");
$this->expectExceptionMessage(<<<EOF
An exception occurred while executing 'MUUHAAAAHAAAA':
SQLSTATE[HY000]: General error: 1 near "MUUHAAAAHAAAA"
EOF
);
$connection = DriverManager::getConnection([
'driver' => 'pdo_sqlite',
......@@ -652,7 +657,7 @@ class ConnectionTest extends DbalTestCase
$conn = new Connection($params, $driverMock);
self::assertArrayNotHasKey('pdo', $conn->getParams(), 'Connection is maintaining additional reference to the PDO connection');
self::assertArrayNotHasKey('pdo', $conn->getParams());
}
public function testPassingExternalPDOMeansConnectionIsConnected(): void
......
tests/Doctrine/Tests/DBAL/DBALExceptionTest.php
View file @ 3f3551aa
......@@ -26,7 +26,14 @@ class DBALExceptionTest extends DbalTestCase
public function testDriverExceptionDuringQueryAcceptsResource(): void
{
$driver = $this->createMock(Driver::class);
$e = DBALException::driverExceptionDuringQuery($driver, new Exception(), 'INSERT INTO file (`content`) VALUES (?)', [1 => fopen(__FILE__, 'r')]);
$e = DBALException::driverExceptionDuringQuery(
$driver,
new Exception(),
'INSERT INTO file (`content`) VALUES (?)',
[1 => fopen(__FILE__, 'r')]
);
self::assertStringContainsString('Resource', $e->getMessage());
}
......@@ -62,7 +69,8 @@ class DBALExceptionTest extends DbalTestCase
$exception = DBALException::invalidPlatformType(new stdClass());
self::assertSame(
"Option 'platform' must be a subtype of 'Doctrine\DBAL\Platforms\AbstractPlatform', instance of 'stdClass' given",
"Option 'platform' must be a subtype of 'Doctrine\DBAL\Platforms\AbstractPlatform', "
. "instance of 'stdClass' given",
$exception->getMessage()
);
}
......@@ -72,7 +80,8 @@ class DBALExceptionTest extends DbalTestCase
$exception = DBALException::invalidPlatformType('some string');
self::assertSame(
"Option 'platform' must be an object and subtype of 'Doctrine\DBAL\Platforms\AbstractPlatform'. Got 'string'",
"Option 'platform' must be an object and subtype of 'Doctrine\DBAL\Platforms\AbstractPlatform'. "
. "Got 'string'",
$exception->getMessage()
);
}
......
tests/Doctrine/Tests/DBAL/Driver/AbstractOracleDriver/EasyConnectStringTest.php
View file @ 3f3551aa
......@@ -45,7 +45,8 @@ class EasyConnectStringTest extends TestCase
'service' => true,
'servicename' => 'BILLING',
],
'(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=BILLING)))',
'(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=1521))'
. '(CONNECT_DATA=(SERVICE_NAME=BILLING)))',
],
'advanced-params' => [
[
......@@ -55,7 +56,8 @@ class EasyConnectStringTest extends TestCase
'instancename' => 'SALES',
'pooled' => true,
],
'(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=41521))(CONNECT_DATA=(SID=XE)(INSTANCE_NAME=SALES)(SERVER=POOLED)))',
'(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=41521))'
. '(CONNECT_DATA=(SID=XE)(INSTANCE_NAME=SALES)(SERVER=POOLED)))',
],
];
}
......
tests/Doctrine/Tests/DBAL/Functional/BlobTest.php
View file @ 3f3551aa
......@@ -141,7 +141,9 @@ class BlobTest extends DbalFunctionalTestCase
$this->markTestIncomplete('The oci8 driver does not support stream resources as parameters');
}
$stmt = $this->connection->prepare("INSERT INTO blob_table(id, clobcolumn, blobcolumn) VALUES (1, 'ignored', ?)");
$stmt = $this->connection->prepare(
"INSERT INTO blob_table(id, clobcolumn, blobcolumn) VALUES (1, 'ignored', ?)"
);
$stream = null;
$stmt->bindParam(1, $stream, ParameterType::LARGE_OBJECT);
......
tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php
View file @ 3f3551aa
......@@ -63,8 +63,6 @@ class ConnectionTest extends DbalFunctionalTestCase
self::assertEquals(2, $this->connection->getTransactionNestingLevel());
throw new Exception();
$this->connection->commit(); // never reached
} catch (Throwable $e) {
$this->connection->rollBack();
self::assertEquals(1, $this->connection->getTransactionNestingLevel());
......@@ -136,8 +134,6 @@ class ConnectionTest extends DbalFunctionalTestCase
self::assertEquals(2, $this->connection->getTransactionNestingLevel());
throw new Exception();
$this->connection->commit(); // never reached
} catch (Throwable $e) {
$this->connection->rollBack();
self::assertEquals(1, $this->connection->getTransactionNestingLevel());
......@@ -147,7 +143,7 @@ class ConnectionTest extends DbalFunctionalTestCase
self::assertFalse($this->connection->isRollbackOnly());
try {
$this->connection->setNestTransactionsWithSavepoints(false);
$this->fail('Should not be able to disable savepoints in usage for nested transactions inside an open transaction.');
$this->fail('Should not be able to disable savepoints in usage inside a nested open transaction.');
} catch (ConnectionException $e) {
self::assertTrue($this->connection->getNestTransactionsWithSavepoints());
}
......@@ -225,8 +221,6 @@ class ConnectionTest extends DbalFunctionalTestCase
self::assertEquals(1, $this->connection->getTransactionNestingLevel());
throw new Exception();
$this->connection->commit(); // never reached
} catch (Throwable $e) {
self::assertEquals(1, $this->connection->getTransactionNestingLevel());
$this->connection->rollBack();
......
tests/Doctrine/Tests/DBAL/Functional/DataAccessTest.php
View file @ 3f3551aa
......@@ -57,7 +57,12 @@ class DataAccessTest extends DbalFunctionalTestCase
$sm = $this->connection->getSchemaManager();
$sm->createTable($table);
$this->connection->insert('fetch_table', ['test_int' => 1, 'test_string' => 'foo', 'test_datetime' => '2010-01-01 10:10:10']);
$this->connection->insert('fetch_table', [
'test_int' => 1,
'test_string' => 'foo',
'test_datetime' => '2010-01-01 10:10:10',
]);
self::$generated = true;
}
......@@ -472,7 +477,11 @@ class DataAccessTest extends DbalFunctionalTestCase
public function testNativeArrayListSupport(): void
{
for ($i = 100; $i < 110; $i++) {
$this->connection->insert('fetch_table', ['test_int' => $i, 'test_string' => 'foo' . $i, 'test_datetime' => '2010-01-01 10:10:10']);
$this->connection->insert('fetch_table', [
'test_int' => $i,
'test_string' => 'foo' . $i,
'test_datetime' => '2010-01-01 10:10:10',
]);
}
$stmt = $this->connection->executeQuery(
......@@ -583,22 +592,22 @@ class DataAccessTest extends DbalFunctionalTestCase
$row = $this->connection->fetchAssoc($sql);
$row = array_change_key_case($row, CASE_LOWER);
self::assertEquals('2010-01-01 10:10:11', date('Y-m-d H:i:s', strtotime($row['add_seconds'])), 'Adding second should end up on 2010-01-01 10:10:11');
self::assertEquals('2010-01-01 10:10:09', date('Y-m-d H:i:s', strtotime($row['sub_seconds'])), 'Subtracting second should end up on 2010-01-01 10:10:09');
self::assertEquals('2010-01-01 10:15:10', date('Y-m-d H:i:s', strtotime($row['add_minutes'])), 'Adding minutes should end up on 2010-01-01 10:15:10');
self::assertEquals('2010-01-01 10:05:10', date('Y-m-d H:i:s', strtotime($row['sub_minutes'])), 'Subtracting minutes should end up on 2010-01-01 10:05:10');
self::assertEquals('2010-01-01 13:10', date('Y-m-d H:i', strtotime($row['add_hour'])), 'Adding date should end up on 2010-01-01 13:10');
self::assertEquals('2010-01-01 07:10', date('Y-m-d H:i', strtotime($row['sub_hour'])), 'Subtracting date should end up on 2010-01-01 07:10');
self::assertEquals('2010-01-11', date('Y-m-d', strtotime($row['add_days'])), 'Adding date should end up on 2010-01-11');
self::assertEquals('2009-12-22', date('Y-m-d', strtotime($row['sub_days'])), 'Subtracting date should end up on 2009-12-22');
self::assertEquals('2010-01-08', date('Y-m-d', strtotime($row['add_weeks'])), 'Adding week should end up on 2010-01-08');
self::assertEquals('2009-12-25', date('Y-m-d', strtotime($row['sub_weeks'])), 'Subtracting week should end up on 2009-12-25');
self::assertEquals('2010-03-01', date('Y-m-d', strtotime($row['add_month'])), 'Adding month should end up on 2010-03-01');
self::assertEquals('2009-11-01', date('Y-m-d', strtotime($row['sub_month'])), 'Subtracting month should end up on 2009-11-01');
self::assertEquals('2010-10-01', date('Y-m-d', strtotime($row['add_quarters'])), 'Adding quarters should end up on 2010-04-01');
self::assertEquals('2009-04-01', date('Y-m-d', strtotime($row['sub_quarters'])), 'Subtracting quarters should end up on 2009-10-01');
self::assertEquals('2016-01-01', date('Y-m-d', strtotime($row['add_years'])), 'Adding years should end up on 2016-01-01');
self::assertEquals('2004-01-01', date('Y-m-d', strtotime($row['sub_years'])), 'Subtracting years should end up on 2004-01-01');
self::assertEquals('2010-01-01 10:10:11', date('Y-m-d H:i:s', strtotime($row['add_seconds'])));
self::assertEquals('2010-01-01 10:10:09', date('Y-m-d H:i:s', strtotime($row['sub_seconds'])));
self::assertEquals('2010-01-01 10:15:10', date('Y-m-d H:i:s', strtotime($row['add_minutes'])));
self::assertEquals('2010-01-01 10:05:10', date('Y-m-d H:i:s', strtotime($row['sub_minutes'])));
self::assertEquals('2010-01-01 13:10', date('Y-m-d H:i', strtotime($row['add_hour'])));
self::assertEquals('2010-01-01 07:10', date('Y-m-d H:i', strtotime($row['sub_hour'])));
self::assertEquals('2010-01-11', date('Y-m-d', strtotime($row['add_days'])));
self::assertEquals('2009-12-22', date('Y-m-d', strtotime($row['sub_days'])));
self::assertEquals('2010-01-08', date('Y-m-d', strtotime($row['add_weeks'])));
self::assertEquals('2009-12-25', date('Y-m-d', strtotime($row['sub_weeks'])));
self::assertEquals('2010-03-01', date('Y-m-d', strtotime($row['add_month'])));
self::assertEquals('2009-11-01', date('Y-m-d', strtotime($row['sub_month'])));
self::assertEquals('2010-10-01', date('Y-m-d', strtotime($row['add_quarters'])));
self::assertEquals('2009-04-01', date('Y-m-d', strtotime($row['sub_quarters'])));
self::assertEquals('2016-01-01', date('Y-m-d', strtotime($row['add_years'])));
self::assertEquals('2004-01-01', date('Y-m-d', strtotime($row['sub_years'])));
}
public function testSqliteDateArithmeticWithDynamicInterval(): void
......
tests/Doctrine/Tests/DBAL/Functional/Driver/PDOPgSql/DriverTest.php
View file @ 3f3551aa
......@@ -31,8 +31,11 @@ class DriverTest extends AbstractDriverTest
/**
* @dataProvider getDatabaseParameter
*/
public function testDatabaseParameters(?string $databaseName, ?string $defaultDatabaseName, ?string $expectedDatabaseName): void
{
public function testDatabaseParameters(
?string $databaseName,
?string $defaultDatabaseName,
?string $expectedDatabaseName
): void {
$params = $this->connection->getParams();
$params['dbname'] = $databaseName;
$params['default_dbname'] = $defaultDatabaseName;
......
tests/Doctrine/Tests/DBAL/Functional/ModifyLimitQueryTest.php
View file @ 3f3551aa
......@@ -65,7 +65,11 @@ class ModifyLimitQueryTest extends DbalFunctionalTestCase
$this->connection->insert('modify_limit_table2', ['test_int' => 2]);
$this->connection->insert('modify_limit_table2', ['test_int' => 2]);
$sql = 'SELECT modify_limit_table.test_int FROM modify_limit_table INNER JOIN modify_limit_table2 ON modify_limit_table.test_int = modify_limit_table2.test_int ORDER BY modify_limit_table.test_int DESC';
$sql = 'SELECT modify_limit_table.test_int'
. ' FROM modify_limit_table'
. ' INNER JOIN modify_limit_table2'
. ' ON modify_limit_table.test_int = modify_limit_table2.test_int'
. ' ORDER BY modify_limit_table.test_int DESC';
$this->assertLimitResult([2, 2, 1, 1, 1], $sql, 10, 0);
$this->assertLimitResult([1, 1, 1], $sql, 3, 2);
......@@ -113,7 +117,8 @@ class ModifyLimitQueryTest extends DbalFunctionalTestCase
$this->connection->insert('modify_limit_table', ['test_int' => 3]);
$this->connection->insert('modify_limit_table', ['test_int' => 4]);
$sql = 'SELECT modify_limit_table.*, (SELECT COUNT(*) FROM modify_limit_table) AS cnt FROM modify_limit_table ORDER BY test_int DESC';
$sql = 'SELECT modify_limit_table.*, (SELECT COUNT(*) FROM modify_limit_table) AS cnt'
. ' FROM modify_limit_table ORDER BY test_int DESC';
$this->assertLimitResult([4, 3, 2, 1], $sql, 10, 0);
$this->assertLimitResult([4, 3], $sql, 2, 0);
......@@ -167,8 +172,13 @@ SQL;
/**
* @param array<int, int> $expectedResults
*/
private function assertLimitResult(array $expectedResults, string $sql, ?int $limit, int $offset, bool $deterministic = true): void
{
private function assertLimitResult(
array $expectedResults,
string $sql,
?int $limit,
int $offset,
bool $deterministic = true
): void {
$p = $this->connection->getDatabasePlatform();
$data = [];
foreach ($this->connection->fetchAll($p->modifyLimitQuery($sql, $limit, $offset)) as $row) {
......
tests/Doctrine/Tests/DBAL/Functional/PortabilityTest.php
View file @ 3f3551aa
......@@ -38,7 +38,11 @@ class PortabilityTest extends DbalFunctionalTestCase
$params['portability'] = $portabilityMode;
$params['fetch_case'] = $case;
$this->portableConnection = DriverManager::getConnection($params, $this->connection->getConfiguration(), $this->connection->getEventManager());
$this->portableConnection = DriverManager::getConnection(
$params,
$this->connection->getConfiguration(),
$this->connection->getEventManager()
);
try {
$table = new Table('portability_table');
......@@ -50,8 +54,17 @@ class PortabilityTest extends DbalFunctionalTestCase
$sm = $this->portableConnection->getSchemaManager();
$sm->createTable($table);
$this->portableConnection->insert('portability_table', ['Test_Int' => 1, 'Test_String' => 'foo', 'Test_Null' => '']);
$this->portableConnection->insert('portability_table', ['Test_Int' => 2, 'Test_String' => 'foo ', 'Test_Null' => null]);
$this->portableConnection->insert('portability_table', [
'Test_Int' => 1,
'Test_String' => 'foo',
'Test_Null' => '',
]);
$this->portableConnection->insert('portability_table', [
'Test_Int' => 2,
'Test_String' => 'foo ',
'Test_Null' => null,
]);
} catch (Throwable $e) {
}
}
......@@ -128,7 +141,7 @@ class PortabilityTest extends DbalFunctionalTestCase
{
self::assertContains($row['test_int'], [1, 2], 'Primary key test_int should either be 1 or 2.');
self::assertArrayHasKey('test_string', $row, 'Case should be lowered.');
self::assertEquals(3, strlen($row['test_string']), 'test_string should be rtrimed to length of three for CHAR(32) column.');
self::assertEquals(3, strlen($row['test_string']));
self::assertNull($row['test_null']);
self::assertArrayNotHasKey(0, $row, 'The row should not contain numerical keys.');
}
......
tests/Doctrine/Tests/DBAL/Functional/ResultCacheTest.php
View file @ 3f3551aa
......@@ -21,7 +21,11 @@ use const CASE_LOWER;
class ResultCacheTest extends DbalFunctionalTestCase
{
/** @var list<array{test_int: int, test_string: string}> */
private $expectedResult = [['test_int' => 100, 'test_string' => 'foo'], ['test_int' => 200, 'test_string' => 'bar'], ['test_int' => 300, 'test_string' => 'baz']];
private $expectedResult = [
['test_int' => 100, 'test_string' => 'foo'],
['test_int' => 200, 'test_string' => 'bar'],
['test_int' => 300, 'test_string' => 'baz'],
];
/** @var DebugStack */
private $sqlLogger;
......@@ -101,13 +105,23 @@ class ResultCacheTest extends DbalFunctionalTestCase
$numExpectedResult[] = array_values($v);
}
$stmt = $this->connection->executeQuery('SELECT * FROM caching ORDER BY test_int ASC', [], [], new QueryCacheProfile(10, 'testcachekey'));
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching ORDER BY test_int ASC',
[],
[],
new QueryCacheProfile(10, 'testcachekey')
);
$data = $this->hydrateStmt($stmt, FetchMode::ASSOCIATIVE);
self::assertEquals($this->expectedResult, $data);
$stmt = $this->connection->executeQuery('SELECT * FROM caching ORDER BY test_int ASC', [], [], new QueryCacheProfile(10, 'testcachekey'));
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching ORDER BY test_int ASC',
[],
[],
new QueryCacheProfile(10, 'testcachekey')
);
$data = $this->hydrateStmt($stmt, FetchMode::NUMERIC);
......@@ -123,10 +137,22 @@ class ResultCacheTest extends DbalFunctionalTestCase
private function assertStandardAndIteratorFetchAreEqual(int $fetchMode): void
{
$stmt = $this->connection->executeQuery('SELECT * FROM caching ORDER BY test_int ASC', [], [], new QueryCacheProfile(10, 'testcachekey'));
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching ORDER BY test_int ASC',
[],
[],
new QueryCacheProfile(10, 'testcachekey')
);
$data = $this->hydrateStmt($stmt, $fetchMode);
$stmt = $this->connection->executeQuery('SELECT * FROM caching ORDER BY test_int ASC', [], [], new QueryCacheProfile(10, 'testcachekey'));
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching ORDER BY test_int ASC',
[],
[],
new QueryCacheProfile(10, 'testcachekey')
);
$dataIterator = $this->hydrateStmtIterator($stmt, $fetchMode);
self::assertEquals($data, $dataIterator);
......@@ -134,7 +160,12 @@ class ResultCacheTest extends DbalFunctionalTestCase
public function testDontCloseNoCache(): void
{
$stmt = $this->connection->executeQuery('SELECT * FROM caching ORDER BY test_int ASC', [], [], new QueryCacheProfile(10, 'testcachekey'));
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching ORDER BY test_int ASC',
[],
[],
new QueryCacheProfile(10, 'testcachekey')
);
$data = [];
......@@ -142,7 +173,12 @@ class ResultCacheTest extends DbalFunctionalTestCase
$data[] = $row;
}
$stmt = $this->connection->executeQuery('SELECT * FROM caching ORDER BY test_int ASC', [], [], new QueryCacheProfile(10, 'testcachekey'));
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching ORDER BY test_int ASC',
[],
[],
new QueryCacheProfile(10, 'testcachekey')
);
$data = [];
......@@ -155,12 +191,22 @@ class ResultCacheTest extends DbalFunctionalTestCase
public function testDontFinishNoCache(): void
{
$stmt = $this->connection->executeQuery('SELECT * FROM caching ORDER BY test_int ASC', [], [], new QueryCacheProfile(10, 'testcachekey'));
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching ORDER BY test_int ASC',
[],
[],
new QueryCacheProfile(10, 'testcachekey')
);
$stmt->fetch(FetchMode::ASSOCIATIVE);
$stmt->closeCursor();
$stmt = $this->connection->executeQuery('SELECT * FROM caching ORDER BY test_int ASC', [], [], new QueryCacheProfile(10, 'testcachekey'));
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching ORDER BY test_int ASC',
[],
[],
new QueryCacheProfile(10, 'testcachekey')
);
$this->hydrateStmt($stmt, FetchMode::NUMERIC);
......@@ -170,7 +216,14 @@ class ResultCacheTest extends DbalFunctionalTestCase
public function testFetchAllAndFinishSavesCache(): void
{
$layerCache = new ArrayCache();
$stmt = $this->connection->executeQuery('SELECT * FROM caching WHERE test_int > 500', [], [], new QueryCacheProfile(10, 'testcachekey', $layerCache));
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching WHERE test_int > 500',
[],
[],
new QueryCacheProfile(10, 'testcachekey', $layerCache)
);
$stmt->fetchAll();
$stmt->closeCursor();
......@@ -198,13 +251,23 @@ class ResultCacheTest extends DbalFunctionalTestCase
*/
private function assertCacheNonCacheSelectSameFetchModeAreEqual(array $expectedResult, int $fetchMode): void
{
$stmt = $this->connection->executeQuery('SELECT * FROM caching ORDER BY test_int ASC', [], [], new QueryCacheProfile(10, 'testcachekey'));
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching ORDER BY test_int ASC',
[],
[],
new QueryCacheProfile(10, 'testcachekey')
);
self::assertEquals(2, $stmt->columnCount());
$data = $this->hydrateStmt($stmt, $fetchMode);
self::assertEquals($expectedResult, $data);
$stmt = $this->connection->executeQuery('SELECT * FROM caching ORDER BY test_int ASC', [], [], new QueryCacheProfile(10, 'testcachekey'));
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching ORDER BY test_int ASC',
[],
[],
new QueryCacheProfile(10, 'testcachekey')
);
self::assertEquals(2, $stmt->columnCount());
$data = $this->hydrateStmt($stmt, $fetchMode);
......@@ -214,23 +277,48 @@ class ResultCacheTest extends DbalFunctionalTestCase
public function testEmptyResultCache(): void
{
$stmt = $this->connection->executeQuery('SELECT * FROM caching WHERE test_int > 500', [], [], new QueryCacheProfile(10, 'emptycachekey'));
$data = $this->hydrateStmt($stmt);
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching WHERE test_int > 500',
[],
[],
new QueryCacheProfile(10, 'emptycachekey')
);
$this->hydrateStmt($stmt);
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching WHERE test_int > 500',
[],
[],
new QueryCacheProfile(10, 'emptycachekey')
);
$stmt = $this->connection->executeQuery('SELECT * FROM caching WHERE test_int > 500', [], [], new QueryCacheProfile(10, 'emptycachekey'));
$data = $this->hydrateStmt($stmt);
$this->hydrateStmt($stmt);
self::assertCount(1, $this->sqlLogger->queries, 'just one dbal hit');
}
public function testChangeCacheImpl(): void
{
$stmt = $this->connection->executeQuery('SELECT * FROM caching WHERE test_int > 500', [], [], new QueryCacheProfile(10, 'emptycachekey'));
$data = $this->hydrateStmt($stmt);
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching WHERE test_int > 500',
[],
[],
new QueryCacheProfile(10, 'emptycachekey')
);
$this->hydrateStmt($stmt);
$secondCache = new ArrayCache();
$stmt = $this->connection->executeQuery('SELECT * FROM caching WHERE test_int > 500', [], [], new QueryCacheProfile(10, 'emptycachekey', $secondCache));
$data = $this->hydrateStmt($stmt);
$stmt = $this->connection->executeQuery(
'SELECT * FROM caching WHERE test_int > 500',
[],
[],
new QueryCacheProfile(10, 'emptycachekey', $secondCache)
);
$this->hydrateStmt($stmt);
self::assertCount(2, $this->sqlLogger->queries, 'two hits');
self::assertCount(1, $secondCache->fetch('emptycachekey'));
......
tests/Doctrine/Tests/DBAL/Functional/Schema/MySqlSchemaManagerTest.php
View file @ 3f3551aa
......@@ -246,7 +246,10 @@ class MySqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
public function testColumnCharsetChange(): void
{
$table = new Table('test_column_charset_change');
$table->addColumn('col_string', 'string')->setLength(100)->setNotnull(true)->setPlatformOption('charset', 'utf8');
$table->addColumn('col_string', 'string')
->setLength(100)
->setNotnull(true)
->setPlatformOption('charset', 'utf8');
$diffTable = clone $table;
$diffTable->getColumn('col_string')->setPlatformOption('charset', 'ascii');
......@@ -255,7 +258,11 @@ class MySqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
$toSchema = new Schema([$diffTable]);
$diff = $fromSchema->getMigrateToSql($toSchema, $this->connection->getDatabasePlatform());
self::assertContains('ALTER TABLE test_column_charset_change CHANGE col_string col_string VARCHAR(100) CHARACTER SET ascii NOT NULL', $diff);
self::assertContains(
'ALTER TABLE test_column_charset_change CHANGE col_string'
. ' col_string VARCHAR(100) CHARACTER SET ascii NOT NULL',
$diff
);
}
public function testColumnCollation(): void
......
tests/Doctrine/Tests/DBAL/Functional/Schema/OracleSchemaManagerTest.php
View file @ 3f3551aa
......@@ -243,7 +243,10 @@ class OracleSchemaManagerTest extends SchemaManagerFunctionalTestCase
// Adding a primary key on already indexed columns
// Oracle will reuse the unique index, which cause a constraint name differing from the index name
$this->schemaManager->createConstraint(new Schema\Index('id_pk_id_index', ['id'], true, true), 'list_table_indexes_pk_id_test');
$this->schemaManager->createConstraint(
new Schema\Index('id_pk_id_index', ['id'], true, true),
'list_table_indexes_pk_id_test'
);
$tableIndexes = $this->schemaManager->listTableIndexes('list_table_indexes_pk_id_test');
......@@ -271,6 +274,8 @@ class OracleSchemaManagerTest extends SchemaManagerFunctionalTestCase
public function testCreateAndListSequences(): void
{
self::markTestSkipped("Skipped for uppercase letters are contained in sequences' names. Fix the schema manager in 3.0.");
self::markTestSkipped(
"Skipped for uppercase letters are contained in sequences' names. Fix the schema manager in 3.0."
);
}
}
tests/Doctrine/Tests/DBAL/Functional/Schema/PostgreSqlSchemaManagerTest.php
View file @ 3f3551aa
......@@ -118,12 +118,15 @@ class PostgreSqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
self::assertTrue($tableFrom->getColumn('id')->getAutoincrement());
$tableTo = new Table('autoinc_table_drop');
$column = $tableTo->addColumn('id', 'integer');
$tableTo->addColumn('id', 'integer');
$c = new Comparator();
$diff = $c->diffTable($tableFrom, $tableTo);
self::assertInstanceOf(TableDiff::class, $diff, 'There should be a difference and not false being returned from the table comparison');
self::assertEquals(['ALTER TABLE autoinc_table_drop ALTER id DROP DEFAULT'], $this->connection->getDatabasePlatform()->getAlterTableSQL($diff));
self::assertInstanceOf(TableDiff::class, $diff);
self::assertEquals(
['ALTER TABLE autoinc_table_drop ALTER id DROP DEFAULT'],
$this->connection->getDatabasePlatform()->getAlterTableSQL($diff)
);
$this->schemaManager->alterTable($diff);
$tableFinal = $this->schemaManager->listTableDetails('autoinc_table_drop');
......@@ -163,10 +166,12 @@ class PostgreSqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
public function testReturnQuotedAssets(): void
{
$sql = 'create table dbal91_something ( id integer CONSTRAINT id_something PRIMARY KEY NOT NULL ,"table" integer );';
$sql = 'create table dbal91_something'
. ' (id integer CONSTRAINT id_something PRIMARY KEY NOT NULL, "table" integer)';
$this->connection->exec($sql);
$sql = 'ALTER TABLE dbal91_something ADD CONSTRAINT something_input FOREIGN KEY( "table" ) REFERENCES dbal91_something ON UPDATE CASCADE;';
$sql = 'ALTER TABLE dbal91_something ADD CONSTRAINT something_input'
. ' FOREIGN KEY( "table" ) REFERENCES dbal91_something ON UPDATE CASCADE;';
$this->connection->exec($sql);
$table = $this->schemaManager->listTableDetails('dbal91_something');
......@@ -226,13 +231,14 @@ class PostgreSqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
}
$fkeys = $this->schemaManager->listTableForeignKeys('test_create_fk1');
self::assertEquals(count($foreignKeys), count($fkeys), "Table 'test_create_fk1' has to have " . count($foreignKeys) . ' foreign keys.');
self::assertEquals(count($foreignKeys), count($fkeys));
for ($i = 0; $i < count($fkeys); $i++) {
self::assertEquals(['foreign_key_test' . $i], array_map('strtolower', $fkeys[$i]->getLocalColumns()));
self::assertEquals(['id'], array_map('strtolower', $fkeys[$i]->getForeignColumns()));
self::assertEquals('test_create_fk2', strtolower($fkeys[0]->getForeignTableName()));
if ($foreignKeys[$i]->getOption('onDelete') === 'NO ACTION') {
self::assertFalse($fkeys[$i]->hasOption('onDelete'), 'Unexpected option: ' . $fkeys[$i]->getOption('onDelete'));
self::assertFalse($fkeys[$i]->hasOption('onDelete'));
} else {
self::assertEquals($foreignKeys[$i]->getOption('onDelete'), $fkeys[$i]->getOption('onDelete'));
}
......@@ -483,8 +489,11 @@ class PostgreSqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
$c = new Comparator();
$diff = $c->diffTable($tableFrom, $tableTo);
self::assertInstanceOf(TableDiff::class, $diff, 'There should be a difference and not false being returned from the table comparison');
self::assertSame(['ALTER TABLE autoinc_type_modification ALTER id TYPE ' . $expected], $this->connection->getDatabasePlatform()->getAlterTableSQL($diff));
self::assertInstanceOf(TableDiff::class, $diff);
self::assertSame(
['ALTER TABLE autoinc_type_modification ALTER id TYPE ' . $expected],
$this->connection->getDatabasePlatform()->getAlterTableSQL($diff)
);
$this->schemaManager->alterTable($diff);
$tableFinal = $this->schemaManager->listTableDetails('autoinc_type_modification');
......
tests/Doctrine/Tests/DBAL/Functional/Schema/SQLServerSchemaManagerTest.php
View file @ 3f3551aa
......@@ -40,7 +40,8 @@ class SQLServerSchemaManagerTest extends SchemaManagerFunctionalTestCase
$this->schemaManager->dropAndCreateTable($table);
$columns = $this->schemaManager->listTableColumns($tableName);
self::assertTrue($columns[$columnName]->hasPlatformOption('collation')); // SQL Server should report a default collation on the column
// SQL Server should report a default collation on the column
self::assertTrue($columns[$columnName]->hasPlatformOption('collation'));
$column->setPlatformOption('collation', $collation = 'Icelandic_CS_AS');
......@@ -89,9 +90,15 @@ class SQLServerSchemaManagerTest extends SchemaManagerFunctionalTestCase
),
'df_string_3' => new ColumnDiff(
'df_string_3',
new Column('df_string_3', Type::getType('string'), ['length' => 50, 'default' => 'another default value']),
new Column('df_string_3', Type::getType('string'), [
'length' => 50,
'default' => 'another default value',
]),
['length'],
new Column('df_string_3', Type::getType('string'), ['length' => 50, 'default' => 'another default value'])
new Column('df_string_3', Type::getType('string'), [
'length' => 50,
'default' => 'another default value',
])
),
'df_boolean' => new ColumnDiff(
'df_boolean',
......@@ -163,7 +170,11 @@ class SQLServerSchemaManagerTest extends SchemaManagerFunctionalTestCase
$table->addColumn('comment_float_0', 'integer', ['comment' => 0.0]);
$table->addColumn('comment_string_0', 'integer', ['comment' => '0']);
$table->addColumn('comment', 'integer', ['comment' => 'Doctrine 0wnz you!']);
$table->addColumn('`comment_quoted`', 'integer', ['comment' => 'Doctrine 0wnz comments for explicitly quoted columns!']);
$table->addColumn(
'`comment_quoted`',
'integer',
['comment' => 'Doctrine 0wnz comments for explicitly quoted columns!']
);
$table->addColumn('create', 'integer', ['comment' => 'Doctrine 0wnz comments for reserved keyword columns!']);
$table->addColumn('commented_type', 'object');
$table->addColumn('commented_type_with_comment', 'array', ['comment' => 'Doctrine array type.']);
......@@ -181,27 +192,55 @@ class SQLServerSchemaManagerTest extends SchemaManagerFunctionalTestCase
self::assertEquals('0', $columns['comment_float_0']->getComment());
self::assertEquals('0', $columns['comment_string_0']->getComment());
self::assertEquals('Doctrine 0wnz you!', $columns['comment']->getComment());
self::assertEquals('Doctrine 0wnz comments for explicitly quoted columns!', $columns['comment_quoted']->getComment());
self::assertEquals(
'Doctrine 0wnz comments for explicitly quoted columns!',
$columns['comment_quoted']->getComment()
);
self::assertEquals('Doctrine 0wnz comments for reserved keyword columns!', $columns['[create]']->getComment());
self::assertNull($columns['commented_type']->getComment());
self::assertEquals('Doctrine array type.', $columns['commented_type_with_comment']->getComment());
$tableDiff = new TableDiff('sqlsrv_column_comment');
$tableDiff->fromTable = $table;
$tableDiff->addedColumns['added_comment_none'] = new Column('added_comment_none', Type::getType('integer'));
$tableDiff->addedColumns['added_comment_null'] = new Column('added_comment_null', Type::getType('integer'), ['comment' => null]);
$tableDiff->addedColumns['added_comment_false'] = new Column('added_comment_false', Type::getType('integer'), ['comment' => false]);
$tableDiff->addedColumns['added_comment_empty_string'] = new Column('added_comment_empty_string', Type::getType('integer'), ['comment' => '']);
$tableDiff->addedColumns['added_comment_integer_0'] = new Column('added_comment_integer_0', Type::getType('integer'), ['comment' => 0]);
$tableDiff->addedColumns['added_comment_float_0'] = new Column('added_comment_float_0', Type::getType('integer'), ['comment' => 0.0]);
$tableDiff->addedColumns['added_comment_string_0'] = new Column('added_comment_string_0', Type::getType('integer'), ['comment' => '0']);
$tableDiff->addedColumns['added_comment'] = new Column('added_comment', Type::getType('integer'), ['comment' => 'Doctrine']);
$tableDiff->addedColumns['`added_comment_quoted`'] = new Column('`added_comment_quoted`', Type::getType('integer'), ['comment' => 'rulez']);
$tableDiff->addedColumns['select'] = new Column('select', Type::getType('integer'), ['comment' => '666']);
$tableDiff->addedColumns['added_commented_type'] = new Column('added_commented_type', Type::getType('object'));
$tableDiff->addedColumns['added_commented_type_with_comment'] = new Column('added_commented_type_with_comment', Type::getType('array'), ['comment' => '666']);
$tableDiff->renamedColumns['comment_float_0'] = new Column('comment_double_0', Type::getType('decimal'), ['comment' => 'Double for real!']);
$tableDiff = new TableDiff('sqlsrv_column_comment');
$tableDiff->fromTable = $table;
$tableDiff->addedColumns['added_comment_none']
= new Column('added_comment_none', Type::getType('integer'));
$tableDiff->addedColumns['added_comment_null']
= new Column('added_comment_null', Type::getType('integer'), ['comment' => null]);
$tableDiff->addedColumns['added_comment_false']
= new Column('added_comment_false', Type::getType('integer'), ['comment' => false]);
$tableDiff->addedColumns['added_comment_empty_string']
= new Column('added_comment_empty_string', Type::getType('integer'), ['comment' => '']);
$tableDiff->addedColumns['added_comment_integer_0']
= new Column('added_comment_integer_0', Type::getType('integer'), ['comment' => 0]);
$tableDiff->addedColumns['added_comment_float_0']
= new Column('added_comment_float_0', Type::getType('integer'), ['comment' => 0.0]);
$tableDiff->addedColumns['added_comment_string_0']
= new Column('added_comment_string_0', Type::getType('integer'), ['comment' => '0']);
$tableDiff->addedColumns['added_comment']
= new Column('added_comment', Type::getType('integer'), ['comment' => 'Doctrine']);
$tableDiff->addedColumns['`added_comment_quoted`']
= new Column('`added_comment_quoted`', Type::getType('integer'), ['comment' => 'rulez']);
$tableDiff->addedColumns['select']
= new Column('select', Type::getType('integer'), ['comment' => '666']);
$tableDiff->addedColumns['added_commented_type']
= new Column('added_commented_type', Type::getType('object'));
$tableDiff->addedColumns['added_commented_type_with_comment']
= new Column('added_commented_type_with_comment', Type::getType('array'), ['comment' => '666']);
$tableDiff->renamedColumns['comment_float_0']
= new Column('comment_double_0', Type::getType('decimal'), ['comment' => 'Double for real!']);
// Add comment to non-commented column.
$tableDiff->changedColumns['id'] = new ColumnDiff(
......@@ -264,7 +303,11 @@ class SQLServerSchemaManagerTest extends SchemaManagerFunctionalTestCase
'create',
new Column('create', Type::getType('object')),
['comment', 'type'],
new Column('create', Type::getType('integer'), ['comment' => 'Doctrine 0wnz comments for reserved keyword columns!'])
new Column(
'create',
Type::getType('integer'),
['comment' => 'Doctrine 0wnz comments for reserved keyword columns!']
)
);
// Add comment and change custom type to regular type from non-commented column.
......@@ -283,7 +326,8 @@ class SQLServerSchemaManagerTest extends SchemaManagerFunctionalTestCase
new Column('commented_type_with_comment', Type::getType('array'), ['comment' => 'Doctrine array type.'])
);
$tableDiff->removedColumns['comment_integer_0'] = new Column('comment_integer_0', Type::getType('integer'), ['comment' => 0]);
$tableDiff->removedColumns['comment_integer_0']
= new Column('comment_integer_0', Type::getType('integer'), ['comment' => 0]);
$this->schemaManager->alterTable($tableDiff);
......
tests/Doctrine/Tests/DBAL/Functional/Schema/SchemaManagerFunctionalTestCase.php
View file @ 3f3551aa
......@@ -177,7 +177,8 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
$foundSequence = null;
foreach ($sequences as $sequence) {
self::assertInstanceOf(Sequence::class, $sequence, 'Array elements of listSequences() should be Sequence instances.');
self::assertInstanceOf(Sequence::class, $sequence);
if (strtolower($sequence->getName()) !== 'list_sequences_test_seq') {
continue;
}
......@@ -215,7 +216,9 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
$namespaces = array_map('strtolower', $namespaces);
if (! in_array('test_create_schema', $namespaces)) {
$this->connection->executeUpdate($this->schemaManager->getDatabasePlatform()->getCreateSchemaSQL('test_create_schema'));
$this->connection->executeUpdate(
$this->schemaManager->getDatabasePlatform()->getCreateSchemaSQL('test_create_schema')
);
$namespaces = $this->schemaManager->listNamespaceNames();
$namespaces = array_map('strtolower', $namespaces);
......@@ -403,7 +406,9 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
public function testDiffListTableColumns(): void
{
if ($this->schemaManager->getDatabasePlatform()->getName() === 'oracle') {
$this->markTestSkipped('Does not work with Oracle, since it cannot detect DateTime, Date and Time differenecs (at the moment).');
$this->markTestSkipped(
'Does not work with Oracle, since it cannot detect DateTime, Date and Time differenecs (at the moment).'
);
}
$offlineTable = $this->createListTableColumns();
......@@ -485,7 +490,7 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
self::assertEquals(['foreign_key_test'], array_map('strtolower', $fkConstraint->getColumns()));
self::assertEquals(['id'], array_map('strtolower', $fkConstraint->getForeignColumns()));
self::assertTrue($fkTable->columnsAreIndexed($fkConstraint->getColumns()), 'The columns of a foreign key constraint should always be indexed.');
self::assertTrue($fkTable->columnsAreIndexed($fkConstraint->getColumns()));
}
public function testListForeignKeys(): void
......@@ -585,7 +590,10 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
$table = $this->schemaManager->listTableDetails('alter_table');
self::assertEquals(2, count($table->getIndexes()));
self::assertTrue($table->hasIndex('foo_idx'));
self::assertEquals(['foo', 'foreign_key_test'], array_map('strtolower', $table->getIndex('foo_idx')->getColumns()));
self::assertEquals(
['foo', 'foreign_key_test'],
array_map('strtolower', $table->getIndex('foo_idx')->getColumns())
);
$tableDiff = new TableDiff('alter_table');
$tableDiff->fromTable = $table;
......@@ -597,7 +605,10 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
self::assertEquals(2, count($table->getIndexes()));
self::assertTrue($table->hasIndex('bar_idx'));
self::assertFalse($table->hasIndex('foo_idx'));
self::assertEquals(['foo', 'foreign_key_test'], array_map('strtolower', $table->getIndex('bar_idx')->getColumns()));
self::assertEquals(
['foo', 'foreign_key_test'],
array_map('strtolower', $table->getIndex('bar_idx')->getColumns())
);
self::assertFalse($table->getIndex('bar_idx')->isPrimary());
self::assertFalse($table->getIndex('bar_idx')->isUnique());
......@@ -848,10 +859,10 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
$columns = $this->schemaManager->listTableColumns('column_comment_test2');
self::assertEquals(3, count($columns));
self::assertEquals('This is a comment', $columns['id']->getComment());
self::assertEquals('This is a comment', $columns['obj']->getComment(), 'The Doctrine2 Typehint should be stripped from comment.');
self::assertInstanceOf(ObjectType::class, $columns['obj']->getType(), 'The Doctrine2 should be detected from comment hint.');
self::assertEquals('This is a comment', $columns['arr']->getComment(), 'The Doctrine2 Typehint should be stripped from comment.');
self::assertInstanceOf(ArrayType::class, $columns['arr']->getType(), 'The Doctrine2 should be detected from comment hint.');
self::assertEquals('This is a comment', $columns['obj']->getComment());
self::assertInstanceOf(ObjectType::class, $columns['obj']->getType());
self::assertEquals('This is a comment', $columns['arr']->getComment());
self::assertInstanceOf(ArrayType::class, $columns['arr']->getType());
}
public function testCommentHintOnDateIntervalTypeColumn(): void
......@@ -874,8 +885,8 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
$columns = $this->schemaManager->listTableColumns('column_dateinterval_comment');
self::assertEquals(2, count($columns));
self::assertEquals('This is a comment', $columns['id']->getComment());
self::assertEquals('This is a comment', $columns['date_interval']->getComment(), 'The Doctrine2 Typehint should be stripped from comment.');
self::assertInstanceOf(DateIntervalType::class, $columns['date_interval']->getType(), 'The Doctrine2 should be detected from comment hint.');
self::assertEquals('This is a comment', $columns['date_interval']->getComment());
self::assertInstanceOf(DateIntervalType::class, $columns['date_interval']->getType());
}
public function testChangeColumnsTypeWithDefaultValue(): void
......@@ -1155,16 +1166,24 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
$this->markTestSkipped('Database does not support column comments.');
}
$options = [
$options = [
'type' => Type::getType('integer'),
'default' => 0,
'notnull' => true,
'comment' => 'expected+column+comment',
];
$columnDefinition = substr($this->connection->getDatabasePlatform()->getColumnDeclarationSQL('id', $options), strlen('id') + 1);
$columnDefinition = substr(
$this->connection->getDatabasePlatform()->getColumnDeclarationSQL('id', $options),
strlen('id') + 1
);
$table = new Table('my_table');
$table->addColumn('id', 'integer', ['columnDefinition' => $columnDefinition, 'comment' => 'unexpected_column_comment']);
$table->addColumn('id', 'integer', [
'columnDefinition' => $columnDefinition,
'comment' => 'unexpected_column_comment',
]);
$sql = $this->connection->getDatabasePlatform()->getCreateTableSQL($table);
self::assertStringContainsString('expected+column+comment', $sql[0]);
......@@ -1356,7 +1375,7 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
self::assertSame(['notnull', 'comment'], $tableDiff->changedColumns['parameters']->changedProperties);
}
public function testComparatorShouldReturnAllChangesWhenUsingLegacyJsonArrayTypeEvenWhenPlatformHasJsonSupport(): void
public function testComparatorReturnsAllChangesWhenUsingLegacyJsonArrayTypeEvenWhenPlatformHasJsonSupport(): void
{
if (! $this->schemaManager->getDatabasePlatform()->hasNativeJsonType()) {
$this->markTestSkipped('This test is only supported on platforms that have native JSON type.');
......@@ -1512,7 +1531,9 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
public function testGenerateAnIndexWithPartialColumnLength(): void
{
if (! $this->schemaManager->getDatabasePlatform()->supportsColumnLengthIndexes()) {
self::markTestSkipped('This test is only supported on platforms that support indexes with column length definitions.');
self::markTestSkipped(
'This test is only supported on platforms that support indexes with column length definitions.'
);
}
$table = new Table('test_partial_column_index');
......@@ -1574,7 +1595,11 @@ abstract class SchemaManagerFunctionalTestCase extends DbalFunctionalTestCase
$diff = Comparator::compareSchemas($offlineSchema, $schema);
foreach ($diff->changedTables as $table) {
if (count($table->changedForeignKeys) <= 0 && count($table->addedForeignKeys) <= 0 && count($table->removedForeignKeys) <= 0) {
if (
count($table->changedForeignKeys) <= 0
&& count($table->addedForeignKeys) <= 0
&& count($table->removedForeignKeys) <= 0
) {
continue;
}
......
tests/Doctrine/Tests/DBAL/Functional/Schema/SqliteSchemaManagerTest.php
View file @ 3f3551aa
......@@ -181,8 +181,11 @@ SQL;
/**
* @dataProvider getDiffListIntegerAutoincrementTableColumnsData
*/
public function testDiffListIntegerAutoincrementTableColumns(string $integerType, bool $unsigned, bool $expectedComparatorDiff): void
{
public function testDiffListIntegerAutoincrementTableColumns(
string $integerType,
bool $unsigned,
bool $expectedComparatorDiff
): void {
$tableName = 'test_int_autoincrement_table';
$offlineTable = new Table($tableName);
......
tests/Doctrine/Tests/DBAL/Functional/TemporaryTableTest.php
View file @ 3f3551aa
......@@ -61,8 +61,8 @@ class TemporaryTableTest extends DbalFunctionalTestCase
$this->connection->rollBack();
$rows = $this->connection->fetchAll('SELECT * FROM nontemporary');
self::assertEquals([], $rows, 'In an event of an error this result has one row, because of an implicit commit.');
// In an event of an error this result has one row, because of an implicit commit
self::assertEquals([], $this->connection->fetchAll('SELECT * FROM nontemporary'));
}
public function testCreateTemporaryTableNotAutoCommitTransaction(): void
......@@ -100,7 +100,7 @@ class TemporaryTableTest extends DbalFunctionalTestCase
} catch (Throwable $e) {
}
$rows = $this->connection->fetchAll('SELECT * FROM nontemporary');
self::assertEquals([], $rows, 'In an event of an error this result has one row, because of an implicit commit.');
// In an event of an error this result has one row, because of an implicit commit
self::assertEquals([], $this->connection->fetchAll('SELECT * FROM nontemporary'));
}
}
tests/Doctrine/Tests/DBAL/Functional/TypeConversionTest.php
View file @ 3f3551aa
......@@ -238,7 +238,10 @@ class TypeConversionTest extends DbalFunctionalTestCase
{
$columnName = 'test_' . $type;
$typeInstance = Type::getType($type);
$insertionValue = $typeInstance->convertToDatabaseValue($originalValue, $this->connection->getDatabasePlatform());
$insertionValue = $typeInstance->convertToDatabaseValue(
$originalValue,
$this->connection->getDatabasePlatform()
);
$this->connection->insert('type_conversion', ['id' => ++self::$typeCounter, $columnName => $insertionValue]);
......
tests/Doctrine/Tests/DBAL/Functional/WriteTest.php
View file @ 3f3551aa
......@@ -140,9 +140,23 @@ class WriteTest extends DbalFunctionalTestCase
{
$this->insertRows();
self::assertEquals(1, $this->connection->update('write_table', ['test_string' => 'bar'], ['test_string' => 'foo']));
self::assertEquals(2, $this->connection->update('write_table', ['test_string' => 'baz'], ['test_string' => 'bar']));
self::assertEquals(0, $this->connection->update('write_table', ['test_string' => 'baz'], ['test_string' => 'bar']));
self::assertEquals(1, $this->connection->update(
'write_table',
['test_string' => 'bar'],
['test_string' => 'foo']
));
self::assertEquals(2, $this->connection->update(
'write_table',
['test_string' => 'baz'],
['test_string' => 'bar']
));
self::assertEquals(0, $this->connection->update(
'write_table',
['test_string' => 'baz'],
['test_string' => 'bar']
));
}
public function testLastInsertId(): void
......@@ -175,7 +189,10 @@ class WriteTest extends DbalFunctionalTestCase
return strtolower($sequence->getName()) === 'write_table_id_seq';
}));
$stmt = $this->connection->query($this->connection->getDatabasePlatform()->getSequenceNextValSQL('write_table_id_seq'));
$stmt = $this->connection->query(
$this->connection->getDatabasePlatform()->getSequenceNextValSQL('write_table_id_seq')
);
$nextSequenceVal = $stmt->fetchColumn();
$lastInsertId = $this->lastInsertId('write_table_id_seq');
......@@ -186,8 +203,13 @@ class WriteTest extends DbalFunctionalTestCase
public function testLastInsertIdNoSequenceGiven(): void
{
if (! $this->connection->getDatabasePlatform()->supportsSequences() || $this->connection->getDatabasePlatform()->supportsIdentityColumns()) {
$this->markTestSkipped("Test only works consistently on platforms that support sequences and don't support identity columns.");
if (
! $this->connection->getDatabasePlatform()->supportsSequences()
|| $this->connection->getDatabasePlatform()->supportsIdentityColumns()
) {
$this->markTestSkipped(
"Test only works consistently on platforms that support sequences and don't support identity columns."
);
}
self::assertFalse($this->lastInsertId());
......@@ -205,7 +227,10 @@ class WriteTest extends DbalFunctionalTestCase
$data = $this->connection->fetchColumn('SELECT test_string FROM write_table WHERE test_int = 30');
self::assertEquals($testString->format($this->connection->getDatabasePlatform()->getDateTimeFormatString()), $data);
self::assertEquals(
$testString->format($this->connection->getDatabasePlatform()->getDateTimeFormatString()),
$data
);
}
public function testUpdateWithKeyValueTypes(): void
......@@ -229,7 +254,10 @@ class WriteTest extends DbalFunctionalTestCase
$data = $this->connection->fetchColumn('SELECT test_string FROM write_table WHERE test_int = 30');
self::assertEquals($testString->format($this->connection->getDatabasePlatform()->getDateTimeFormatString()), $data);
self::assertEquals(
$testString->format($this->connection->getDatabasePlatform()->getDateTimeFormatString()),
$data
);
}
public function testDeleteWithKeyValueTypes(): void
......@@ -241,7 +269,13 @@ class WriteTest extends DbalFunctionalTestCase
['test_string' => 'datetime', 'test_int' => 'integer']
);
$this->connection->delete('write_table', ['test_int' => 30, 'test_string' => $val], ['test_string' => 'datetime', 'test_int' => 'integer']);
$this->connection->delete('write_table', [
'test_int' => 30,
'test_string' => $val,
], [
'test_string' => 'datetime',
'test_int' => 'integer',
]);
$data = $this->connection->fetchColumn('SELECT test_string FROM write_table WHERE test_int = 30');
......@@ -300,7 +334,10 @@ class WriteTest extends DbalFunctionalTestCase
self::assertCount(1, $data);
$this->connection->update('write_table', ['test_int' => 10], ['test_string' => null], ['test_string' => 'string', 'test_int' => 'integer']);
$this->connection->update('write_table', ['test_int' => 10], ['test_string' => null], [
'test_string' => 'string',
'test_int' => 'integer',
]);
$data = $this->connection->fetchAll('SELECT * FROM write_table WHERE test_int = 30');
......
tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php
View file @ 3f3551aa
......@@ -367,7 +367,10 @@ abstract class AbstractPlatformTestCase extends DbalTestCase
->method('onSchemaCreateTableColumn');
$eventManager = new EventManager();
$eventManager->addEventListener([Events::onSchemaCreateTable, Events::onSchemaCreateTableColumn], $listenerMock);
$eventManager->addEventListener([
Events::onSchemaCreateTable,
Events::onSchemaCreateTableColumn,
], $listenerMock);
$this->platform->setEventManager($eventManager);
......@@ -632,27 +635,63 @@ abstract class AbstractPlatformTestCase extends DbalTestCase
// Foreign table with reserved keyword as name (needs quotation).
$foreignTable = new Table('foreign');
$foreignTable->addColumn('create', 'string'); // Foreign column with reserved keyword as name (needs quotation).
$foreignTable->addColumn('bar', 'string'); // Foreign column with non-reserved keyword as name (does not need quotation).
$foreignTable->addColumn('`foo-bar`', 'string'); // Foreign table with special character in name (needs quotation on some platforms, e.g. Sqlite).
$table->addForeignKeyConstraint($foreignTable, ['create', 'foo', '`bar`'], ['create', 'bar', '`foo-bar`'], [], 'FK_WITH_RESERVED_KEYWORD');
// Foreign column with reserved keyword as name (needs quotation).
$foreignTable->addColumn('create', 'string');
// Foreign column with non-reserved keyword as name (does not need quotation).
$foreignTable->addColumn('bar', 'string');
// Foreign table with special character in name (needs quotation on some platforms, e.g. Sqlite).
$foreignTable->addColumn('`foo-bar`', 'string');
$table->addForeignKeyConstraint(
$foreignTable,
['create', 'foo', '`bar`'],
['create', 'bar', '`foo-bar`'],
[],
'FK_WITH_RESERVED_KEYWORD'
);
// Foreign table with non-reserved keyword as name (does not need quotation).
$foreignTable = new Table('foo');
$foreignTable->addColumn('create', 'string'); // Foreign column with reserved keyword as name (needs quotation).
$foreignTable->addColumn('bar', 'string'); // Foreign column with non-reserved keyword as name (does not need quotation).
$foreignTable->addColumn('`foo-bar`', 'string'); // Foreign table with special character in name (needs quotation on some platforms, e.g. Sqlite).
$table->addForeignKeyConstraint($foreignTable, ['create', 'foo', '`bar`'], ['create', 'bar', '`foo-bar`'], [], 'FK_WITH_NON_RESERVED_KEYWORD');
// Foreign column with reserved keyword as name (needs quotation).
$foreignTable->addColumn('create', 'string');
// Foreign column with non-reserved keyword as name (does not need quotation).
$foreignTable->addColumn('bar', 'string');
// Foreign table with special character in name (needs quotation on some platforms, e.g. Sqlite).
$foreignTable->addColumn('`foo-bar`', 'string');
$table->addForeignKeyConstraint(
$foreignTable,
['create', 'foo', '`bar`'],
['create', 'bar', '`foo-bar`'],
[],
'FK_WITH_NON_RESERVED_KEYWORD'
);
// Foreign table with special character in name (needs quotation on some platforms, e.g. Sqlite).
$foreignTable = new Table('`foo-bar`');
$foreignTable->addColumn('create', 'string'); // Foreign column with reserved keyword as name (needs quotation).
$foreignTable->addColumn('bar', 'string'); // Foreign column with non-reserved keyword as name (does not need quotation).
$foreignTable->addColumn('`foo-bar`', 'string'); // Foreign table with special character in name (needs quotation on some platforms, e.g. Sqlite).
$table->addForeignKeyConstraint($foreignTable, ['create', 'foo', '`bar`'], ['create', 'bar', '`foo-bar`'], [], 'FK_WITH_INTENDED_QUOTATION');
// Foreign column with reserved keyword as name (needs quotation).
$foreignTable->addColumn('create', 'string');
// Foreign column with non-reserved keyword as name (does not need quotation).
$foreignTable->addColumn('bar', 'string');
// Foreign table with special character in name (needs quotation on some platforms, e.g. Sqlite).
$foreignTable->addColumn('`foo-bar`', 'string');
$table->addForeignKeyConstraint(
$foreignTable,
['create', 'foo', '`bar`'],
['create', 'bar', '`foo-bar`'],
[],
'FK_WITH_INTENDED_QUOTATION'
);
$sql = $this->platform->getCreateTableSQL($table, AbstractPlatform::CREATE_FOREIGNKEYS);
self::assertEquals($this->getQuotedColumnInForeignKeySQL(), $sql);
......@@ -875,17 +914,32 @@ abstract class AbstractPlatformTestCase extends DbalTestCase
$toTable = new Table('mytable');
$toTable->addColumn('unquoted', 'integer', ['comment' => 'Unquoted 1']); // unquoted -> unquoted
$toTable->addColumn('where', 'integer', ['comment' => 'Unquoted 2']); // unquoted -> reserved keyword
$toTable->addColumn('`foo`', 'integer', ['comment' => 'Unquoted 3']); // unquoted -> quoted
// unquoted -> unquoted
$toTable->addColumn('unquoted', 'integer', ['comment' => 'Unquoted 1']);
// unquoted -> reserved keyword
$toTable->addColumn('where', 'integer', ['comment' => 'Unquoted 2']);
// unquoted -> quoted
$toTable->addColumn('`foo`', 'integer', ['comment' => 'Unquoted 3']);
// reserved keyword -> unquoted
$toTable->addColumn('reserved_keyword', 'integer', ['comment' => 'Reserved keyword 1']);
$toTable->addColumn('reserved_keyword', 'integer', ['comment' => 'Reserved keyword 1']); // reserved keyword -> unquoted
$toTable->addColumn('from', 'integer', ['comment' => 'Reserved keyword 2']); // reserved keyword -> reserved keyword
$toTable->addColumn('`bar`', 'integer', ['comment' => 'Reserved keyword 3']); // reserved keyword -> quoted
// reserved keyword -> reserved keyword
$toTable->addColumn('from', 'integer', ['comment' => 'Reserved keyword 2']);
$toTable->addColumn('quoted', 'integer', ['comment' => 'Quoted 1']); // quoted -> unquoted
$toTable->addColumn('and', 'integer', ['comment' => 'Quoted 2']); // quoted -> reserved keyword
$toTable->addColumn('`baz`', 'integer', ['comment' => 'Quoted 3']); // quoted -> quoted
// reserved keyword -> quoted
$toTable->addColumn('`bar`', 'integer', ['comment' => 'Reserved keyword 3']);
// quoted -> unquoted
$toTable->addColumn('quoted', 'integer', ['comment' => 'Quoted 1']);
// quoted -> reserved keyword
$toTable->addColumn('and', 'integer', ['comment' => 'Quoted 2']);
// quoted -> quoted
$toTable->addColumn('`baz`', 'integer', ['comment' => 'Quoted 3']);
$comparator = new Comparator();
......@@ -1165,7 +1219,9 @@ abstract class AbstractPlatformTestCase extends DbalTestCase
}
$this->expectException(DBALException::class);
$this->expectExceptionMessage("Operation 'Doctrine\\DBAL\\Platforms\\AbstractPlatform::getInlineColumnCommentSQL' is not supported by platform.");
$this->expectExceptionMessage(
"Operation '" . AbstractPlatform::class . "::getInlineColumnCommentSQL' is not supported by platform."
);
$this->expectExceptionCode(0);
$this->platform->getInlineColumnCommentSQL('unsupported');
......
tests/Doctrine/Tests/DBAL/Platforms/AbstractPostgreSqlPlatformTestCase.php
View file @ 3f3551aa
......@@ -68,7 +68,8 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
protected function getGenerateForeignKeySql(): string
{
return 'ALTER TABLE test ADD FOREIGN KEY (fk_name_id) REFERENCES other_table (id) NOT DEFERRABLE INITIALLY IMMEDIATE';
return 'ALTER TABLE test ADD FOREIGN KEY (fk_name_id)'
. ' REFERENCES other_table (id) NOT DEFERRABLE INITIALLY IMMEDIATE';
}
public function testGeneratesForeignKeySqlForNonStandardOptions(): void
......@@ -81,7 +82,8 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
['onDelete' => 'CASCADE']
);
self::assertEquals(
'CONSTRAINT my_fk FOREIGN KEY (foreign_id) REFERENCES my_table (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE',
'CONSTRAINT my_fk FOREIGN KEY (foreign_id)'
. ' REFERENCES my_table (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE',
$this->platform->getForeignKeyDeclarationSQL($foreignKey)
);
......@@ -93,7 +95,8 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
['match' => 'full']
);
self::assertEquals(
'CONSTRAINT my_fk FOREIGN KEY (foreign_id) REFERENCES my_table (id) MATCH full NOT DEFERRABLE INITIALLY IMMEDIATE',
'CONSTRAINT my_fk FOREIGN KEY (foreign_id)'
. ' REFERENCES my_table (id) MATCH full NOT DEFERRABLE INITIALLY IMMEDIATE',
$this->platform->getForeignKeyDeclarationSQL($foreignKey)
);
......@@ -105,7 +108,8 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
['deferrable' => true]
);
self::assertEquals(
'CONSTRAINT my_fk FOREIGN KEY (foreign_id) REFERENCES my_table (id) DEFERRABLE INITIALLY IMMEDIATE',
'CONSTRAINT my_fk FOREIGN KEY (foreign_id)'
. ' REFERENCES my_table (id) DEFERRABLE INITIALLY IMMEDIATE',
$this->platform->getForeignKeyDeclarationSQL($foreignKey)
);
......@@ -117,7 +121,8 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
['deferred' => true]
);
self::assertEquals(
'CONSTRAINT my_fk FOREIGN KEY (foreign_id) REFERENCES my_table (id) NOT DEFERRABLE INITIALLY DEFERRED',
'CONSTRAINT my_fk FOREIGN KEY (foreign_id)'
. ' REFERENCES my_table (id) NOT DEFERRABLE INITIALLY DEFERRED',
$this->platform->getForeignKeyDeclarationSQL($foreignKey)
);
......@@ -129,7 +134,8 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
['feferred' => true]
);
self::assertEquals(
'CONSTRAINT my_fk FOREIGN KEY (foreign_id) REFERENCES my_table (id) NOT DEFERRABLE INITIALLY DEFERRED',
'CONSTRAINT my_fk FOREIGN KEY (foreign_id)'
. ' REFERENCES my_table (id) NOT DEFERRABLE INITIALLY DEFERRED',
$this->platform->getForeignKeyDeclarationSQL($foreignKey)
);
......@@ -141,7 +147,8 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
['deferrable' => true, 'deferred' => true, 'match' => 'full']
);
self::assertEquals(
'CONSTRAINT my_fk FOREIGN KEY (foreign_id) REFERENCES my_table (id) MATCH full DEFERRABLE INITIALLY DEFERRED',
'CONSTRAINT my_fk FOREIGN KEY (foreign_id)'
. ' REFERENCES my_table (id) MATCH full DEFERRABLE INITIALLY DEFERRED',
$this->platform->getForeignKeyDeclarationSQL($foreignKey)
);
}
......@@ -150,7 +157,12 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
{
self::assertEquals('SIMILAR TO', $this->platform->getRegexpExpression());
self::assertEquals('"', $this->platform->getIdentifierQuoteCharacter());
self::assertEquals('column1 || column2 || column3', $this->platform->getConcatExpression('column1', 'column2', 'column3'));
self::assertEquals(
'column1 || column2 || column3',
$this->platform->getConcatExpression('column1', 'column2', 'column3')
);
self::assertEquals('SUBSTRING(column FROM 5)', $this->platform->getSubstringExpression('column', 5));
self::assertEquals('SUBSTRING(column FROM 1 FOR 5)', $this->platform->getSubstringExpression('column', 1, 5));
}
......@@ -188,7 +200,10 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
$column = $table->addColumn('id', 'integer');
$column->setAutoincrement(true);
self::assertEquals(['CREATE TABLE autoinc_table (id SERIAL NOT NULL)'], $this->platform->getCreateTableSQL($table));
self::assertEquals(
['CREATE TABLE autoinc_table (id SERIAL NOT NULL)'],
$this->platform->getCreateTableSQL($table)
);
}
/**
......@@ -419,10 +434,14 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
protected function getQuotedColumnInForeignKeySQL(): array
{
return [
'CREATE TABLE "quoted" ("create" VARCHAR(255) NOT NULL, foo VARCHAR(255) NOT NULL, "bar" VARCHAR(255) NOT NULL)',
'ALTER TABLE "quoted" ADD CONSTRAINT FK_WITH_RESERVED_KEYWORD FOREIGN KEY ("create", foo, "bar") REFERENCES "foreign" ("create", bar, "foo-bar") NOT DEFERRABLE INITIALLY IMMEDIATE',
'ALTER TABLE "quoted" ADD CONSTRAINT FK_WITH_NON_RESERVED_KEYWORD FOREIGN KEY ("create", foo, "bar") REFERENCES foo ("create", bar, "foo-bar") NOT DEFERRABLE INITIALLY IMMEDIATE',
'ALTER TABLE "quoted" ADD CONSTRAINT FK_WITH_INTENDED_QUOTATION FOREIGN KEY ("create", foo, "bar") REFERENCES "foo-bar" ("create", bar, "foo-bar") NOT DEFERRABLE INITIALLY IMMEDIATE',
'CREATE TABLE "quoted" ("create" VARCHAR(255) NOT NULL, '
. 'foo VARCHAR(255) NOT NULL, "bar" VARCHAR(255) NOT NULL)',
'ALTER TABLE "quoted" ADD CONSTRAINT FK_WITH_RESERVED_KEYWORD FOREIGN KEY ("create", foo, "bar")'
. ' REFERENCES "foreign" ("create", bar, "foo-bar") NOT DEFERRABLE INITIALLY IMMEDIATE',
'ALTER TABLE "quoted" ADD CONSTRAINT FK_WITH_NON_RESERVED_KEYWORD FOREIGN KEY ("create", foo, "bar")'
. ' REFERENCES foo ("create", bar, "foo-bar") NOT DEFERRABLE INITIALLY IMMEDIATE',
'ALTER TABLE "quoted" ADD CONSTRAINT FK_WITH_INTENDED_QUOTATION FOREIGN KEY ("create", foo, "bar")'
. ' REFERENCES "foo-bar" ("create", bar, "foo-bar") NOT DEFERRABLE INITIALLY IMMEDIATE',
];
}
......@@ -484,8 +503,12 @@ abstract class AbstractPostgreSqlPlatformTestCase extends AbstractPlatformTestCa
*
* @dataProvider pgBooleanProvider
*/
public function testConvertFromBoolean($databaseValue, string $prepareStatementValue, ?int $integerValue, ?bool $booleanValue): void
{
public function testConvertFromBoolean(
$databaseValue,
string $prepareStatementValue,
?int $integerValue,
?bool $booleanValue
): void {
$platform = $this->createPlatform();
self::assertSame($booleanValue, $platform->convertFromBoolean($databaseValue));
......
tests/Doctrine/Tests/DBAL/Platforms/OraclePlatformTest.php
View file @ 3f3551aa
......@@ -111,7 +111,8 @@ class OraclePlatformTest extends AbstractPlatformTestCase
{
return [
'ALTER TABLE mytable ADD (quota NUMBER(10) DEFAULT NULL NULL)',
"ALTER TABLE mytable MODIFY (baz VARCHAR2(255) DEFAULT 'def' NOT NULL, bloo NUMBER(1) DEFAULT '0' NOT NULL)",
"ALTER TABLE mytable MODIFY (baz VARCHAR2(255) DEFAULT 'def' NOT NULL, "
. "bloo NUMBER(1) DEFAULT '0' NOT NULL)",
'ALTER TABLE mytable DROP (foo)',
'ALTER TABLE mytable RENAME TO userlist',
];
......@@ -127,7 +128,10 @@ class OraclePlatformTest extends AbstractPlatformTestCase
public function testGeneratesSqlSnippets(): void
{
self::assertEquals('"', $this->platform->getIdentifierQuoteCharacter());
self::assertEquals('column1 || column2 || column3', $this->platform->getConcatExpression('column1', 'column2', 'column3'));
self::assertEquals(
'column1 || column2 || column3',
$this->platform->getConcatExpression('column1', 'column2', 'column3')
);
}
public function testGeneratesTransactionsCommands(): void
......@@ -294,13 +298,25 @@ class OraclePlatformTest extends AbstractPlatformTestCase
public function testModifyLimitQueryWithNonEmptyOffset(): void
{
$sql = $this->platform->modifyLimitQuery('SELECT * FROM user', 10, 10);
self::assertEquals('SELECT * FROM (SELECT a.*, ROWNUM AS doctrine_rownum FROM (SELECT * FROM user) a WHERE ROWNUM <= 20) WHERE doctrine_rownum >= 11', $sql);
self::assertEquals(
'SELECT * FROM ('
. 'SELECT a.*, ROWNUM AS doctrine_rownum FROM (SELECT * FROM user) a WHERE ROWNUM <= 20'
. ') WHERE doctrine_rownum >= 11',
$sql
);
}
public function testModifyLimitQueryWithEmptyLimit(): void
{
$sql = $this->platform->modifyLimitQuery('SELECT * FROM user', null, 10);
self::assertEquals('SELECT * FROM (SELECT a.*, ROWNUM AS doctrine_rownum FROM (SELECT * FROM user) a) WHERE doctrine_rownum >= 11', $sql);
self::assertEquals(
'SELECT * FROM ('
. 'SELECT a.*, ROWNUM AS doctrine_rownum FROM (SELECT * FROM user) a'
. ') WHERE doctrine_rownum >= 11',
$sql
);
}
public function testModifyLimitQueryWithAscOrderBy(): void
......@@ -325,7 +341,17 @@ class OraclePlatformTest extends AbstractPlatformTestCase
$targets = [
sprintf('CREATE TABLE %s (%s NUMBER(10) NOT NULL)', $tableName, $columnName),
sprintf(
"DECLARE constraints_Count NUMBER; BEGIN SELECT COUNT(CONSTRAINT_NAME) INTO constraints_Count FROM USER_CONSTRAINTS WHERE TABLE_NAME = '%s' AND CONSTRAINT_TYPE = 'P'; IF constraints_Count = 0 OR constraints_Count = '' THEN EXECUTE IMMEDIATE 'ALTER TABLE %s ADD CONSTRAINT %s_AI_PK PRIMARY KEY (%s)'; END IF; END;",
'DECLARE constraints_Count NUMBER;'
. ' BEGIN'
. ' SELECT COUNT(CONSTRAINT_NAME)'
. ' INTO constraints_Count'
. ' FROM USER_CONSTRAINTS'
. " WHERE TABLE_NAME = '%s' AND CONSTRAINT_TYPE = 'P';"
. " IF constraints_Count = 0 OR constraints_Count = ''"
. ' THEN EXECUTE IMMEDIATE'
. " 'ALTER TABLE %s ADD CONSTRAINT %s_AI_PK PRIMARY KEY (%s)';"
. ' END IF;'
. ' END;',
$tableName,
$tableName,
$tableName,
......@@ -333,7 +359,20 @@ class OraclePlatformTest extends AbstractPlatformTestCase
),
sprintf('CREATE SEQUENCE %s_SEQ START WITH 1 MINVALUE 1 INCREMENT BY 1', $tableName),
sprintf(
"CREATE TRIGGER %s_AI_PK BEFORE INSERT ON %s FOR EACH ROW DECLARE last_Sequence NUMBER; last_InsertID NUMBER; BEGIN SELECT %s_SEQ.NEXTVAL INTO :NEW.%s FROM DUAL; IF (:NEW.%s IS NULL OR :NEW.%s = 0) THEN SELECT %s_SEQ.NEXTVAL INTO :NEW.%s FROM DUAL; ELSE SELECT NVL(Last_Number, 0) INTO last_Sequence FROM User_Sequences WHERE Sequence_Name = '%s_SEQ'; SELECT :NEW.%s INTO last_InsertID FROM DUAL; WHILE (last_InsertID > last_Sequence) LOOP SELECT %s_SEQ.NEXTVAL INTO last_Sequence FROM DUAL; END LOOP; END IF; END;",
'CREATE TRIGGER %s_AI_PK BEFORE INSERT ON %s FOR EACH ROW DECLARE last_Sequence NUMBER;'
. ' last_InsertID NUMBER;'
. ' BEGIN SELECT %s_SEQ.NEXTVAL'
. ' INTO :NEW.%s FROM DUAL;'
. ' IF (:NEW.%s IS NULL OR :NEW.%s = 0)'
. ' THEN SELECT %s_SEQ.NEXTVAL INTO :NEW.%s FROM DUAL;'
. ' ELSE SELECT NVL(Last_Number, 0) INTO last_Sequence'
. " FROM User_Sequences WHERE Sequence_Name = '%s_SEQ';"
. ' SELECT :NEW.%s INTO last_InsertID FROM DUAL;'
. ' WHILE (last_InsertID > last_Sequence) LOOP'
. ' SELECT %s_SEQ.NEXTVAL INTO last_Sequence FROM DUAL;'
. ' END LOOP;'
. ' END IF;'
. ' END;',
$tableName,
$tableName,
$tableName,
......@@ -441,10 +480,14 @@ class OraclePlatformTest extends AbstractPlatformTestCase
protected function getQuotedColumnInForeignKeySQL(): array
{
return [
'CREATE TABLE "quoted" ("create" VARCHAR2(255) NOT NULL, foo VARCHAR2(255) NOT NULL, "bar" VARCHAR2(255) NOT NULL)',
'ALTER TABLE "quoted" ADD CONSTRAINT FK_WITH_RESERVED_KEYWORD FOREIGN KEY ("create", foo, "bar") REFERENCES foreign ("create", bar, "foo-bar")',
'ALTER TABLE "quoted" ADD CONSTRAINT FK_WITH_NON_RESERVED_KEYWORD FOREIGN KEY ("create", foo, "bar") REFERENCES foo ("create", bar, "foo-bar")',
'ALTER TABLE "quoted" ADD CONSTRAINT FK_WITH_INTENDED_QUOTATION FOREIGN KEY ("create", foo, "bar") REFERENCES "foo-bar" ("create", bar, "foo-bar")',
'CREATE TABLE "quoted" ("create" VARCHAR2(255) NOT NULL, foo VARCHAR2(255) NOT NULL, '
. '"bar" VARCHAR2(255) NOT NULL)',
'ALTER TABLE "quoted" ADD CONSTRAINT FK_WITH_RESERVED_KEYWORD FOREIGN KEY ("create", foo, "bar")'
. ' REFERENCES foreign ("create", bar, "foo-bar")',
'ALTER TABLE "quoted" ADD CONSTRAINT FK_WITH_NON_RESERVED_KEYWORD FOREIGN KEY ("create", foo, "bar")'
. ' REFERENCES foo ("create", bar, "foo-bar")',
'ALTER TABLE "quoted" ADD CONSTRAINT FK_WITH_INTENDED_QUOTATION FOREIGN KEY ("create", foo, "bar")'
. ' REFERENCES "foo-bar" ("create", bar, "foo-bar")',
];
}
......@@ -479,7 +522,11 @@ class OraclePlatformTest extends AbstractPlatformTestCase
['notnull']
);
$expectedSql = ["ALTER TABLE mytable MODIFY (foo VARCHAR2(255) DEFAULT 'bla', baz VARCHAR2(255) DEFAULT 'bla' NOT NULL, metar VARCHAR2(2000) DEFAULT NULL NULL)"];
$expectedSql = [
"ALTER TABLE mytable MODIFY (foo VARCHAR2(255) DEFAULT 'bla', baz VARCHAR2(255) DEFAULT 'bla' NOT NULL, "
. 'metar VARCHAR2(2000) DEFAULT NULL NULL)',
];
self::assertEquals($expectedSql, $this->platform->getAlterTableSQL($tableDiff));
}
......@@ -508,7 +555,11 @@ class OraclePlatformTest extends AbstractPlatformTestCase
self::assertSame('RAW(255)', $this->platform->getBinaryTypeDeclarationSQL(['fixed' => true]));
self::assertSame('RAW(2000)', $this->platform->getBinaryTypeDeclarationSQL(['fixed' => true, 'length' => 0]));
self::assertSame('RAW(2000)', $this->platform->getBinaryTypeDeclarationSQL(['fixed' => true, 'length' => 2000]));
self::assertSame(
'RAW(2000)',
$this->platform->getBinaryTypeDeclarationSQL(['fixed' => true, 'length' => 2000])
);
}
public function testReturnsBinaryTypeLongerThanMaxDeclarationSQL(): void
......
tests/Doctrine/Tests/DBAL/Platforms/PostgreSQL91PlatformTest.php
View file @ 3f3551aa
......@@ -30,12 +30,15 @@ class PostgreSQL91PlatformTest extends PostgreSqlPlatformTest
{
$table = new Table('foo');
$table->addColumn('no_collation', 'string');
$table->addColumn('column_collation', 'string')->setPlatformOption('collation', 'en_US.UTF-8');
$table->addColumn('column_collation', 'string')
->setPlatformOption('collation', 'en_US.UTF-8');
self::assertSame(
['CREATE TABLE foo (no_collation VARCHAR(255) NOT NULL, column_collation VARCHAR(255) NOT NULL COLLATE "en_US.UTF-8")'],
$this->platform->getCreateTableSQL($table),
'Column "no_collation" will use the default collation from the table/database and "column_collation" overwrites the collation on this column'
[
'CREATE TABLE foo (no_collation VARCHAR(255) NOT NULL, '
. 'column_collation VARCHAR(255) NOT NULL COLLATE "en_US.UTF-8")',
],
$this->platform->getCreateTableSQL($table)
);
}
}
tests/Doctrine/Tests/DBAL/Platforms/SQLAnywhere12PlatformTest.php
View file @ 3f3551aa
......@@ -83,7 +83,8 @@ class SQLAnywhere12PlatformTest extends SQLAnywhere11PlatformTest
public function testGeneratesCreateIndexWithAdvancedPlatformOptionsSQL(): void
{
self::assertEquals(
'CREATE VIRTUAL UNIQUE CLUSTERED INDEX fooindex ON footable (a, b) WITH NULLS NOT DISTINCT FOR OLAP WORKLOAD',
'CREATE VIRTUAL UNIQUE CLUSTERED INDEX fooindex ON footable (a, b)'
. ' WITH NULLS NOT DISTINCT FOR OLAP WORKLOAD',
$this->platform->getCreateIndexSQL(
new Index(
'fooindex',
......
tests/Doctrine/Tests/DBAL/Platforms/SQLAzurePlatformTest.php
View file @ 3f3551aa
......@@ -23,6 +23,9 @@ class SQLAzurePlatformTest extends DbalTestCase
$table->addOption('azure.federatedOnDistributionName', 'TblId');
$table->addOption('azure.federatedOnColumnName', 'id');
self::assertEquals(['CREATE TABLE tbl (id INT NOT NULL) FEDERATED ON (TblId = id)'], $this->platform->getCreateTableSQL($table));
self::assertEquals(
['CREATE TABLE tbl (id INT NOT NULL) FEDERATED ON (TblId = id)'],
$this->platform->getCreateTableSQL($table)
);
}
}
tests/Doctrine/Tests/DBAL/Platforms/SQLServerPlatformTest.php
View file @ 3f3551aa
......@@ -58,18 +58,36 @@ class SQLServerPlatformTest extends AbstractSQLServerPlatformTestCase
return [
// Test re-ordered query with correctly-scrubbed ORDER BY clause
[
'SELECT id_0, MIN(sclr_2) AS dctrn_minrownum FROM (SELECT c0_.id AS id_0, c0_.title AS title_1, ROW_NUMBER() OVER(ORDER BY c0_.title ASC) AS sclr_2 FROM TestTable c0_ ORDER BY c0_.title ASC) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC',
'SELECT id_0, MIN(sclr_2) AS dctrn_minrownum FROM ('
. 'SELECT c0_.id AS id_0, c0_.title AS title_1, '
. 'ROW_NUMBER() OVER(ORDER BY c0_.title ASC) AS sclr_2 FROM TestTable c0_ ORDER BY c0_.title ASC) '
. 'dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC',
30,
null,
'WITH dctrn_cte AS (SELECT TOP 30 id_0, MIN(sclr_2) AS dctrn_minrownum FROM (SELECT c0_.id AS id_0, c0_.title AS title_1, ROW_NUMBER() OVER(ORDER BY c0_.title ASC) AS sclr_2 FROM TestTable c0_) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC) SELECT * FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY (SELECT 0)) AS doctrine_rownum FROM dctrn_cte) AS doctrine_tbl WHERE doctrine_rownum <= 30 ORDER BY doctrine_rownum ASC',
'WITH dctrn_cte AS (SELECT TOP 30 id_0, MIN(sclr_2) AS dctrn_minrownum FROM ('
. 'SELECT c0_.id AS id_0, c0_.title AS title_1, ROW_NUMBER() '
. 'OVER(ORDER BY c0_.title ASC) AS sclr_2 FROM TestTable c0_) dctrn_result '
. 'GROUP BY id_0 ORDER BY dctrn_minrownum ASC) '
. 'SELECT * FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY (SELECT 0)) '
. 'AS doctrine_rownum FROM dctrn_cte) AS doctrine_tbl WHERE doctrine_rownum <= 30 '
. 'ORDER BY doctrine_rownum ASC',
],
// Test re-ordered query with no scrubbed ORDER BY clause
[
'SELECT id_0, MIN(sclr_2) AS dctrn_minrownum FROM (SELECT c0_.id AS id_0, c0_.title AS title_1, ROW_NUMBER() OVER(ORDER BY c0_.title ASC) AS sclr_2 FROM TestTable c0_) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC',
'SELECT id_0, MIN(sclr_2) AS dctrn_minrownum FROM ('
. 'SELECT c0_.id AS id_0, c0_.title AS title_1, '
. 'ROW_NUMBER() OVER(ORDER BY c0_.title ASC) AS sclr_2 FROM TestTable c0_) dctrn_result '
. 'GROUP BY id_0 ORDER BY dctrn_minrownum ASC',
30,
null,
'WITH dctrn_cte AS (SELECT TOP 30 id_0, MIN(sclr_2) AS dctrn_minrownum FROM (SELECT c0_.id AS id_0, c0_.title AS title_1, ROW_NUMBER() OVER(ORDER BY c0_.title ASC) AS sclr_2 FROM TestTable c0_) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC) SELECT * FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY (SELECT 0)) AS doctrine_rownum FROM dctrn_cte) AS doctrine_tbl WHERE doctrine_rownum <= 30 ORDER BY doctrine_rownum ASC',
'WITH dctrn_cte AS (SELECT TOP 30 id_0, MIN(sclr_2) AS dctrn_minrownum FROM ('
. 'SELECT c0_.id AS id_0, c0_.title AS title_1, ROW_NUMBER() '
. 'OVER(ORDER BY c0_.title ASC) AS sclr_2 FROM TestTable c0_) dctrn_result '
. 'GROUP BY id_0 ORDER BY dctrn_minrownum ASC) '
. 'SELECT * FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY (SELECT 0)) '
. 'AS doctrine_rownum FROM dctrn_cte) AS doctrine_tbl WHERE doctrine_rownum <= 30 '
. 'ORDER BY doctrine_rownum ASC',
],
];
}
......
tests/Doctrine/Tests/DBAL/Schema/MySqlInheritCharsetTest.php
View file @ 3f3551aa
......@@ -38,31 +38,37 @@ class MySqlInheritCharsetTest extends TestCase
public function testTableOptions(): void
{
$eventManager = new EventManager();
$driverMock = $this->createMock(Driver::class);
$platform = new MySqlPlatform();
$platform = new MySqlPlatform();
// default, no overrides
$table = new Table('foobar', [new Column('aa', Type::getType('integer'))]);
self::assertSame(
$platform->getCreateTableSQL($table),
['CREATE TABLE foobar (aa INT NOT NULL) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB']
[
'CREATE TABLE foobar (aa INT NOT NULL)'
. ' DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB',
],
$platform->getCreateTableSQL($table)
);
// explicit utf8
$table = new Table('foobar', [new Column('aa', Type::getType('integer'))]);
$table->addOption('charset', 'utf8');
self::assertSame(
$platform->getCreateTableSQL($table),
['CREATE TABLE foobar (aa INT NOT NULL) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB']
[
'CREATE TABLE foobar (aa INT NOT NULL)'
. ' DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB',
],
$platform->getCreateTableSQL($table)
);
// explicit utf8mb4
$table = new Table('foobar', [new Column('aa', Type::getType('integer'))]);
$table->addOption('charset', 'utf8mb4');
self::assertSame(
$platform->getCreateTableSQL($table),
['CREATE TABLE foobar (aa INT NOT NULL) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB']
['CREATE TABLE foobar (aa INT NOT NULL)'
. ' DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB',
],
$platform->getCreateTableSQL($table)
);
}
......
tests/Doctrine/Tests/DBAL/Schema/MySqlSchemaManagerTest.php
View file @ 3f3551aa
......@@ -42,8 +42,18 @@ class MySqlSchemaManagerTest extends TestCase
self::assertCount(1, $fkeys, 'Table has to have one foreign key.');
self::assertInstanceOf(ForeignKeyConstraint::class, $fkeys[0]);
self::assertEquals(['column_1', 'column_2', 'column_3'], array_map('strtolower', $fkeys[0]->getLocalColumns()));
self::assertEquals(['column_1', 'column_2', 'column_3'], array_map('strtolower', $fkeys[0]->getForeignColumns()));
self::assertEquals([
'column_1',
'column_2',
'column_3',
], array_map('strtolower', $fkeys[0]->getLocalColumns()));
self::assertEquals([
'column_1',
'column_2',
'column_3',
], array_map('strtolower', $fkeys[0]->getForeignColumns()));
}
/**
......
tests/Doctrine/Tests/DBAL/Schema/Platforms/MySQLSchemaTest.php
View file @ 3f3551aa
......@@ -55,7 +55,13 @@ class MySQLSchemaTest extends TestCase
$sqls[] = $this->platform->getCreateForeignKeySQL($fk, $tableOld);
}
self::assertEquals(['ALTER TABLE test ADD CONSTRAINT FK_D87F7E0C8E48560F FOREIGN KEY (foo_id) REFERENCES test_foreign (foo_id)'], $sqls);
self::assertEquals(
[
'ALTER TABLE test ADD CONSTRAINT FK_D87F7E0C8E48560F FOREIGN KEY (foo_id)'
. ' REFERENCES test_foreign (foo_id)',
],
$sqls
);
}
public function testClobNoAlterTable(): void
......
tests/Doctrine/Tests/DBAL/Schema/Visitor/RemoveNamespacedAssetsTest.php
View file @ 3f3551aa
......@@ -25,7 +25,7 @@ class RemoveNamespacedAssetsTest extends TestCase
$schema->visit(new RemoveNamespacedAssets());
$tables = $schema->getTables();
self::assertEquals(['test.test', 'test.baz'], array_keys($tables), "Only 2 tables should be present, both in 'test' namespace.");
self::assertEquals(['test.test', 'test.baz'], array_keys($tables));
}
public function testCleanupForeignKeys(): void
......
tests/Doctrine/Tests/DBAL/UtilTest.php
View file @ 3f3551aa
This diff is collapsed.
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