Loading CHANGELOG.md +4 −0 Changes for CHANGELOG.md: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Changelog ========= 6.1.2 ----- - Ajout de la colonne IMPORT_OBSERV_RESULT.SOURCE_ID permettant de filtrer selon la source de données. 6.1.1 ----- - [FIX] Correction du SQL généré pour l'update de synchro : les colonnes histo_destruct* était mises à null, ce qui est Loading src/UnicaenDbImport/CodeGenerator/CodeGenerator.php +4 −4 Changes for src/UnicaenDbImport/CodeGenerator/CodeGenerator.php: 4 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -491,7 +491,7 @@ EOS; $tableName = $importObservRow['table_name'] ?? $importObservRow['TABLE_NAME']; $columnName = $importObservRow['column_name'] ?? $importObservRow['COLUMN_NAME']; $toValue = $importObservRow['to_value'] ?? $importObservRow['TO_VALUE']; $filter = $importObservRow['filter'] ?? $importObservRow['FILTER']; $filter = $importObservRow['filter'] ?? $importObservRow['FILTER'] ?? null; // Construction du nom de la colonne de la vue V_DIFF_X indiquant un changement de valeur dans la table X. // Ex: 'U_RESULTAT' (dans la vue V_DIFF_THESE, indiquant que la colonne THESE.RESULTAT a changé). Loading Loading @@ -522,7 +522,7 @@ EOS; // de la colonne spécifiée par IMPORT_OBSERV.COLUMN_NAME, // dans la table spécifiée par IMPORT_OBSERV.TABLE_NAME. return <<<EOS select $id import_observ_id, v.source_code, select $id import_observ_id, v.source_id, v.source_code, $detail detail from V_DIFF_$tableName v join $tableName t on t.source_code = v.source_code Loading Loading @@ -550,11 +550,11 @@ EOS; $nextval = $this->tableHelper->generateSQLForSequenceNextVal('import_observ_result_id_seq'); return <<<EOS insert into import_observ_result (id, date_creation, import_observ_id, source_code, resultat) insert into import_observ_result (id, date_creation, import_observ_id, source_id, source_code, resultat) with tmp as ( $selects ) select $nextval, $now, import_observ_id, source_code, detail select $nextval, $now, import_observ_id, source_id, source_code, detail from tmp EOS; } Loading src/UnicaenDbImport/Entity/Db/ImportObservResult.php +4 −0 Changes for src/UnicaenDbImport/Entity/Db/ImportObservResult.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -2,8 +2,12 @@ namespace UnicaenDbImport\Entity\Db; use UnicaenDbImport\Entity\Db\Traits\SourceAwareTrait; class ImportObservResult extends AbstractImportObservResult { use SourceAwareTrait; /** * @var ImportObserv */ Loading src/UnicaenDbImport/Entity/Db/Mapping/UnicaenDbImport.Entity.Db.ImportObservResult.dcm.xml +6 −0 Changes for src/UnicaenDbImport/Entity/Db/Mapping/UnicaenDbImport.Entity.Db.ImportObservResult.dcm.xml: 6 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -13,5 +13,11 @@ </join-columns> </many-to-one> <many-to-one field="source" target-entity="UnicaenDbImport\Entity\Db\Source"> <join-columns> <join-column name="SOURCE_ID" referenced-column-name="ID"/> </join-columns> </many-to-one> </entity> </doctrine-mapping> Loading
CHANGELOG.md +4 −0 Changes for CHANGELOG.md: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Changelog ========= 6.1.2 ----- - Ajout de la colonne IMPORT_OBSERV_RESULT.SOURCE_ID permettant de filtrer selon la source de données. 6.1.1 ----- - [FIX] Correction du SQL généré pour l'update de synchro : les colonnes histo_destruct* était mises à null, ce qui est Loading
src/UnicaenDbImport/CodeGenerator/CodeGenerator.php +4 −4 Changes for src/UnicaenDbImport/CodeGenerator/CodeGenerator.php: 4 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -491,7 +491,7 @@ EOS; $tableName = $importObservRow['table_name'] ?? $importObservRow['TABLE_NAME']; $columnName = $importObservRow['column_name'] ?? $importObservRow['COLUMN_NAME']; $toValue = $importObservRow['to_value'] ?? $importObservRow['TO_VALUE']; $filter = $importObservRow['filter'] ?? $importObservRow['FILTER']; $filter = $importObservRow['filter'] ?? $importObservRow['FILTER'] ?? null; // Construction du nom de la colonne de la vue V_DIFF_X indiquant un changement de valeur dans la table X. // Ex: 'U_RESULTAT' (dans la vue V_DIFF_THESE, indiquant que la colonne THESE.RESULTAT a changé). Loading Loading @@ -522,7 +522,7 @@ EOS; // de la colonne spécifiée par IMPORT_OBSERV.COLUMN_NAME, // dans la table spécifiée par IMPORT_OBSERV.TABLE_NAME. return <<<EOS select $id import_observ_id, v.source_code, select $id import_observ_id, v.source_id, v.source_code, $detail detail from V_DIFF_$tableName v join $tableName t on t.source_code = v.source_code Loading Loading @@ -550,11 +550,11 @@ EOS; $nextval = $this->tableHelper->generateSQLForSequenceNextVal('import_observ_result_id_seq'); return <<<EOS insert into import_observ_result (id, date_creation, import_observ_id, source_code, resultat) insert into import_observ_result (id, date_creation, import_observ_id, source_id, source_code, resultat) with tmp as ( $selects ) select $nextval, $now, import_observ_id, source_code, detail select $nextval, $now, import_observ_id, source_id, source_code, detail from tmp EOS; } Loading
src/UnicaenDbImport/Entity/Db/ImportObservResult.php +4 −0 Changes for src/UnicaenDbImport/Entity/Db/ImportObservResult.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -2,8 +2,12 @@ namespace UnicaenDbImport\Entity\Db; use UnicaenDbImport\Entity\Db\Traits\SourceAwareTrait; class ImportObservResult extends AbstractImportObservResult { use SourceAwareTrait; /** * @var ImportObserv */ Loading
src/UnicaenDbImport/Entity/Db/Mapping/UnicaenDbImport.Entity.Db.ImportObservResult.dcm.xml +6 −0 Changes for src/UnicaenDbImport/Entity/Db/Mapping/UnicaenDbImport.Entity.Db.ImportObservResult.dcm.xml: 6 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -13,5 +13,11 @@ </join-columns> </many-to-one> <many-to-one field="source" target-entity="UnicaenDbImport\Entity\Db\Source"> <join-columns> <join-column name="SOURCE_ID" referenced-column-name="ID"/> </join-columns> </many-to-one> </entity> </doctrine-mapping>