From d385303a526607814a4c879f3291d09ae7ba5574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Thu, 8 Jan 2026 21:03:38 +0100 Subject: [PATCH 1/4] Made DBMigrationCommand take a DB url so we do not need a special doctrine config --- config/packages/doctrine.yaml | 91 ++++++++++--------- config/reference.php | 5 +- src/Command/Migrations/DBMigrationCommand.php | 33 +++++-- 3 files changed, 79 insertions(+), 50 deletions(-) diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index 2952e516..5261c295 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -1,56 +1,61 @@ doctrine: dbal: - # 1. GLOBAL SETTINGS (Apply to all connections) + url: '%env(resolve:DATABASE_URL)%' + + # Required for DAMA doctrine test bundle + use_savepoints: true + + # IMPORTANT: You MUST configure your server version, + # either here or in the DATABASE_URL env var (see .env file) + types: - datetime: App\Doctrine\Types\UTCDateTimeType - date: App\Doctrine\Types\UTCDateTimeType - datetime_immutable: App\Doctrine\Types\UTCDateTimeImmutableType - date_immutable: App\Doctrine\Types\UTCDateTimeImmutableType - big_decimal: App\Doctrine\Types\BigDecimalType - tinyint: App\Doctrine\Types\TinyIntType + # UTC datetimes + datetime: + class: App\Doctrine\Types\UTCDateTimeType + date: + class: App\Doctrine\Types\UTCDateTimeType - connections: - default: - use_savepoints: true - schema_filter: ~^(?!internal)~ - url: '%env(resolve:DATABASE_URL)%' + datetime_immutable: + class: App\Doctrine\Types\UTCDateTimeImmutableType + date_immutable: + class: App\Doctrine\Types\UTCDateTimeImmutableType - migration_source: - use_savepoints: true - schema_filter: ~^(?!internal)~ - url: '%env(resolve:DB_MIGRATION_SOURCE)%' + big_decimal: + class: App\Doctrine\Types\BigDecimalType + tinyint: + class: App\Doctrine\Types\TinyIntType + + schema_filter: ~^(?!internal)~ + # Only enable this when needed + profiling_collect_backtrace: false orm: auto_generate_proxy_classes: true enable_lazy_ghost_objects: true + report_fields_where_declared: true + validate_xml_mapping: true + naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware + identity_generation_preferences: + Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity + auto_mapping: true + controller_resolver: + auto_mapping: true + mappings: + App: + type: attribute + is_bundle: false + dir: '%kernel.project_dir%/src/Entity' + prefix: 'App\Entity' + alias: App - entity_managers: - default: &common_orm_settings - report_fields_where_declared: true - validate_xml_mapping: true - naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware - identity_generation_preferences: - Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity - mappings: - App: - type: attribute - is_bundle: false - dir: '%kernel.project_dir%/src/Entity' - prefix: 'App\Entity' - alias: App - dql: - string_functions: - regexp: App\Doctrine\Functions\Regexp - field: DoctrineExtensions\Query\Mysql\Field - field2: App\Doctrine\Functions\Field2 - natsort: App\Doctrine\Functions\Natsort - array_position: App\Doctrine\Functions\ArrayPosition - ilike: App\Doctrine\Functions\ILike - connection: default - - migration_source: - <<: *common_orm_settings - connection: migration_source + dql: + string_functions: + regexp: App\Doctrine\Functions\Regexp + field: DoctrineExtensions\Query\Mysql\Field + field2: App\Doctrine\Functions\Field2 + natsort: App\Doctrine\Functions\Natsort + array_position: App\Doctrine\Functions\ArrayPosition + ilike: App\Doctrine\Functions\ILike when@test: doctrine: diff --git a/config/reference.php b/config/reference.php index 3ed46fd1..756dc446 100644 --- a/config/reference.php +++ b/config/reference.php @@ -1622,6 +1622,7 @@ use Symfony\Component\Config\Loader\ParamConfigurator as Param; * flysystem?: array{ * filesystem_service: scalar|null|Param, * }, + * asset_mapper?: array, * chain?: array{ * loaders: list, * }, @@ -2301,11 +2302,13 @@ use Symfony\Component\Config\Loader\ParamConfigurator as Param; * controllers_json?: scalar|null|Param, // Default: "%kernel.project_dir%/assets/controllers.json" * } * @psalm-type UxTranslatorConfig = array{ - * dump_directory?: scalar|null|Param, // Default: "%kernel.project_dir%/var/translations" + * dump_directory?: scalar|null|Param, // The directory where translations and TypeScript types are dumped. // Default: "%kernel.project_dir%/var/translations" + * dump_typescript?: bool|Param, // Control whether TypeScript types are dumped alongside translations. Disable this if you do not use TypeScript (e.g. in production when using AssetMapper). // Default: true * domains?: string|array{ // List of domains to include/exclude from the generated translations. Prefix with a `!` to exclude a domain. * type?: scalar|null|Param, * elements?: list, * }, + * keys_patterns?: list, * } * @psalm-type DompdfFontLoaderConfig = array{ * autodiscovery?: bool|array{ diff --git a/src/Command/Migrations/DBMigrationCommand.php b/src/Command/Migrations/DBMigrationCommand.php index 0c58e6b9..812d1c36 100644 --- a/src/Command/Migrations/DBMigrationCommand.php +++ b/src/Command/Migrations/DBMigrationCommand.php @@ -26,8 +26,11 @@ namespace App\Command\Migrations; use App\DataTables\Helpers\ColumnSortHelper; use App\Entity\Parts\Manufacturer; use App\Services\ImportExportSystem\PartKeeprImporter\PKImportHelper; +use Doctrine\Bundle\DoctrineBundle\ConnectionFactory; use Doctrine\DBAL\Platforms\AbstractMySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; +use Doctrine\DBAL\Tools\DsnParser; +use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Id\AssignedGenerator; @@ -36,6 +39,7 @@ use Doctrine\Persistence\ManagerRegistry; use Doctrine\Persistence\ObjectManager; use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; @@ -43,23 +47,40 @@ use Symfony\Component\Console\Style\SymfonyStyle; #[AsCommand('partdb:migrate-db', 'Migrate the database to a different platform')] class DBMigrationCommand extends Command { - private readonly EntityManagerInterface $sourceEM; - private readonly EntityManagerInterface $targetEM; + private ?EntityManagerInterface $sourceEM = null; - public function __construct(private readonly ManagerRegistry $managerRegistry, + public function __construct( + private readonly EntityManagerInterface $targetEM, private readonly PKImportHelper $importHelper, ) { - $this->sourceEM = $this->managerRegistry->getManager('migration_source'); - $this->targetEM = $this->managerRegistry->getManager('default'); - parent::__construct(); } + public function configure(): void + { + $this-> + addArgument('url', InputArgument::REQUIRED, 'The database connection URL of the source database to migrate from'); + } + + /** + * Construct a source EntityManager based on the given connection URL + * @param string $url + * @return EntityManagerInterface + */ + private function getSourceEm(string $url): EntityManagerInterface + { + $connectionFactory = new ConnectionFactory(); + $connection = $connectionFactory->createConnection(['url' => $url]); + return new EntityManager($connection, $this->targetEM->getConfiguration()); + } + public function execute(InputInterface $input, OutputInterface $output): int { $io = new SymfonyStyle($input, $output); + $this->sourceEM = $this->getSourceEm($input->getArgument('url')); + // Example migration logic (to be replaced with actual migration code) $io->info('Starting database migration...'); From 343ad6beff4cfa492cb5941b0bbba856525ba903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Thu, 8 Jan 2026 22:16:38 +0100 Subject: [PATCH 2/4] Check that databases are up to date --- ...mmand.php => DBPlatformConvertCommand.php} | 85 +++++++++++-------- 1 file changed, 50 insertions(+), 35 deletions(-) rename src/Command/Migrations/{DBMigrationCommand.php => DBPlatformConvertCommand.php} (70%) diff --git a/src/Command/Migrations/DBMigrationCommand.php b/src/Command/Migrations/DBPlatformConvertCommand.php similarity index 70% rename from src/Command/Migrations/DBMigrationCommand.php rename to src/Command/Migrations/DBPlatformConvertCommand.php index 812d1c36..61a34c31 100644 --- a/src/Command/Migrations/DBMigrationCommand.php +++ b/src/Command/Migrations/DBPlatformConvertCommand.php @@ -23,20 +23,17 @@ declare(strict_types=1); namespace App\Command\Migrations; -use App\DataTables\Helpers\ColumnSortHelper; -use App\Entity\Parts\Manufacturer; use App\Services\ImportExportSystem\PartKeeprImporter\PKImportHelper; use Doctrine\Bundle\DoctrineBundle\ConnectionFactory; use Doctrine\DBAL\Platforms\AbstractMySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; -use Doctrine\DBAL\Tools\DsnParser; +use Doctrine\Migrations\Configuration\EntityManager\ExistingEntityManager; +use Doctrine\Migrations\Configuration\Migration\ExistingConfiguration; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; - +use Doctrine\Migrations\DependencyFactory; use Doctrine\ORM\Id\AssignedGenerator; use Doctrine\ORM\Mapping\ClassMetadata; -use Doctrine\Persistence\ManagerRegistry; -use Doctrine\Persistence\ObjectManager; use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; @@ -44,14 +41,14 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; -#[AsCommand('partdb:migrate-db', 'Migrate the database to a different platform')] -class DBMigrationCommand extends Command +#[AsCommand('partdb:migrations:convert-db-platform', 'Convert the database to a different platform')] +class DBPlatformConvertCommand extends Command { - private ?EntityManagerInterface $sourceEM = null; public function __construct( private readonly EntityManagerInterface $targetEM, private readonly PKImportHelper $importHelper, + private readonly DependencyFactory $dependencyFactory, ) { parent::__construct(); @@ -60,26 +57,23 @@ class DBMigrationCommand extends Command public function configure(): void { $this-> - addArgument('url', InputArgument::REQUIRED, 'The database connection URL of the source database to migrate from'); - } - - /** - * Construct a source EntityManager based on the given connection URL - * @param string $url - * @return EntityManagerInterface - */ - private function getSourceEm(string $url): EntityManagerInterface - { - $connectionFactory = new ConnectionFactory(); - $connection = $connectionFactory->createConnection(['url' => $url]); - return new EntityManager($connection, $this->targetEM->getConfiguration()); + addArgument('url', InputArgument::REQUIRED, 'The database connection URL of the source database to migrate from'); } public function execute(InputInterface $input, OutputInterface $output): int { $io = new SymfonyStyle($input, $output); - $this->sourceEM = $this->getSourceEm($input->getArgument('url')); + $sourceEM = $this->getSourceEm($input->getArgument('url')); + + //Check that both databases are not using the same driver + if ($sourceEM->getConnection()->getDatabasePlatform()::class === $this->targetEM->getConnection()->getDatabasePlatform()::class) { + $io->error('Source and target database are using the same database platform / driver. This command is only intended to migrate between different database platforms (e.g. from MySQL to PostgreSQL).'); + return 1; + } + + + $this->ensureVersionUpToDate($sourceEM); // Example migration logic (to be replaced with actual migration code) $io->info('Starting database migration...'); @@ -115,7 +109,7 @@ class DBMigrationCommand extends Command $io->progressStart(count($metadata)); - //Afterwards we migrate all entities + //Afterward we migrate all entities foreach ($metadata as $metadatum) { //skip all superclasses if ($metadatum->isMappedSuperclass) { @@ -126,7 +120,7 @@ class DBMigrationCommand extends Command $io->note('Migrating entity: ' . $entityClass); - $repo = $this->sourceEM->getRepository($entityClass); + $repo = $sourceEM->getRepository($entityClass); $items = $repo->findAll(); foreach ($items as $index => $item) { $this->targetEM->persist($item); @@ -136,20 +130,12 @@ class DBMigrationCommand extends Command $io->progressFinish(); - //Migrate all manufacturers from source to target - /*$manufacturerRepo = $this->sourceEM->getRepository(Manufacturer::class); - $manufacturers = $manufacturerRepo->findAll(); - foreach ($manufacturers as $manufacturer) { - $this->targetEM->persist($manufacturer); - } - $this->targetEM->flush(); - */ //Fix sequences / auto increment values on target database $io->info('Fixing sequences / auto increment values on target database...'); $this->fixAutoIncrements($this->targetEM); - $output->writeln('Database migration completed successfully.'); + $io->success('Database migration completed successfully.'); if ($io->isVerbose()) { $io->info('Process took peak memory: ' . round(memory_get_peak_usage(true) / 1024 / 1024, 2) . ' MB'); @@ -158,6 +144,35 @@ class DBMigrationCommand extends Command return Command::SUCCESS; } + /** + * Construct a source EntityManager based on the given connection URL + * @param string $url + * @return EntityManagerInterface + */ + private function getSourceEm(string $url): EntityManagerInterface + { + $connectionFactory = new ConnectionFactory(); + $connection = $connectionFactory->createConnection(['url' => $url]); + return new EntityManager($connection, $this->targetEM->getConfiguration()); + } + + private function ensureVersionUpToDate(EntityManagerInterface $sourceEM): void + { + //Ensure that target database is up to date + $migrationStatusCalculator = $this->dependencyFactory->getMigrationStatusCalculator(); + $newMigrations = $migrationStatusCalculator->getNewMigrations(); + if (count($newMigrations->getItems()) > 0) { + throw new \RuntimeException("Target database is not up to date. Please run all migrations (with doctrine:migrations:migrate) before starting the migration process."); + } + + $sourceDependencyLoader = DependencyFactory::fromEntityManager(new ExistingConfiguration($this->dependencyFactory->getConfiguration()), new ExistingEntityManager($sourceEM)); + $sourceMigrationStatusCalculator = $sourceDependencyLoader->getMigrationStatusCalculator(); + $sourceNewMigrations = $sourceMigrationStatusCalculator->getNewMigrations(); + if (count($sourceNewMigrations->getItems()) > 0) { + throw new \RuntimeException("Source database is not up to date. Please run all migrations (with doctrine:migrations:migrate) on the source database before starting the migration process."); + } + } + private function fixAutoIncrements(EntityManagerInterface $em): void { $connection = $em->getConnection(); @@ -165,7 +180,7 @@ class DBMigrationCommand extends Command if ($platform instanceof PostgreSQLPlatform) { $connection->executeStatement( - //From: https://wiki.postgresql.org/wiki/Fixing_Sequences + //From: https://wiki.postgresql.org/wiki/Fixing_Sequences << Date: Thu, 8 Jan 2026 22:22:07 +0100 Subject: [PATCH 3/4] Support %kernel.project_dir% in db conversion tool --- .../Migrations/DBPlatformConvertCommand.php | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/Command/Migrations/DBPlatformConvertCommand.php b/src/Command/Migrations/DBPlatformConvertCommand.php index 61a34c31..91172920 100644 --- a/src/Command/Migrations/DBPlatformConvertCommand.php +++ b/src/Command/Migrations/DBPlatformConvertCommand.php @@ -40,6 +40,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; +use Symfony\Component\DependencyInjection\Attribute\Autowire; #[AsCommand('partdb:migrations:convert-db-platform', 'Convert the database to a different platform')] class DBPlatformConvertCommand extends Command @@ -49,6 +50,8 @@ class DBPlatformConvertCommand extends Command private readonly EntityManagerInterface $targetEM, private readonly PKImportHelper $importHelper, private readonly DependencyFactory $dependencyFactory, + #[Autowire('%kernel.project_dir%')] + private readonly string $kernelProjectDir, ) { parent::__construct(); @@ -57,7 +60,7 @@ class DBPlatformConvertCommand extends Command public function configure(): void { $this-> - addArgument('url', InputArgument::REQUIRED, 'The database connection URL of the source database to migrate from'); + addArgument('url', InputArgument::REQUIRED, 'The database connection URL of the source database to migrate from'); } public function execute(InputInterface $input, OutputInterface $output): int @@ -75,6 +78,19 @@ class DBPlatformConvertCommand extends Command $this->ensureVersionUpToDate($sourceEM); + $io->note('This command is still in development. If you encounter any problems, please report them to the issue tracker on GitHub.'); + $io->warning(sprintf('This command will delete all existing data in the target database "%s". Make sure that you have no important data in the database before you continue!', + $this->targetEM->getConnection()->getDatabase() ?? 'unknown' + )); + + $io->ask('Please type "DELETE ALL DATA" to continue.', '', function ($answer) { + if (strtoupper($answer) !== 'DELETE ALL DATA') { + throw new \RuntimeException('You did not type "DELETE ALL DATA"!'); + } + return $answer; + }); + + // Example migration logic (to be replaced with actual migration code) $io->info('Starting database migration...'); @@ -151,6 +167,9 @@ class DBPlatformConvertCommand extends Command */ private function getSourceEm(string $url): EntityManagerInterface { + //Replace any %kernel.project_dir% placeholders + $url = str_replace('%kernel.project_dir%', $this->kernelProjectDir, $url); + $connectionFactory = new ConnectionFactory(); $connection = $connectionFactory->createConnection(['url' => $url]); return new EntityManager($connection, $this->targetEM->getConfiguration()); From ddbfc87ce16c86977c0355d99cf5f7aca1726baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Thu, 8 Jan 2026 22:22:47 +0100 Subject: [PATCH 4/4] Set help for DBPlatformConvertCommand --- src/Command/Migrations/DBPlatformConvertCommand.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Command/Migrations/DBPlatformConvertCommand.php b/src/Command/Migrations/DBPlatformConvertCommand.php index 91172920..80dc332e 100644 --- a/src/Command/Migrations/DBPlatformConvertCommand.php +++ b/src/Command/Migrations/DBPlatformConvertCommand.php @@ -59,8 +59,9 @@ class DBPlatformConvertCommand extends Command public function configure(): void { - $this-> - addArgument('url', InputArgument::REQUIRED, 'The database connection URL of the source database to migrate from'); + $this + ->setHelp('This command allows you to migrate the database from one database platform to another (e.g. from MySQL to PostgreSQL).') + ->addArgument('url', InputArgument::REQUIRED, 'The database connection URL of the source database to migrate from'); } public function execute(InputInterface $input, OutputInterface $output): int