Skip to content

Commit 5a3fa90

Browse files
committed
Remove keywords lists
1 parent c221326 commit 5a3fa90

23 files changed

+0
-1789
lines changed

src/Driver/AbstractMySQLDriver.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use Doctrine\DBAL\Platforms\MariaDB1010Platform;
1313
use Doctrine\DBAL\Platforms\MariaDB1060Platform;
1414
use Doctrine\DBAL\Platforms\MariaDBPlatform;
15-
use Doctrine\DBAL\Platforms\MySQL84Platform;
1615
use Doctrine\DBAL\Platforms\MySQLPlatform;
1716
use Doctrine\DBAL\ServerVersionProvider;
1817

@@ -46,10 +45,6 @@ public function getDatabasePlatform(ServerVersionProvider $versionProvider): Abs
4645
return new MariaDBPlatform();
4746
}
4847

49-
if (version_compare($version, '8.4.0', '>=')) {
50-
return new MySQL84Platform();
51-
}
52-
5348
return new MySQLPlatform();
5449
}
5550

src/Platforms/AbstractMySQLPlatform.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
use Doctrine\DBAL\Connection;
88
use Doctrine\DBAL\Exception;
99
use Doctrine\DBAL\Exception\InvalidColumnType\ColumnValuesRequired;
10-
use Doctrine\DBAL\Platforms\Keywords\KeywordList;
11-
use Doctrine\DBAL\Platforms\Keywords\MySQLKeywords;
1210
use Doctrine\DBAL\Schema\AbstractAsset;
1311
use Doctrine\DBAL\Schema\ForeignKeyConstraint;
1412
use Doctrine\DBAL\Schema\Index;
@@ -756,11 +754,6 @@ protected function initializeDoctrineTypeMappings(): void
756754
];
757755
}
758756

759-
protected function createReservedKeywordsList(): KeywordList
760-
{
761-
return new MySQLKeywords();
762-
}
763-
764757
/**
765758
* {@inheritDoc}
766759
*

src/Platforms/AbstractPlatform.php

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Doctrine\DBAL\LockMode;
1717
use Doctrine\DBAL\Platforms\Exception\NoColumnsSpecifiedForTable;
1818
use Doctrine\DBAL\Platforms\Exception\NotSupported;
19-
use Doctrine\DBAL\Platforms\Keywords\KeywordList;
2019
use Doctrine\DBAL\Schema\AbstractSchemaManager;
2120
use Doctrine\DBAL\Schema\Column;
2221
use Doctrine\DBAL\Schema\ForeignKeyConstraint;
@@ -76,11 +75,6 @@ abstract class AbstractPlatform
7675
/** @var string[]|null */
7776
protected ?array $doctrineTypeMapping = null;
7877

79-
/**
80-
* Holds the KeywordList instance for the current platform.
81-
*/
82-
protected ?KeywordList $_keywords = null;
83-
8478
/**
8579
* Returns the SQL snippet that declares a boolean column.
8680
*
@@ -2162,20 +2156,6 @@ public function rollbackSavePoint(string $savepoint): string
21622156
return 'ROLLBACK TO SAVEPOINT ' . $savepoint;
21632157
}
21642158

2165-
/**
2166-
* Returns the keyword list instance of this platform.
2167-
*/
2168-
final public function getReservedKeywordsList(): KeywordList
2169-
{
2170-
// Store the instance so it doesn't need to be generated on every request.
2171-
return $this->_keywords ??= $this->createReservedKeywordsList();
2172-
}
2173-
2174-
/**
2175-
* Creates an instance of the reserved keyword list of this platform.
2176-
*/
2177-
abstract protected function createReservedKeywordsList(): KeywordList;
2178-
21792159
/**
21802160
* Quotes a literal string.
21812161
* This method is NOT meant to fix SQL injections!

src/Platforms/DB2Platform.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
use Doctrine\DBAL\Connection;
88
use Doctrine\DBAL\Platforms\Exception\NotSupported;
9-
use Doctrine\DBAL\Platforms\Keywords\DB2Keywords;
10-
use Doctrine\DBAL\Platforms\Keywords\KeywordList;
119
use Doctrine\DBAL\Schema\ColumnDiff;
1210
use Doctrine\DBAL\Schema\DB2SchemaManager;
1311
use Doctrine\DBAL\Schema\Identifier;
@@ -591,11 +589,6 @@ public function supportsSavepoints(): bool
591589
return false;
592590
}
593591

594-
protected function createReservedKeywordsList(): KeywordList
595-
{
596-
return new DB2Keywords();
597-
}
598-
599592
public function createSchemaManager(Connection $connection): DB2SchemaManager
600593
{
601594
return new DB2SchemaManager($connection, $this);

0 commit comments

Comments
 (0)