Commit aca5597e authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Suppression des références à l'application ou BDD "OSE".

parent be731651

src/UnicaenImport/Entity/Differentiel/Ligne.php

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ class Ligne 
    }



    /**

     * Retourne l'ID OSE de l'enregistrement

     * Retourne l'ID de l'enregistrement

     *

     * @return integer

     */

src/UnicaenImport/Service/DifferentielService.php

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ use UnicaenImport\Service\Traits\QueryGeneratorServiceAwareTrait; 




/**

 * Classe permettant de récupérer le différentiel entre une table source et une table OSE

 * Classe permettant de récupérer le différentiel entre une table source et une table de l'application.

 *

 * @author Laurent LÉCLUSE <laurent.lecluse at unicaen.fr>

 */

src/UnicaenImport/Service/QueryGeneratorService.php

+6 −6
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ class QueryGeneratorService extends AbstractService 


        // on génère ensuite la bonne requête !!!

        $cols = $this->getCols($tableName);

        $sql  = "CREATE OR REPLACE FORCE VIEW OSE.V_DIFF_$tableName AS

        $sql  = "CREATE OR REPLACE FORCE VIEW V_DIFF_$tableName AS

select diff.* from (SELECT

  COALESCE( D.id, S.id ) id,

  COALESCE( S.source_id, D.source_id ) source_id,
@@ -534,7 +534,7 @@ WHERE 


        CASE diff_row.import_action

          WHEN 'insert' THEN

            INSERT INTO OSE.$tableName

            INSERT INTO $tableName

              ( id, " . $this->formatColQuery($cols) . ", source_id, source_code, histo_createur_id, histo_modificateur_id )

            VALUES

              ( COALESCE(diff_row.id,$tableName" . "_ID_SEQ.NEXTVAL), " . $this->formatColQuery($cols, 'diff_row.:column') . ", diff_row.source_id, diff_row.source_code, get_current_user, get_current_user );
@@ -542,20 +542,20 @@ WHERE 
          WHEN 'update' THEN

            " . $this->formatColQuery(

                $cols,

                "IF (diff_row.u_:column = 1 AND IN_COLUMN_LIST(':column',IGNORE_UPD_COLS) = 0) THEN UPDATE OSE.$tableName SET :column = diff_row.:column WHERE ID = diff_row.id; END IF;"

                "IF (diff_row.u_:column = 1 AND IN_COLUMN_LIST(':column',IGNORE_UPD_COLS) = 0) THEN UPDATE $tableName SET :column = diff_row.:column WHERE ID = diff_row.id; END IF;"

                , "\n          "

            ) . "



          WHEN 'delete' THEN

            UPDATE OSE.$tableName SET histo_destruction = SYSDATE, histo_destructeur_id = get_current_user WHERE ID = diff_row.id;

            UPDATE $tableName SET histo_destruction = SYSDATE, histo_destructeur_id = get_current_user WHERE ID = diff_row.id;



          WHEN 'undelete' THEN

            " . $this->formatColQuery(

                $cols,

                "IF (diff_row.u_:column = 1 AND IN_COLUMN_LIST(':column',IGNORE_UPD_COLS) = 0) THEN UPDATE OSE.$tableName SET :column = diff_row.:column WHERE ID = diff_row.id; END IF;"

                "IF (diff_row.u_:column = 1 AND IN_COLUMN_LIST(':column',IGNORE_UPD_COLS) = 0) THEN UPDATE $tableName SET :column = diff_row.:column WHERE ID = diff_row.id; END IF;"

                , "\n          "

            ) . "

            UPDATE OSE.$tableName SET histo_destruction = NULL, histo_destructeur_id = NULL WHERE ID = diff_row.id;

            UPDATE $tableName SET histo_destruction = NULL, histo_destructeur_id = NULL WHERE ID = diff_row.id;



        END CASE;

src/UnicaenImport/View/Helper/DifferentielListe.php

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ class DifferentielListe extends AbstractHelper 
     * @return string

     */

    public function render(){

        $aucunEcart = 'Il n\'y a aucun écart entre les sources de données et OSE';

        $aucunEcart = "Il n'y a aucun écart entre les données sources et celles de l'application";

        if (empty($this->lignes)) return $aucunEcart;

        $out = '';

        foreach( $this->lignes as $ligne ){