Skip to content

Fix UniqueConstraint with empty name. #3519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Doctrine/DBAL/Schema/Table.php
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ protected function _addUniqueConstraint(UniqueConstraint $constraint)
$name = strlen($constraint->getName())
? $constraint->getName()
: $this->_generateIdentifierName(
array_merge((array) $this->getName(), $constraint->getLocalColumns()),
array_merge((array) $this->getName(), $constraint->getColumns()),
'fk',
$this->_getMaxIdentifierLength()
);
Expand Down
3 changes: 0 additions & 3 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ parameters:
# weird class name, doesn't exist in stubs either
- '~unknown class OCI-(Lob|Collection)~'

# https://github.com/doctrine/dbal/issues/3236
- '~^Call to an undefined method Doctrine\\DBAL\\Schema\\UniqueConstraint::getLocalColumns\(\)~'

# https://github.com/doctrine/dbal/issues/3237
- '~^Call to an undefined method Doctrine\\DBAL\\Driver\\PDOStatement::nextRowset\(\)~'

Expand Down
38 changes: 36 additions & 2 deletions tests/Doctrine/Tests/DBAL/Schema/TableTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
use Doctrine\DBAL\Schema\Index;
use Doctrine\DBAL\Schema\SchemaException;
use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Schema\UniqueConstraint;
use Doctrine\DBAL\Types\Type;
use Doctrine\Tests\DbalTestCase;
use function array_shift;
use function array_keys;
use function current;

class TableTest extends DbalTestCase
Expand Down Expand Up @@ -206,7 +207,11 @@ public function testConstraints()
$constraints = $tableA->getForeignKeys();

self::assertCount(1, $constraints);
self::assertSame($constraint, array_shift($constraints));

$constraintNames = array_keys($constraints);

self::assertSame('fk_8c736521', $constraintNames[0]);
self::assertSame($constraint, $constraints['fk_8c736521']);
}

public function testOptions()
Expand Down Expand Up @@ -884,4 +889,33 @@ public function getNormalizesAssetNames()
['"FOO"'],
];
}

public function testUniqueConstraintWithEmptyName() : void
{
$columns = [
new Column('column1', Type::getType(Type::STRING)),
new Column('column2', Type::getType(Type::STRING)),
new Column('column3', Type::getType(Type::STRING)),
new Column('column4', Type::getType(Type::STRING)),
];

$uniqueConstraints = [
new UniqueConstraint('', ['column1', 'column2']),
new UniqueConstraint('', ['column3', 'column4']),
];

$table = new Table('test', $columns, [], $uniqueConstraints);

$constraints = $table->getUniqueConstraints();

self::assertCount(2, $constraints);

$constraintNames = array_keys($constraints);

self::assertSame('fk_d87f7e0c341ce00bad15b1b1', $constraintNames[0]);
self::assertSame('fk_d87f7e0cda12812744761484', $constraintNames[1]);

self::assertSame($uniqueConstraints[0], $constraints['fk_d87f7e0c341ce00bad15b1b1']);
self::assertSame($uniqueConstraints[1], $constraints['fk_d87f7e0cda12812744761484']);
}
}