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

[FIX] Ajouts de strtolower/strtoupper() faisant défaut.

parent 49fd082b

CHANGELOG.md

+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Changelog 
- Possibilité de spécifier un data extractor précis pour une source (+ gestion des extractors par un plugin manager).

- Migration des lignes de commandes d'import/synchro au format Symfony (lancer `vendor/bin/laminas` pour avoir la liste des commandes).

- Configuration : navigation déplacée dans config/unicaen-db-import.global.php.dist pour ne pas imposer le menu du module.

- [FIX] Ajouts de strtolower/strtoupper() faisant défaut.



7.3.2

-----

src/UnicaenDbImport/CodeGenerator/CodeGenerator.php

+18 −18
Changes for src/UnicaenDbImport/CodeGenerator/CodeGenerator.php: 18 added lines, 18 removed lines.
Original line number Diff line number Diff line
@@ -361,12 +361,12 @@ abstract class CodeGenerator implements CodeGeneratorInterface 


        // les éventuelles colonnes d'historique dans les données sources seront écrasées :

        $columns = array_diff($columns, [

            $c = $this->config->getHistoColumnAliasForCreatedOn(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForCreatedBy(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForUpdatedOn(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForUpdatedBy(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForDeletedOn(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForDeletedBy(), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForCreatedOn()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForCreatedBy()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForUpdatedOn()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForUpdatedBy()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForDeletedOn()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForDeletedBy()), strtoupper($c),

        ]);



        $diffSourceTableName = $intermediateTable ?: $source->getTable();
@@ -397,12 +397,12 @@ abstract class CodeGenerator implements CodeGeneratorInterface 


        // les éventuelles colonnes d'historique dans les données sources seront écrasées :

        $columns = array_diff($columns, [

            $c = $this->config->getHistoColumnAliasForCreatedOn(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForCreatedBy(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForUpdatedOn(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForUpdatedBy(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForDeletedOn(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForDeletedBy(), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForCreatedOn()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForCreatedBy()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForUpdatedOn()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForUpdatedBy()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForDeletedOn()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForDeletedBy()), strtoupper($c),

        ]);



        return $this->tableHelper->generateSQLForDiffViewSelect($destinationTable, $sourceCodeColumn, $columns, $where, $includeIdColumn);
@@ -425,12 +425,12 @@ abstract class CodeGenerator implements CodeGeneratorInterface 


        // les éventuelles colonnes d'historique dans les données sources seront écrasées :

        $columns = array_diff($columns, [

            $c = $this->config->getHistoColumnAliasForCreatedOn(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForCreatedBy(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForUpdatedOn(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForUpdatedBy(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForDeletedOn(), strtoupper($c),

            $c = $this->config->getHistoColumnAliasForDeletedBy(), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForCreatedOn()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForCreatedBy()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForUpdatedOn()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForUpdatedBy()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForDeletedOn()), strtoupper($c),

            strtolower($c = $this->config->getHistoColumnAliasForDeletedBy()), strtoupper($c),

        ]);



        switch ($operation) {

src/UnicaenDbImport/Formatter/SynchroDiffFormatter.php

+3 −3
Changes for src/UnicaenDbImport/Formatter/SynchroDiffFormatter.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -22,15 +22,15 @@ class SynchroDiffFormatter 
                // si le nom de colonne est de la forme 'U_xxxx', il s'agit d'un témoin de mise à jour de la colonne 'xxxx'

                $keyPrefix = substr($key, 0, $len = strlen(Synchro::V_DIFF_UPDATED_COLUMN_PREFIX));

                $isUpdatedFlag =

                    $keyPrefix === Synchro::V_DIFF_UPDATED_COLUMN_PREFIX ||

                    $keyPrefix === strtoupper(Synchro::V_DIFF_UPDATED_COLUMN_PREFIX) ||

                    $keyPrefix === strtolower(Synchro::V_DIFF_UPDATED_COLUMN_PREFIX);

                if ($isUpdatedFlag && $val === 1) {

                    $col = substr($key, $len);

                    $colValueFrom =

                        $row[Synchro::V_DIFF_DEST_COLUMN_PREFIX . $col] ??

                        $row[strtoupper(Synchro::V_DIFF_DEST_COLUMN_PREFIX . $col)] ??

                        $row[strtolower(Synchro::V_DIFF_DEST_COLUMN_PREFIX . $col)]; // NULL en cas d'opération d'insertion

                    $colValueTo =

                        $row[Synchro::V_DIFF_SRC_COLUMN_PREFIX . $col] ??

                        $row[strtoupper(Synchro::V_DIFF_SRC_COLUMN_PREFIX . $col)] ??

                        $row[strtolower(Synchro::V_DIFF_SRC_COLUMN_PREFIX . $col)];

                    $data[$col] = [

                        'from' => $colValueFrom,

src/UnicaenDbImport/Service/Database/DatabaseService.php

+1 −1
Changes for src/UnicaenDbImport/Service/Database/DatabaseService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ class DatabaseService extends AbstractDatabaseService 
        // - mise à NULL des colonnes pour lesquelles on n'a pas de valeur.

        $columnsValues = [];

        foreach ($columns as $column) {

            $columnsValues[$column] = $row[$column] ?? $row[strtolower($column)] ?? null;

            $columnsValues[$column] = $row[strtoupper($column)] ?? $row[strtolower($column)] ?? null;

        }



        // transformations éventuelles de valeurs de colonnes/attributs