Commit a856d58f authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge branch 'master' into Modularisation_Contrat_FJ

parents 2df89819 2b9c650f

CHANGELOG.md

+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,12 @@ 
* Taux HETD personnalisables





# OSE 20.2 (à venir)



## Corrections de bugs



* Les motifs de modification de service dû supprimés ne peuvent plus être sélectionnés #50328

* Messages d'erreur corrigés lors de l'exécution du script de migration de la V20.



# OSE 20.1 (04/04/2023)

admin/migration/v20Contrats.php

+6 −1
Original line number Diff line number Diff line
@@ -28,7 +28,12 @@ class v20Contrats extends AbstractMigration 


        $c->begin("Convertion des contrats de travail en états de sortie");



        $modeles = $bdd->select("SELECT * FROM modele_contrat");

        $this->manager->sauvegarderTable('MODELE_CONTRAT', 'SAVE_MODELE_CONTRAT');

        // On supprime l'ancienne table afin de ne jamais recommencer la migration, puis on travaille sur la sauvegarde



        $bdd->table()->drop('MODELE_CONTRAT');



        $modeles = $bdd->select("SELECT * FROM SAVE_MODELE_CONTRAT");



        $etatsSortie = [];

        $statuts     = [];

admin/migration/v20Divers.php

+13 −2
Original line number Diff line number Diff line
@@ -28,8 +28,19 @@ class v20Divers extends AbstractMigration 


        $c->begin("Préparation de la migration vers la version 20");



        $bdd->exec("ALTER TABLE TYPE_INTERVENTION DROP CONSTRAINT TYPE_INTERVENTION_CODE_UN");

        $bdd->exec("DROP INDEX TYPE_INTERVENTION_CODE_UN");

        if ($bdd->uniqueConstraint()->exists('TYPE_INTERVENTION_CODE_UN')) {

            $bdd->uniqueConstraint()->drop('TYPE_INTERVENTION_CODE_UN');

        }

        if ($bdd->index()->exists('TYPE_INTERVENTION_CODE_UN')){

            $bdd->index()->drop('TYPE_INTERVENTION_CODE_UN');

        }



        if ($bdd->uniqueConstraint()->exists('TI_STATUT_STATUT_UN')) {

            $bdd->uniqueConstraint()->drop('TI_STATUT_STATUT_UN');

        }

        if ($bdd->index()->exists('TI_STATUT_STATUT_UN')){

            $bdd->index()->drop('TI_STATUT_STATUT_UN');

        }



        $oseAppliId = $this->manager->getOseAdmin()->getOseAppliId();

        $bdd->exec("UPDATE TYPE_INTERVENTION_STATUT SET HISTO_CREATEUR_ID = $oseAppliId WHERE HISTO_CREATEUR_ID IS NULL");

admin/src/BddAdmin/Driver/Oracle/AbstractManagerDdlConstraint.php

+1 −4
Original line number Diff line number Diff line
@@ -13,10 +13,7 @@ abstract class AbstractManagerDdlConstraint extends AbstractManager 


    protected function indexExists($indexName)

    {

        $sql = "SELECT count(*) RES FROM ALL_INDEXES WHERE INDEX_NAME = :indexName AND ROWNUM = 1";

        $res = $this->bdd->select($sql, compact('indexName'), ['fetch' => Bdd::FETCH_ONE]);



        return $res['RES'] == '1';

        return $this->bdd->index()->exists($indexName);

    }

admin/src/BddAdmin/Driver/Oracle/IndexManager.php

+13 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace BddAdmin\Driver\Oracle;



use BddAdmin\Bdd;

use BddAdmin\Manager\AbstractManager;

use BddAdmin\Manager\IndexManagerInterface;

use BddAdmin\Ddl\DdlFilter;
@@ -75,6 +76,18 @@ class IndexManager extends AbstractManager implements IndexManagerInterface 






    public function exists(string $name): bool

    {

        $sql = "SELECT count(*) NBR FROM all_indexes WHERE index_name = :name";

        $params = ['name' => $name];



        $nbr = (int)$this->bdd->select($sql, $params, ['fetch' => Bdd::FETCH_ONE])['NBR'];



        return $nbr > 0;

    }







    protected function makeCreate(array $data)

    {

        $sql = "CREATE ";