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

Commitfefeffc

Browse files
committed
Run high-deps tests with ORM 3 and DBAL 4
1 parent7aaa92a commitfefeffc

File tree

9 files changed

+67
-32
lines changed

9 files changed

+67
-32
lines changed

‎src/Symfony/Bridge/Doctrine/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"doctrine/annotations":"^1.10.4|^2",
4747
"doctrine/collections":"^1.0|^2.0",
4848
"doctrine/data-fixtures":"^1.1",
49-
"doctrine/dbal":"^2.13.1|^3.0",
50-
"doctrine/orm":"^2.7.4",
49+
"doctrine/dbal":"^2.13.1|^3|^4",
50+
"doctrine/orm":"^2.7.4|^3",
5151
"psr/log":"^1|^2|^3"
5252
},
5353
"conflict": {

‎src/Symfony/Component/Cache/Tests/Fixtures/DriverWrapper.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
useDoctrine\DBAL\Driver;
1616
useDoctrine\DBAL\Platforms\AbstractPlatform;
1717
useDoctrine\DBAL\Schema\AbstractSchemaManager;
18+
useDoctrine\DBAL\ServerVersionProvider;
1819

1920
class DriverWrapperimplements Driver
2021
{
@@ -31,9 +32,9 @@ public function connect(array $params, $username = null, $password = null, array
3132
return$this->driver->connect($params,$username,$password,$driverOptions);
3233
}
3334

34-
publicfunctiongetDatabasePlatform():AbstractPlatform
35+
publicfunctiongetDatabasePlatform(ServerVersionProvider$versionProvider =null):AbstractPlatform
3536
{
36-
return$this->driver->getDatabasePlatform();
37+
return$this->driver->getDatabasePlatform($versionProvider);
3738
}
3839

3940
publicfunctiongetSchemaManager(Connection$conn,AbstractPlatform$platform):AbstractSchemaManager

‎src/Symfony/Component/Cache/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"require-dev": {
3535
"cache/integration-tests":"dev-master",
3636
"doctrine/cache":"^1.6|^2.0",
37-
"doctrine/dbal":"^2.13.1|^3.0",
37+
"doctrine/dbal":"^2.13.1|^3|^4",
3838
"predis/predis":"^1.1",
3939
"psr/simple-cache":"^1.0|^2.0",
4040
"symfony/config":"^4.4|^5.0|^6.0",

‎src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,22 @@ public function testCreatesTableInTransaction(string $platform)
150150
$store->save($key);
151151
}
152152

153-
publicstaticfunctionprovidePlatforms()
153+
publicstaticfunctionprovidePlatforms():\Generator
154154
{
155155
yield [\Doctrine\DBAL\Platforms\PostgreSQLPlatform::class];
156-
yield [\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class];
156+
157+
// DBAL < 4
158+
if (class_exists(\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class)) {
159+
yield [\Doctrine\DBAL\Platforms\PostgreSQL94Platform::class];
160+
}
161+
157162
yield [\Doctrine\DBAL\Platforms\SqlitePlatform::class];
158163
yield [\Doctrine\DBAL\Platforms\SQLServerPlatform::class];
159-
yield [\Doctrine\DBAL\Platforms\SQLServer2012Platform::class];
164+
165+
// DBAL < 4
166+
if (class_exists(\Doctrine\DBAL\Platforms\SQLServer2012Platform::class)) {
167+
yield [\Doctrine\DBAL\Platforms\SQLServer2012Platform::class];
168+
}
160169
}
161170

162171
publicfunctiontestTableCreationInTransactionNotSupported()

‎src/Symfony/Component/Lock/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/polyfill-php80":"^1.16"
2323
},
2424
"require-dev": {
25-
"doctrine/dbal":"^2.13|^3.0",
25+
"doctrine/dbal":"^2.13|^3|^4",
2626
"predis/predis":"~1.0"
2727
},
2828
"conflict": {

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/ConnectionTest.php‎

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
useDoctrine\DBAL\Platforms\AbstractPlatform;
2020
useDoctrine\DBAL\Platforms\MariaDBPlatform;
2121
useDoctrine\DBAL\Platforms\MySQL57Platform;
22+
useDoctrine\DBAL\Platforms\MySQLPlatform;
2223
useDoctrine\DBAL\Platforms\OraclePlatform;
2324
useDoctrine\DBAL\Platforms\SQLServer2012Platform;
25+
useDoctrine\DBAL\Platforms\SQLServerPlatform;
2426
useDoctrine\DBAL\Query\QueryBuilder;
2527
useDoctrine\DBAL\Result;
2628
useDoctrine\DBAL\Schema\AbstractSchemaManager;
@@ -98,7 +100,7 @@ public function testItThrowsATransportExceptionIfItCannotAcknowledgeMessage()
98100
{
99101
$this->expectException(TransportException::class);
100102
$driverConnection =$this->getDBALConnectionMock();
101-
$driverConnection->method('delete')->willThrowException(newDBALException());
103+
$driverConnection->method('delete')->willThrowException($this->createStub(DBALException::class));
102104

103105
$connection =newConnection([],$driverConnection);
104106
$connection->ack('dummy_id');
@@ -108,7 +110,7 @@ public function testItThrowsATransportExceptionIfItCannotRejectMessage()
108110
{
109111
$this->expectException(TransportException::class);
110112
$driverConnection =$this->getDBALConnectionMock();
111-
$driverConnection->method('delete')->willThrowException(newDBALException());
113+
$driverConnection->method('delete')->willThrowException($this->createStub(DBALException::class));
112114

113115
$connection =newConnection([],$driverConnection);
114116
$connection->reject('dummy_id');
@@ -391,7 +393,7 @@ public function testGeneratedSql(AbstractPlatform $platform, string $expectedSql
391393
publicstaticfunctionprovidePlatformSql():iterable
392394
{
393395
yield'MySQL' => [
394-
newMySQL57Platform(),
396+
class_exists(MySQLPlatform::class) ?newMySQLPlatform() :newMySQL57Platform(),
395397
'SELECT m.* FROM messenger_messages m WHERE (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) AND (m.queue_name = ?) ORDER BY available_at ASC LIMIT 1 FOR UPDATE',
396398
];
397399

@@ -403,14 +405,23 @@ public static function providePlatformSql(): iterable
403405
}
404406

405407
yield'SQL Server' => [
406-
newSQLServer2012Platform(),
408+
class_exists(SQLServerPlatform::class) ?newSQLServerPlatform() :newSQLServer2012Platform(),
407409
'SELECT m.* FROM messenger_messages m WITH (UPDLOCK, ROWLOCK) WHERE (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) AND (m.queue_name = ?) ORDER BY available_at ASC OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY',
408410
];
409411

410-
yield'Oracle' => [
411-
newOraclePlatform(),
412-
'SELECT w.id AS "id", w.body AS "body", w.headers AS "headers", w.queue_name AS "queue_name", w.created_at AS "created_at", w.available_at AS "available_at", w.delivered_at AS "delivered_at" FROM messenger_messages w WHERE w.id IN (SELECT a.id FROM (SELECT m.id FROM messenger_messages m WHERE (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) AND (m.queue_name = ?) ORDER BY available_at ASC) a WHERE ROWNUM <= 1) FOR UPDATE',
413-
];
412+
if (!class_exists(MySQL57Platform::class)) {
413+
// DBAL >= 4
414+
yield'Oracle' => [
415+
newOraclePlatform(),
416+
'SELECT w.id AS "id", w.body AS "body", w.headers AS "headers", w.queue_name AS "queue_name", w.created_at AS "created_at", w.available_at AS "available_at", w.delivered_at AS "delivered_at" FROM messenger_messages w WHERE w.id IN (SELECT m.id FROM messenger_messages m WHERE (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) AND (m.queue_name = ?) ORDER BY available_at ASC FETCH NEXT 1 ROWS ONLY) FOR UPDATE',
417+
];
418+
}else {
419+
// DBAL < 4
420+
yield'Oracle' => [
421+
newOraclePlatform(),
422+
'SELECT w.id AS "id", w.body AS "body", w.headers AS "headers", w.queue_name AS "queue_name", w.created_at AS "created_at", w.available_at AS "available_at", w.delivered_at AS "delivered_at" FROM messenger_messages w WHERE w.id IN (SELECT a.id FROM (SELECT m.id FROM messenger_messages m WHERE (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) AND (m.queue_name = ?) ORDER BY available_at ASC) a WHERE ROWNUM <= 1) FOR UPDATE',
423+
];
424+
}
414425
}
415426

416427
publicfunctiontestConfigureSchema()
@@ -483,7 +494,7 @@ public function testFindAllSqlGenerated(AbstractPlatform $platform, string $expe
483494
publicfunctionprovideFindAllSqlGeneratedByPlatform():iterable
484495
{
485496
yield'MySQL' => [
486-
newMySQL57Platform(),
497+
class_exists(MySQLPlatform::class) ?newMySQLPlatform() :newMySQL57Platform(),
487498
'SELECT m.* FROM messenger_messages m WHERE (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) AND (m.queue_name = ?) LIMIT 50',
488499
];
489500

@@ -495,13 +506,22 @@ public function provideFindAllSqlGeneratedByPlatform(): iterable
495506
}
496507

497508
yield'SQL Server' => [
498-
newSQLServer2012Platform(),
509+
class_exists(SQLServerPlatform::class) ?newSQLServerPlatform() :newSQLServer2012Platform(),
499510
'SELECT m.* FROM messenger_messages m WHERE (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) AND (m.queue_name = ?) ORDER BY (SELECT 0) OFFSET 0 ROWS FETCH NEXT 50 ROWS ONLY',
500511
];
501512

502-
yield'Oracle' => [
503-
newOraclePlatform(),
504-
'SELECT a.* FROM (SELECT m.id AS "id", m.body AS "body", m.headers AS "headers", m.queue_name AS "queue_name", m.created_at AS "created_at", m.available_at AS "available_at", m.delivered_at AS "delivered_at" FROM messenger_messages m WHERE (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) AND (m.queue_name = ?)) a WHERE ROWNUM <= 50',
505-
];
513+
if (!class_exists(MySQL57Platform::class)) {
514+
// DBAL >= 4
515+
yield'Oracle' => [
516+
newOraclePlatform(),
517+
'SELECT m.id AS "id", m.body AS "body", m.headers AS "headers", m.queue_name AS "queue_name", m.created_at AS "created_at", m.available_at AS "available_at", m.delivered_at AS "delivered_at" FROM messenger_messages m WHERE (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) AND (m.queue_name = ?) FETCH NEXT 50 ROWS ONLY',
518+
];
519+
}else {
520+
// DBAL < 4
521+
yield'Oracle' => [
522+
newOraclePlatform(),
523+
'SELECT a.* FROM (SELECT m.id AS "id", m.body AS "body", m.headers AS "headers", m.queue_name AS "queue_name", m.created_at AS "created_at", m.available_at AS "available_at", m.delivered_at AS "delivered_at" FROM messenger_messages m WHERE (m.delivered_at is null OR m.delivered_at < ?) AND (m.available_at <= ?) AND (m.queue_name = ?)) a WHERE ROWNUM <= 50',
524+
];
525+
}
506526
}
507527
}

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportFactoryTest.php‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ public function testCreateTransport()
4646
$schemaConfig =$this->createMock(SchemaConfig::class);
4747
$platform =$this->createMock(AbstractPlatform::class);
4848
$schemaManager->method('createSchemaConfig')->willReturn($schemaConfig);
49-
$driverConnection->method('getSchemaManager')->willReturn($schemaManager);
49+
$driverConnection->method(
50+
method_exists(\Doctrine\DBAL\Connection::class,'createSchemaManager')
51+
?'createSchemaManager'
52+
:'getSchemaManager'
53+
)->willReturn($schemaManager);
5054
$driverConnection->method('getDatabasePlatform')->willReturn($platform);
5155
$registry =$this->createMock(ConnectionRegistry::class);
5256

@@ -70,7 +74,11 @@ public function testCreateTransportNotifyWithPostgreSQLPlatform()
7074
$schemaConfig =$this->createMock(SchemaConfig::class);
7175
$platform =$this->createMock(PostgreSQLPlatform::class);
7276
$schemaManager->method('createSchemaConfig')->willReturn($schemaConfig);
73-
$driverConnection->method('getSchemaManager')->willReturn($schemaManager);
77+
$driverConnection->method(
78+
method_exists(\Doctrine\DBAL\Connection::class,'createSchemaManager')
79+
?'createSchemaManager'
80+
:'getSchemaManager'
81+
)->willReturn($schemaManager);
7482
$driverConnection->method('getDatabasePlatform')->willReturn($platform);
7583
$registry =$this->createMock(ConnectionRegistry::class);
7684

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,8 @@ public function get(): ?array
177177

178178
// Append pessimistic write lock to FROM clause if db platform supports it
179179
$sql =$query->getSQL();
180-
if (($fromPart =$query->getQueryPart('from')) &&
181-
($table =$fromPart[0]['table'] ??null) &&
182-
($alias =$fromPart[0]['alias'] ??null)
183-
) {
184-
$fromClause =sprintf('%s %s',$table,$alias);
180+
if (preg_match('/FROM (.+) WHERE/',$sql,$matches)) {
181+
$fromClause =$matches[1];
185182
$sql =str_replace(
186183
sprintf('FROM %s WHERE',$fromClause),
187184
sprintf('FROM %s WHERE',$this->driverConnection->getDatabasePlatform()->appendLockHint($fromClause, LockMode::PESSIMISTIC_WRITE)),
@@ -382,7 +379,7 @@ private function createQueryBuilder(string $alias = 'm'): QueryBuilder
382379
));
383380
}
384381

385-
privatefunctionexecuteQuery(string$sql,array$parameters = [],array$types = [])
382+
privatefunctionexecuteQuery(string$sql,array$parameters = [],array$types = []):Result
386383
{
387384
try {
388385
$stmt =$this->driverConnection->executeQuery($sql,$parameters,$types);

‎src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/service-contracts":"^1.1|^2|^3"
2222
},
2323
"require-dev": {
24-
"doctrine/dbal":"^2.13|^3.0",
24+
"doctrine/dbal":"^2.13|^3|^4",
2525
"doctrine/persistence":"^1.3|^2|^3",
2626
"symfony/property-access":"^4.4|^5.0|^6.0",
2727
"symfony/serializer":"^4.4|^5.0|^6.0"

0 commit comments

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