Skip to content

Preserve other tables during dbal storage setup #110

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.

Sign up for GitHub

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
Dec 7, 2023
Merged

Preserve other tables during dbal storage setup #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ public function __construct(ConnectionRegistry $doctrine, array $options)
public function setup(): void
{
$assetFilter = $this->connection->getConfiguration()->getSchemaAssetsFilter();
$this->connection->getConfiguration()->setSchemaAssetsFilter(null);
$this->connection->getConfiguration()->setSchemaAssetsFilter(
fn(string $tableName) => $tableName === $this->table,
);

$schemaManager = method_exists($this->connection, 'createSchemaManager')
? $this->connection->createSchemaManager()
Expand Down
22 changes: 19 additions & 3 deletions src/batch-doctrine-dbal/tests/DoctrineDBALJobExecutionStorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
namespace Yokai\Batch\Tests\Bridge\Doctrine\DBAL;

use DateTimeImmutable;
use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Types\Types;
use Generator;
use RuntimeException;
use Throwable;
Expand All @@ -31,7 +33,7 @@ private function createStorage(array $options = []): DoctrineDBALJobExecutionSto

public function testCreateStandardTable(): void
{
$schemaManager = $this->connection->getSchemaManager();
$schemaManager = $this->connection->createSchemaManager();

self::assertFalse($schemaManager->tablesExist(['yokai_batch_job_execution']));
$this->createStorage()->setup();
Expand All @@ -58,7 +60,7 @@ public function testCreateStandardTable(): void

public function testCreateCustomTable(): void
{
$schemaManager = $this->connection->getSchemaManager();
$schemaManager = $this->connection->createSchemaManager();

self::assertFalse($schemaManager->tablesExist(['acme_job_executions']));
$this->createStorage(['table' => 'acme_job_executions'])->setup();
Expand All @@ -83,6 +85,20 @@ public function testCreateCustomTable(): void
);
}

public function testSetupPreserveOtherTables(): void
{
$schemaManager = $this->connection->createSchemaManager();
$table = new Table('user');
$table->addColumn('username', Types::STRING);
$schemaManager->createTable($table);

self::assertTrue($schemaManager->tablesExist(['user']));
self::assertFalse($schemaManager->tablesExist(['yokai_batch_job_execution']));
$this->createStorage()->setup();
self::assertTrue($schemaManager->tablesExist(['user']));
self::assertTrue($schemaManager->tablesExist(['yokai_batch_job_execution']));
}

public function testStoreInsert(): void
{
$storage = $this->createStorage();
Expand Down Expand Up @@ -345,7 +361,7 @@ public function queries(): Generator

public function testCreateSchemaDeprecated(): void
{
$schemaManager = $this->connection->getSchemaManager();
$schemaManager = $this->connection->createSchemaManager();
self::assertFalse($schemaManager->tablesExist(['yokai_batch_job_execution']));
$this->createStorage()->createSchema();
self::assertTrue($schemaManager->tablesExist(['yokai_batch_job_execution']));
Expand Down