This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 9529836c4cfbd6ad1034093a92c935d8d7747d10 Merge: 10d3542 5f38a08 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:29:30 2016 +0100 Merge branch 'feature/migration' into develop application-swing-configuration/pom.xml | 2 + .../application/swing/ui/ObserveMainUIHandler.java | 3 + application-web-configuration/pom.xml | 2 + entities-migration/pom.xml | 4 - .../DataSourceMigrationForVersion_5_0.java | 116 +++++++++++++++++ .../DataSourceMigrationForVersion_5_1.java | 57 ++++---- ...ObserveMigrationCallBackForVersionResolver.java | 94 -------------- .../ObserveMigrationConfigurationProviderImpl.java | 144 --------------------- .../DataSourceMigrationForVersion_3_1.java | 15 ++- .../DataSourceMigrationForVersion_3_10.java | 7 +- .../DataSourceMigrationForVersion_3_11.java | 7 +- .../DataSourceMigrationForVersion_3_12.java | 7 +- .../DataSourceMigrationForVersion_3_14.java | 7 +- .../DataSourceMigrationForVersion_3_15.java | 7 +- .../DataSourceMigrationForVersion_3_16.java | 11 +- .../DataSourceMigrationForVersion_3_5.java | 7 +- .../DataSourceMigrationForVersion_3_7.java | 7 +- .../DataSourceMigrationForVersion_3_8.java | 7 +- .../DataSourceMigrationForVersion_3_9.java | 7 +- .../DataSourceMigrationForVersion_4_0.java | 7 +- .../DataSourceMigrationForVersion_4_0_1.java | 7 +- .../DataSourceMigrationForVersion_4_0_2.java | 7 +- .../DataSourceMigrationForVersion_4_0_4.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC4.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 11 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 7 +- .../DataSourceMigrationForVersion_4_900.java | 73 ----------- .../DataSourceMigrationForVersion_4_901.java | 73 ----------- .../DataSourceMigrationForVersion_4_902.java | 73 ----------- .../DataSourceMigrationForVersion_4_903.java | 74 ----------- .../DataSourceMigrationForVersion_4_904.java | 70 ---------- .../DataSourceMigrationForVersion_4_905.java | 71 ---------- .../DataSourceMigrationForVersion_4_906.java | 81 ------------ .../DataSourceMigrationForVersion_5_0.java | 72 ----------- .../{ => 3.10}/V3_10_01_remove-person-H2.sql | 0 .../{ => 3.10}/V3_10_01_remove-person-PG.sql | 0 .../{ => 3.10}/V3_10_02_add-missing-fk-H2.sql | 0 .../{ => 3.10}/V3_10_02_add-missing-fk-PG.sql | 0 .../V3_10_03_increase-comment-field-H2.sql | 0 .../V3_10_03_increase-comment-field-PG.sql | 0 .../V3_10_04_fix-sensorDataFormat-H2.sql | 0 .../V3_10_04_fix-sensorDataFormat-PG.sql | 0 .../{ => 3.10}/V3_10_05_normalize-sections-H2.sql | 0 .../{ => 3.10}/V3_10_05_normalize-sections-PG.sql | 0 ...1_01_remove-speciesGroup-obsolete-fields-H2.sql | 0 ...1_01_remove-speciesGroup-obsolete-fields-PG.sql | 0 ...3_11_02_add-country-on-transmitting-buoy-H2.sql | 0 ...3_11_02_add-country-on-transmitting-buoy-PG.sql | 0 .../{ => 3.11}/V3_11_03_add-fpaZones-H2.sql | 0 .../{ => 3.11}/V3_11_03_add-fpaZones-PG.sql | 0 .../{ => 3.11}/V3_11_04_add-activity-ersId-H2.sql | 0 .../{ => 3.11}/V3_11_04_add-activity-ersId-PG.sql | 0 .../{ => 3.11}/V3_11_05_add-person-country-H2.sql | 0 .../{ => 3.11}/V3_11_05_add-person-country-PG.sql | 0 .../{ => 3.11}/V3_11_06_add-harbours-H2.sql | 0 .../{ => 3.11}/V3_11_06_add-harbours-PG.sql | 0 .../{ => 3.12}/V3_12_01_add-missing-boat-H2.sql | 0 .../{ => 3.12}/V3_12_01_add-missing-boat-PG.sql | 0 ...3_14_01_remove-hooksPerBasketCount-field-H2.sql | 0 ...3_14_01_remove-hooksPerBasketCount-field-PG.sql | 0 ...3_14_02_fix-targetsample-discarded-value-H2.sql | 0 ...3_14_02_fix-targetsample-discarded-value-PG.sql | 0 .../V3_14_03_remove-orphan-seine-sample-H2.sql | 0 .../V3_14_03_remove-orphan-seine-sample-PG.sql | 0 ...4_04_remove-targetlength-discarded-field-H2.sql | 0 ...4_04_remove-targetlength-discarded-field-PG.sql | 0 ..._15_01_change-tdr-integer-field-to-float-H2.sql | 0 ..._15_01_change-tdr-integer-field-to-float-PG.sql | 0 ..._15_02_remove-set-longline-length-fields-H2.sql | 0 ..._15_02_remove-set-longline-length-fields-PG.sql | 0 .../V3_15_03_remove-brancheline-fields-H2.sql | 0 .../V3_15_03_remove-brancheline-fields-PG.sql | 0 .../V3_16_01_add-gear-referential-H2.sql | 0 .../V3_16_01_add-gear-referential-PG.sql | 0 .../{ => 3.16}/V3_16_02_add-gear-data-H2.sql | 0 .../{ => 3.16}/V3_16_02_add-gear-data-PG.sql | 0 .../V3_16_03_remove-tripSeine-seine-H2.sql | 0 .../V3_16_03_remove-tripSeine-seine-PG.sql | 0 .../migration/{ => 3.5}/V3_5_01_migration-H2.sql | 0 .../migration/{ => 3.5}/V3_5_01_migration-PG.sql | 0 .../{ => 3.5}/V3_5_02_add-longline-schema-H2.sql | 0 .../{ => 3.5}/V3_5_02_add-longline-schema-PG.sql | 0 .../V3_5_03_update-common-references-H2.sql | 0 .../V3_5_03_update-common-references-PG.sql | 0 .../V3_5_04_add-longline-references-H2.sql | 0 .../V3_5_04_add-longline-references-PG.sql | 0 .../{ => 3.7}/V3_7_01_rename-seine-model-H2.sql | 0 .../{ => 3.7}/V3_7_01_rename-seine-model-PG.sql | 0 .../{ => 3.7}/V3_7_02_remove-trip-organism-H2.sql | 0 .../{ => 3.7}/V3_7_02_remove-trip-organism-PG.sql | 0 .../V3_7_03_add-referential-needComment-H2.sql | 0 .../V3_7_03_add-referential-needComment-PG.sql | 0 .../V3_7_04_normalize-triplongline-H2.sql | 0 .../V3_7_04_normalize-triplongline-PG.sql | 0 .../V3_7_05_normalize-activitylongline-H2.sql | 0 .../V3_7_05_normalize-activitylongline-PG.sql | 0 .../{ => 3.7}/V3_7_06_normalize-setlongline-H2.sql | 0 .../{ => 3.7}/V3_7_06_normalize-setlongline-PG.sql | 0 .../V3_7_07_normalize-catchlongline-H2.sql | 0 .../V3_7_07_normalize-catchlongline-PG.sql | 0 .../{ => 3.7}/V3_7_08_normalize-tdr-H2.sql | 0 .../{ => 3.7}/V3_7_08_normalize-tdr-PG.sql | 0 .../{ => 3.7}/V3_7_09_add-species-list-H2.sql | 0 .../{ => 3.7}/V3_7_09_add-species-list-PG.sql | 0 .../V3_7_10_increase-comment-field-H2.sql | 0 .../V3_7_10_increase-comment-field-PG.sql | 0 .../migration/{ => 3.8}/V3_8_01_fix-person-H2.sql | 0 .../migration/{ => 3.8}/V3_8_01_fix-person-PG.sql | 0 .../V3_8_02_fix-branchelinecomposition-H2.sql | 0 .../V3_8_02_fix-branchelinecomposition-PG.sql | 0 .../{ => 3.8}/V3_8_03_normalize-sensorused-H2.sql | 0 .../{ => 3.8}/V3_8_03_normalize-sensorused-PG.sql | 0 .../{ => 3.8}/V3_8_04_normalize-tdr-H2.sql | 0 .../{ => 3.8}/V3_8_04_normalize-tdr-PG.sql | 0 .../V3_9_01_add-dataFilename-attribute-H2.sql | 0 .../V3_9_01_add-dataFilename-attribute-PG.sql | 0 .../{ => 3.9}/V3_9_02_fill-sensorDataFormat-H2.sql | 0 .../{ => 3.9}/V3_9_02_fill-sensorDataFormat-PG.sql | 0 .../V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 0 .../V4_0_RC_2_01_clean-program-gear-type-H2.sql | 0 .../V4_0_RC_2_01_clean-program-gear-type-PG.sql | 0 ...4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 0 ...4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 0 .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 0 .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 0 .../V4_0_RC_4_01_add-gear-data-H2.sql | 0 .../V4_0_RC_4_01_add-gear-data-PG.sql | 0 ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 0 ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 0 ...4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 0 ...4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 0 .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 0 .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 0 .../V4_0_1_01_remove-gender-column-H2.sql | 0 .../{ => 4.0.1}/V4_0_1_02_add-missing-fk-H2.sql | 0 .../{ => 4.0.1}/V4_0_1_02_add-missing-fk-PG.sql | 0 .../V4_0_2_01_remove-gender-column-PG.sql | 0 ...0_4_01_remove-trip-datearriveeport-field-H2.sql | 0 ...0_4_01_remove-trip-datearriveeport-field-PG.sql | 0 .../db/migration/{ => 4.0}/V4_0_01_empty-H2.sql | 0 .../db/migration/{ => 4.0}/V4_0_01_empty-PG.sql | 0 .../{ => 5.0}/V4_900_01_remove_open_field-H2.sql | 0 .../{ => 5.0}/V4_900_01_remove_open_field-PG.sql | 0 .../V4_901_01_add_lastUpdateDate_field-H2.sql | 0 .../V4_901_01_add_lastUpdateDate_field-PG.sql | 0 .../V4_902_01_add_lastUpdateDate_table-H2.sql | 0 .../V4_902_01_add_lastUpdateDate_table-PG.sql | 0 .../{ => 5.0}/V4_903_01_remove_unit_field-H2.sql | 0 .../{ => 5.0}/V4_903_01_remove_unit_field-PG.sql | 0 .../{ => 5.0}/V4_903_02_remove_gender_field-H2.sql | 0 .../{ => 5.0}/V4_903_02_remove_gender_field-PG.sql | 0 .../V4_903_03_remove_duplicate_rows-H2.sql | 0 .../V4_903_03_remove_duplicate_rows-PG.sql | 0 ...drop_not_null_constraint_gearUseFeatures-H2.sql | 0 ...drop_not_null_constraint_gearUseFeatures-PG.sql | 0 ...p_not_null_constraint_hauling_identifier-H2.sql | 0 ...p_not_null_constraint_hauling_identifier-PG.sql | 0 .../V4_906_01_add_non_target_length_sex_fk-H2.sql | 0 .../V4_906_01_add_non_target_length_sex_fk-PG.sql | 0 .../V5_1_01_evol_8374_delete_sonarUsed-H2.sql | 0 .../V5_1_01_evol_8374_delete_sonarUsed-PG.sql | 0 .../V5_1_02_evol_7886_catch_add_set_idx-H2.sql | 0 .../V5_1_02_evol_7886_catch_add_set_idx-PG.sql | 0 ..._1_03_evol_6997_delete_supportVesselName-H2.sql | 0 ..._1_03_evol_6997_delete_supportVesselName-PG.sql | 0 ...ranchlineComposition_add_tracelineLength-H2.sql | 0 ...ranchlineComposition_add_tracelineLength-PG.sql | 0 ...5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql | 0 ...5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql | 0 .../V5_1_06_evol_8375_setSeine_add_booleans-H2.sql | 0 .../V5_1_06_evol_8375_setSeine_add_booleans-PG.sql | 0 .../V5_1_07_evol_8389_rename_source_columns-H2.sql | 0 .../V5_1_07_evol_8389_rename_source_columns-PG.sql | 0 .../V5_1_08_evol_8390_measure_type-H2.sql | 0 .../V5_1_08_evol_8390_measure_type-PG.sql | 0 .../V5_1_09_evol_7877_targetLength_add_sex-H2.sql | 0 .../V5_1_09_evol_7877_targetLength_add_sex-PG.sql | 0 ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 0 ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 0 .../V5_1_11_evol_8571_length_add_tagNumber-H2.sql | 0 .../V5_1_11_evol_8571_length_add_tagNumber-PG.sql | 0 .../V5_1_12_evol_8475_vessel_add_fields-H2.sql | 0 .../V5_1_12_evol_8475_vessel_add_fields-PG.sql | 0 .../V5_1_13_evol_7901_add_armateur_table-H2.sql | 0 .../V5_1_13_evol_7901_add_armateur_table-PG.sql | 0 ...ol_8196_lengthWeightParameter_add_source-H2.sql | 0 ...ol_8196_lengthWeightParameter_add_source-PG.sql | 0 ...vol_8578_nonTargetLength_add_speciesFate-H2.sql | 0 ...vol_8578_nonTargetLength_add_speciesFate-PG.sql | 0 ...5_1_16_evol_8377_speciesFate_add_discard-H2.sql | 0 ...5_1_16_evol_8377_speciesFate_add_discard-PG.sql | 0 entities/pom.xml | 4 + .../java/fr/ird/observe/entities/Entities.java | 6 +- .../migration/AbstractDataSourceMigration.java | 5 - .../AbstractObserveMigrationCallBack.java | 20 +-- .../entities/migration/H2DataSourceMigration.java | 0 .../entities/migration/MigrationVersion.java | 20 +++ ...ObserveMigrationCallBackForVersionResolver.java | 87 +++++++++++++ .../ObserveMigrationConfigurationProvider.java | 105 ++++++++++++--- .../entities/migration/PGDataSourceMigration.java | 0 pom.xml | 2 +- .../dto/reference/DataReferenceSetDefinitions.java | 12 +- .../topia/binder/data/DataBinderSupport.java | 2 +- .../topia/binder/data/NonTargetLengthBinder.java | 8 +- .../topia/binder/data/TargetCatchBinder.java | 6 + .../topia/binder/BinderEngineMetadataTest.java | 4 +- .../consolidate/ConsolidateDataServiceTopia.java | 2 +- .../topia/service/MigrateTestsDatabases.java | 11 ++ .../UnidirectionalSynchronizeReferentialTest.java | 4 + .../actions/validate/ValidateServiceTopiaTest.java | 42 +++--- .../java/fr/ird/observe/test/ObserveFixtures.java | 7 +- .../resources/db/5.1/dataForTestLongline.sql.gz | Bin 0 -> 1626691 bytes .../main/resources/db/5.1/dataForTestSeine.sql.gz | Bin 0 -> 455040 bytes test/src/main/resources/db/5.1/empty_h2.sql.gz | Bin 0 -> 6193 bytes test/src/main/resources/db/5.1/empty_pg.sql.gz | Bin 0 -> 6188 bytes test/src/main/resources/db/5.1/referentiel.sql.gz | Bin 0 -> 143865 bytes test/src/main/resources/observetest.properties | 2 +- 219 files changed, 530 insertions(+), 984 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.