Skip to content
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
14 changes: 14 additions & 0 deletions src/Database/Migrations/Columns/Column.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

abstract class Column extends TableColumn
{
protected bool $isUnique = false;

public function __construct(
protected string $name
) {
Expand All @@ -29,6 +31,11 @@ public function comment(string $comment): static
return $this;
}

public function isUnique(): bool
{
return $this->isUnique;
}

public function after(string $column): static
{
$this->options['after'] = $column;
Expand Down Expand Up @@ -90,4 +97,11 @@ public function limit(int $limit): static

return $this;
}

public function unique(): static
{
$this->isUnique = true;

return $this;
}
}
10 changes: 10 additions & 0 deletions src/Database/Migrations/Table.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ protected function addForeignKeyWithAdapter(ForeignKey $foreignKey): ForeignKey
return $foreignKey;
}

public function getUniqueColumns(): array
{
return array_filter($this->columns, fn ($column): bool => $column->isUnique());
}

protected function addColumnFromBuilders(): void
{
foreach ($this->columns as $column) {
Expand All @@ -126,5 +131,10 @@ protected function addColumnFromBuilders(): void
$foreignKey->getOptions()
);
}

foreach ($this->getUniqueColumns() as $column) {
$this->addIndex([$column->getName()], ['unique' => true]);
}

}
}
73 changes: 73 additions & 0 deletions tests/Unit/Database/Migrations/TableTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1068,3 +1068,76 @@
expect($foreignKey->getOptions()['delete'])->toBe('SET_NULL');
expect($foreignKey->getOptions()['constraint'])->toBe('fk_post_author');
});

it('can mark a column as unique', function (): void {
$table = new Table('users', adapter: $this->mockAdapter);

$column = $table->string('email')->unique();

expect($column->isUnique())->toBeTrue();

$uniqueColumns = $table->getUniqueColumns();

expect(count($uniqueColumns))->toBe(1);
expect($uniqueColumns[0]->getName())->toBe('email');
});

it('can mark multiple columns as unique', function (): void {
$table = new Table('users', adapter: $this->mockAdapter);

$table->string('username')->unique();
$table->string('email')->unique();
$table->integer('user_id')->unique();

$uniqueColumns = $table->getUniqueColumns();

expect(count($uniqueColumns))->toBe(3);

$columnNames = array_map(fn ($column) => $column->getName(), $uniqueColumns);

expect($columnNames)->toContain('username');
expect($columnNames)->toContain('email');
expect($columnNames)->toContain('user_id');
});

it('can identify non-unique columns', function (): void {
$table = new Table('users', adapter: $this->mockAdapter);

$uniqueColumn = $table->string('email')->unique();
$regularColumn = $table->string('name');

expect($uniqueColumn->isUnique())->toBeTrue();
expect($regularColumn->isUnique())->toBeFalse();

$uniqueColumns = $table->getUniqueColumns();

expect(count($uniqueColumns))->toBe(1);
expect($uniqueColumns[0]->getName())->toBe('email');
});

it('creates unique indexes when building columns', function (): void {
$table = $this->getMockBuilder(Table::class)
->setConstructorArgs(['users', [], $this->mockAdapter])
->onlyMethods(['addIndex', 'addColumn'])
->getMock();

$table->expects($this->exactly(3))
->method('addColumn')
->willReturn($table);

$table->expects($this->exactly(2))
->method('addIndex')
->withConsecutive(
[['username'], ['unique' => true]],
[['email'], ['unique' => true]]
);

$table->string('username')->unique();
$table->string('email')->unique();
$table->string('name');

$reflection = new ReflectionClass($table);
$method = $reflection->getMethod('addColumnFromBuilders');
$method->setAccessible(true);
$method->invoke($table);
});
2 changes: 1 addition & 1 deletion tests/Unit/Queue/ParallelQueueTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
}

// Wait for all tasks to complete
delay(5.0);
delay(6.0);

// Eventually all tasks should be processed
$this->assertSame(0, $parallelQueue->size());
Expand Down