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] 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...');