Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb00b416

Browse files
committed
use Table::addPrimaryKeyConstraint() with Doctrine DBAL 4.3+
1 parentbc82b67 commitb00b416

File tree

6 files changed

+54
-6
lines changed

6 files changed

+54
-6
lines changed

‎src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaListener.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313

1414
useDoctrine\DBAL\Connection;
1515
useDoctrine\DBAL\Exception\TableNotFoundException;
16+
useDoctrine\DBAL\Schema\Name\Identifier;
17+
useDoctrine\DBAL\Schema\Name\UnqualifiedName;
18+
useDoctrine\DBAL\Schema\PrimaryKeyConstraint;
1619
useDoctrine\DBAL\Schema\Table;
1720
useDoctrine\DBAL\Types\Types;
1821
useDoctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
@@ -30,7 +33,12 @@ protected function getIsSameDatabaseChecker(Connection $connection): \Closure
3033
$table->addColumn('id', Types::INTEGER)
3134
->setAutoincrement(true)
3235
->setNotnull(true);
33-
$table->setPrimaryKey(['id']);
36+
37+
if (class_exists(PrimaryKeyConstraint::class)) {
38+
$table->addPrimaryKeyConstraint(newPrimaryKeyConstraint(null, [newUnqualifiedName(Identifier::unquoted('id'))],true));
39+
}else {
40+
$table->setPrimaryKey(['id']);
41+
}
3442

3543
$schemaManager->createTable($table);
3644

‎src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313

1414
useDoctrine\DBAL\Connection;
1515
useDoctrine\DBAL\ParameterType;
16+
useDoctrine\DBAL\Schema\Name\Identifier;
17+
useDoctrine\DBAL\Schema\Name\UnqualifiedName;
18+
useDoctrine\DBAL\Schema\PrimaryKeyConstraint;
1619
useDoctrine\DBAL\Schema\Schema;
1720
useDoctrine\DBAL\Types\Types;
1821
useSymfony\Component\Security\Core\Authentication\RememberMe\PersistentToken;
@@ -193,6 +196,11 @@ private function addTableToSchema(Schema $schema): void
193196
$table->addColumn('lastUsed', Types::DATETIME_IMMUTABLE);
194197
$table->addColumn('class', Types::STRING, ['length' =>100]);
195198
$table->addColumn('username', Types::STRING, ['length' =>200]);
196-
$table->setPrimaryKey(['series']);
199+
200+
if (class_exists(PrimaryKeyConstraint::class)) {
201+
$table->addPrimaryKeyConstraint(newPrimaryKeyConstraint(null, [newUnqualifiedName(Identifier::unquoted('series'))],true));
202+
}else {
203+
$table->setPrimaryKey(['series']);
204+
}
197205
}
198206
}

‎src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
useDoctrine\DBAL\Exception\TableNotFoundException;
2020
useDoctrine\DBAL\ParameterType;
2121
useDoctrine\DBAL\Schema\DefaultSchemaManagerFactory;
22+
useDoctrine\DBAL\Schema\Name\Identifier;
23+
useDoctrine\DBAL\Schema\Name\UnqualifiedName;
24+
useDoctrine\DBAL\Schema\PrimaryKeyConstraint;
2225
useDoctrine\DBAL\Schema\Schema;
2326
useDoctrine\DBAL\Tools\DsnParser;
2427
useSymfony\Component\Cache\Exception\InvalidArgumentException;
@@ -378,6 +381,11 @@ private function addTableToSchema(Schema $schema): void
378381
$table->addColumn($this->dataCol,'blob', ['length' =>16777215]);
379382
$table->addColumn($this->lifetimeCol,'integer', ['unsigned' =>true,'notnull' =>false]);
380383
$table->addColumn($this->timeCol,'integer', ['unsigned' =>true]);
381-
$table->setPrimaryKey([$this->idCol]);
384+
385+
if (class_exists(PrimaryKeyConstraint::class)) {
386+
$table->addPrimaryKeyConstraint(newPrimaryKeyConstraint(null, [newUnqualifiedName(Identifier::unquoted($this->idCol))],true));
387+
}else {
388+
$table->setPrimaryKey([$this->idCol]);
389+
}
382390
}
383391
}

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111

1212
namespaceSymfony\Component\HttpFoundation\Session\Storage\Handler;
1313

14+
useDoctrine\DBAL\Schema\Name\Identifier;
15+
useDoctrine\DBAL\Schema\Name\UnqualifiedName;
16+
useDoctrine\DBAL\Schema\PrimaryKeyConstraint;
1417
useDoctrine\DBAL\Schema\Schema;
1518
useDoctrine\DBAL\Types\Types;
1619

@@ -224,7 +227,13 @@ public function configureSchema(Schema $schema, ?\Closure $isSameDatabase = null
224227
default:
225228
thrownew \DomainException(\sprintf('Creating the session table is currently not implemented for PDO driver "%s".',$this->driver));
226229
}
227-
$table->setPrimaryKey([$this->idCol]);
230+
231+
if (class_exists(PrimaryKeyConstraint::class)) {
232+
$table->addPrimaryKeyConstraint(newPrimaryKeyConstraint(null, [newUnqualifiedName(Identifier::unquoted($this->idCol))],true));
233+
}else {
234+
$table->setPrimaryKey([$this->idCol]);
235+
}
236+
228237
$table->addIndex([$this->lifetimeCol],$this->lifetimeCol.'_idx');
229238
}
230239

‎src/Symfony/Component/Lock/Store/DoctrineDbalStore.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
useDoctrine\DBAL\Exception\TableNotFoundException;
1919
useDoctrine\DBAL\ParameterType;
2020
useDoctrine\DBAL\Schema\DefaultSchemaManagerFactory;
21+
useDoctrine\DBAL\Schema\Name\Identifier;
22+
useDoctrine\DBAL\Schema\Name\UnqualifiedName;
23+
useDoctrine\DBAL\Schema\PrimaryKeyConstraint;
2124
useDoctrine\DBAL\Schema\Schema;
2225
useDoctrine\DBAL\Tools\DsnParser;
2326
useSymfony\Component\Lock\Exception\InvalidArgumentException;
@@ -214,7 +217,12 @@ public function configureSchema(Schema $schema, \Closure $isSameDatabase): void
214217
$table->addColumn($this->idCol,'string', ['length' =>64]);
215218
$table->addColumn($this->tokenCol,'string', ['length' =>44]);
216219
$table->addColumn($this->expirationCol,'integer', ['unsigned' =>true]);
217-
$table->setPrimaryKey([$this->idCol]);
220+
221+
if (class_exists(PrimaryKeyConstraint::class)) {
222+
$table->addPrimaryKeyConstraint(newPrimaryKeyConstraint(null, [newUnqualifiedName(Identifier::unquoted($this->idCol))],true));
223+
}else {
224+
$table->setPrimaryKey([$this->idCol]);
225+
}
218226
}
219227

220228
/**

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
useDoctrine\DBAL\Query\QueryBuilder;
2424
useDoctrine\DBAL\Result;
2525
useDoctrine\DBAL\Schema\AbstractAsset;
26+
useDoctrine\DBAL\Schema\Name\Identifier;
27+
useDoctrine\DBAL\Schema\Name\UnqualifiedName;
28+
useDoctrine\DBAL\Schema\PrimaryKeyConstraint;
2629
useDoctrine\DBAL\Schema\Schema;
2730
useDoctrine\DBAL\Schema\Table;
2831
useDoctrine\DBAL\Types\Types;
@@ -519,7 +522,11 @@ private function addTableToSchema(Schema $schema): void
519522
->setNotnull(true);
520523
$table->addColumn('delivered_at', Types::DATETIME_IMMUTABLE)
521524
->setNotnull(false);
522-
$table->setPrimaryKey(['id']);
525+
if (class_exists(PrimaryKeyConstraint::class)) {
526+
$table->addPrimaryKeyConstraint(newPrimaryKeyConstraint(null, [newUnqualifiedName(Identifier::unquoted('id'))],true));
527+
}else {
528+
$table->setPrimaryKey(['id']);
529+
}
523530
$table->addIndex(['queue_name']);
524531
$table->addIndex(['available_at']);
525532
$table->addIndex(['delivered_at']);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp