Loading config/module.config.php +2 −0 Changes for config/module.config.php: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -21,6 +21,8 @@ return [ 'dir' => 'data/ddl', 'columns_positions_file' => 'data/ddl_columns_pos.php', 'filters' => [], 'update-bdd-filters' => [], 'update-ddl-filters' => [], ], 'data' => [ Loading src/Bdd.php +41 −4 Changes for src/Bdd.php: 41 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -498,12 +498,50 @@ class Bdd public function getFiltersForUpdateBdd(Ddl $ddl): DdlFilters { $filters = new DdlFilters(); $filters->addArray($ddl->getOption(Ddl::OPTION_FILTERS)); $filters->addArray($ddl->getOption(Ddl::OPTION_UPDATE_BDD_FILTERS)); $filters->setExplicit(true); // On ajouter toute la DDL qu'on donne en référence $filters->addDdl($ddl); // On ajoute toutes les dépendances des tables qu'on a inclu dans la DDL au cas où elles ne seraient pas listées $filters->addTablesDeps($this); return $filters; } public function getFiltersForUpdateDdl(): DdlFilters { $filters = new DdlFilters(); $filters->addArray($this->getOption(self::OPTION_DDL.'/'.Ddl::OPTION_FILTERS)); $filters->addArray($this->getOption(self::OPTION_DDL.'/'.Ddl::OPTION_UPDATE_DDL_FILTERS)); return $filters; } public function getNewDdl(): Ddl { $ddl = new Ddl(); $ddl->setOptions($this->getOption(self::OPTION_DDL, [])); return $ddl; } public function getDdl(DdlFilters|array $filters = []): Ddl { $this->logBegin("Récupération de la DDL"); $filters = DdlFilters::normalize($filters); $ddl = new Ddl(); $ddl->setOptions($this->getOption(self::OPTION_DDL, [])); $ddl = $this->getNewDdl(); $managers = $this->managerList(); foreach ($managers as $type => $libelle) { if (!($filters->isExplicit() && $filters->get($type)->isEmpty())) { Loading @@ -523,8 +561,7 @@ class Bdd public function getRefDdl(): Ddl { $ddl = new Ddl(); $ddl->setOptions($this->getOption(self::OPTION_DDL, [])); $ddl = $this->getNewDdl(); $ddl->loadFromDir(); return $ddl; Loading src/Command/InstallBddCommand.php +3 −3 Changes for src/Command/InstallBddCommand.php: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -26,10 +26,10 @@ class InstallBddCommand extends Command $io->title('Installation de la base de données'); // Mise ne place des objets // Mise en place des objets try { $ref = $bdd->getRefDdl(); $bdd->create($ref); $ddl = $bdd->getRefDdl(); $bdd->create($ddl); $io->success('Objets en place'); } catch (\Throwable $e) { $io->error($e->getMessage()); Loading src/Command/UpdateBddCommand.php +5 −28 Changes for src/Command/UpdateBddCommand.php: 5 added lines, 28 removed lines. Original line number Diff line number Diff line Loading @@ -26,39 +26,16 @@ class UpdateBddCommand extends Command $io->title('Mise à jour de la base de données'); $ref = $bdd->getRefDdl(); // Construction de la config de DDL pour filtrer $filters = []; foreach ($ref as $ddlClass => $objects) { foreach ($objects as $object => $objectDdl) { $filters[$ddlClass]['includes'][] = $object; } } $tablesDep = [ Ddl::INDEX, Ddl::PRIMARY_CONSTRAINT, Ddl::REF_CONSTRAINT, Ddl::UNIQUE_CONSTRAINT, ]; foreach ($tablesDep as $tableDep) { $objects = $bdd->manager($tableDep)->get(); foreach ($objects as $obj) { if (in_array($obj['table'], $filters['table']['includes'])) { $filters[$tableDep]['includes'][] = $obj['name']; } } } $ddl = $bdd->getRefDdl(); $filters = $bdd->getFiltersForUpdateBdd($ddl); // Initialisation et lancement de la pré-migration //$mm = new MigrationManager($oa, $ref, $filters); //$mm = new MigrationManager($oa, $ddl, $filters); //$mm->migration('before'); try { $bdd->alter($ref, $filters, true); $bdd->alter($ddl, $filters, true); $io->success('Objets à jour'); } catch (\Throwable $e) { $io->error($e->getMessage()); Loading @@ -66,7 +43,7 @@ class UpdateBddCommand extends Command // Mise à jour des séquences $bdd->majSequences($ref); $bdd->majSequences($ddl); // Mise à jour des données Loading src/Command/UpdateDdlCommand.php +1 −3 Changes for src/Command/UpdateDdlCommand.php: 1 added line, 3 removed lines. Original line number Diff line number Diff line Loading @@ -22,12 +22,10 @@ class UpdateDdlCommand extends Command $io = new SymfonyStyle($input, $output); $bdd = $this->getBdd()->setLogger($io); $filters = [ ]; $io->title('Génération de la DDL à partir de la base de données'); try { $filters = $bdd->getFiltersForUpdateDdl(); $ddl = $bdd->getDdl($filters); $ddl->saveToDir(); $io->success('DDL mise à jour'); Loading Loading
config/module.config.php +2 −0 Changes for config/module.config.php: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -21,6 +21,8 @@ return [ 'dir' => 'data/ddl', 'columns_positions_file' => 'data/ddl_columns_pos.php', 'filters' => [], 'update-bdd-filters' => [], 'update-ddl-filters' => [], ], 'data' => [ Loading
src/Bdd.php +41 −4 Changes for src/Bdd.php: 41 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -498,12 +498,50 @@ class Bdd public function getFiltersForUpdateBdd(Ddl $ddl): DdlFilters { $filters = new DdlFilters(); $filters->addArray($ddl->getOption(Ddl::OPTION_FILTERS)); $filters->addArray($ddl->getOption(Ddl::OPTION_UPDATE_BDD_FILTERS)); $filters->setExplicit(true); // On ajouter toute la DDL qu'on donne en référence $filters->addDdl($ddl); // On ajoute toutes les dépendances des tables qu'on a inclu dans la DDL au cas où elles ne seraient pas listées $filters->addTablesDeps($this); return $filters; } public function getFiltersForUpdateDdl(): DdlFilters { $filters = new DdlFilters(); $filters->addArray($this->getOption(self::OPTION_DDL.'/'.Ddl::OPTION_FILTERS)); $filters->addArray($this->getOption(self::OPTION_DDL.'/'.Ddl::OPTION_UPDATE_DDL_FILTERS)); return $filters; } public function getNewDdl(): Ddl { $ddl = new Ddl(); $ddl->setOptions($this->getOption(self::OPTION_DDL, [])); return $ddl; } public function getDdl(DdlFilters|array $filters = []): Ddl { $this->logBegin("Récupération de la DDL"); $filters = DdlFilters::normalize($filters); $ddl = new Ddl(); $ddl->setOptions($this->getOption(self::OPTION_DDL, [])); $ddl = $this->getNewDdl(); $managers = $this->managerList(); foreach ($managers as $type => $libelle) { if (!($filters->isExplicit() && $filters->get($type)->isEmpty())) { Loading @@ -523,8 +561,7 @@ class Bdd public function getRefDdl(): Ddl { $ddl = new Ddl(); $ddl->setOptions($this->getOption(self::OPTION_DDL, [])); $ddl = $this->getNewDdl(); $ddl->loadFromDir(); return $ddl; Loading
src/Command/InstallBddCommand.php +3 −3 Changes for src/Command/InstallBddCommand.php: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -26,10 +26,10 @@ class InstallBddCommand extends Command $io->title('Installation de la base de données'); // Mise ne place des objets // Mise en place des objets try { $ref = $bdd->getRefDdl(); $bdd->create($ref); $ddl = $bdd->getRefDdl(); $bdd->create($ddl); $io->success('Objets en place'); } catch (\Throwable $e) { $io->error($e->getMessage()); Loading
src/Command/UpdateBddCommand.php +5 −28 Changes for src/Command/UpdateBddCommand.php: 5 added lines, 28 removed lines. Original line number Diff line number Diff line Loading @@ -26,39 +26,16 @@ class UpdateBddCommand extends Command $io->title('Mise à jour de la base de données'); $ref = $bdd->getRefDdl(); // Construction de la config de DDL pour filtrer $filters = []; foreach ($ref as $ddlClass => $objects) { foreach ($objects as $object => $objectDdl) { $filters[$ddlClass]['includes'][] = $object; } } $tablesDep = [ Ddl::INDEX, Ddl::PRIMARY_CONSTRAINT, Ddl::REF_CONSTRAINT, Ddl::UNIQUE_CONSTRAINT, ]; foreach ($tablesDep as $tableDep) { $objects = $bdd->manager($tableDep)->get(); foreach ($objects as $obj) { if (in_array($obj['table'], $filters['table']['includes'])) { $filters[$tableDep]['includes'][] = $obj['name']; } } } $ddl = $bdd->getRefDdl(); $filters = $bdd->getFiltersForUpdateBdd($ddl); // Initialisation et lancement de la pré-migration //$mm = new MigrationManager($oa, $ref, $filters); //$mm = new MigrationManager($oa, $ddl, $filters); //$mm->migration('before'); try { $bdd->alter($ref, $filters, true); $bdd->alter($ddl, $filters, true); $io->success('Objets à jour'); } catch (\Throwable $e) { $io->error($e->getMessage()); Loading @@ -66,7 +43,7 @@ class UpdateBddCommand extends Command // Mise à jour des séquences $bdd->majSequences($ref); $bdd->majSequences($ddl); // Mise à jour des données Loading
src/Command/UpdateDdlCommand.php +1 −3 Changes for src/Command/UpdateDdlCommand.php: 1 added line, 3 removed lines. Original line number Diff line number Diff line Loading @@ -22,12 +22,10 @@ class UpdateDdlCommand extends Command $io = new SymfonyStyle($input, $output); $bdd = $this->getBdd()->setLogger($io); $filters = [ ]; $io->title('Génération de la DDL à partir de la base de données'); try { $filters = $bdd->getFiltersForUpdateDdl(); $ddl = $bdd->getDdl($filters); $ddl->saveToDir(); $io->success('DDL mise à jour'); Loading