[Observe-commits] 14/19: Merge branch 'feature/normalisation_script_migrations' into develop

9 Jan 2016

      This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository tutti.

See http://git.codelutin.com/tutti.git

commit 96433820609f085256bdc1740b2d12364930ec21
Merge: 84af08c 2ca9cdc
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Sat Jan 9 14:47:10 2016 +0100

    Merge branch 'feature/normalisation_script_migrations' into develop

 .../migration/AbstractDataSourceMigration.java     |   8 +--
 .../AbstractObserveMigrationCallBack.java          |  73 ++++++++++-----------
 .../DataSourceMigrationForVersion_3_10.java        |  10 +--
 .../DataSourceMigrationForVersion_3_11.java        |  12 ++--
 .../DataSourceMigrationForVersion_3_12.java        |   2 +-
 .../DataSourceMigrationForVersion_3_14.java        |   8 +--
 .../DataSourceMigrationForVersion_3_15.java        |   6 +-
 .../DataSourceMigrationForVersion_3_16.java        |   6 +-
 .../DataSourceMigrationForVersion_3_5.java         |  24 ++-----
 .../DataSourceMigrationForVersion_3_7.java         |  52 +++------------
 .../DataSourceMigrationForVersion_3_8.java         |   8 +--
 .../DataSourceMigrationForVersion_3_9.java         |   4 +-
 .../DataSourceMigrationForVersion_4_0.java         |   2 +-
 .../DataSourceMigrationForVersion_4_0_1.java       |   4 +-
 .../DataSourceMigrationForVersion_4_0_2.java       |   2 +-
 .../DataSourceMigrationForVersion_4_0_RC2.java     |   2 +-
 .../DataSourceMigrationForVersion_4_0_RC3.java     |  24 +++----
 .../DataSourceMigrationForVersion_4_0_RC4.java     |   2 +-
 .../DataSourceMigrationForVersion_4_0_RC6.java     |   2 +-
 .../DataSourceMigrationForVersion_4_0_RC7.java     |   4 +-
 ...va => DataSourceMigrationForVersion_4_900.java} |  12 ++--
 ...va => DataSourceMigrationForVersion_4_901.java} |  12 ++--
 ...va => DataSourceMigrationForVersion_4_902.java} |  12 ++--
 .../DataSourceMigrationForVersion_5_0.java         |   8 +--
 .../db/4.0-RC3/rename-unknown-longliner-H2.sql     |  22 -------
 .../db/4.0-RC3/rename-unknown-longliner-PG.sql     |  22 -------
 .../db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql |  22 -------
 .../db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql |  22 -------
 .../V3_10_01_remove-person-H2.sql}                 |   0
 .../V3_10_01_remove-person-PG.sql}                 |   0
 .../V3_10_02_add-missing-fk-H2.sql}                |   0
 .../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
 .../V3_10_05_normalize-sections-H2.sql}            |   0
 .../V3_10_05_normalize-sections-PG.sql}            |   0
 ..._01_remove-speciesGroup-obsolete-fields-H2.sql} |   0
 ..._01_remove-speciesGroup-obsolete-fields-PG.sql} |   0
 ..._11_02_add-country-on-transmitting-buoy-H2.sql} |   0
 ..._11_02_add-country-on-transmitting-buoy-PG.sql} |   0
 .../V3_11_03_add-fpaZones-H2.sql}                  |   0
 .../V3_11_03_add-fpaZones-PG.sql}                  |   0
 .../V3_11_04_add-activity-ersId-H2.sql}            |   0
 .../V3_11_04_add-activity-ersId-PG.sql}            |   0
 .../V3_11_05_add-person-country-H2.sql}            |   0
 .../V3_11_05_add-person-country-PG.sql}            |   0
 .../V3_11_06_add-harbours-H2.sql}                  |   0
 .../V3_11_06_add-harbours-PG.sql}                  |   0
 .../V3_12_01_add-missing-boat-H2.sql}              |   0
 .../V3_12_01_add-missing-boat-PG.sql}              |   0
 ..._14_01_remove-hooksPerBasketCount-field-H2.sql} |   0
 ..._14_01_remove-hooksPerBasketCount-field-PG.sql} |   0
 ..._14_02_fix-targetsample-discarded-value-H2.sql} |   0
 ..._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
 ..._04_remove-targetlength-discarded-field-H2.sql} |   0
 ..._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
 .../V3_16_02_add-gear-data-H2.sql}                 |   0
 .../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
 .../V3_5_01_migration-H2.sql}                      |   0
 .../V3_5_01_migration-PG.sql}                      |   0
 .../V3_5_02_add-longline-schema-H2.sql}            |   0
 .../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
 .../V3_7_01_rename-seine-model-H2.sql}             |   0
 .../V3_7_01_rename-seine-model-PG.sql}             |   0
 .../V3_7_02_remove-trip-organism-H2.sql}           |   0
 .../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
 .../V3_7_06_normalize-setlongline-H2.sql}          |   0
 .../V3_7_06_normalize-setlongline-PG.sql}          |   0
 .../V3_7_07_normalize-catchlongline-H2.sql}        |   0
 .../V3_7_07_normalize-catchlongline-PG.sql}        |   0
 .../V3_7_08_normalize-tdr-H2.sql}                  |   0
 .../V3_7_08_normalize-tdr-PG.sql}                  |   0
 .../V3_7_09_add-species-list-H2.sql}               |   0
 .../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
 .../V3_8_01_fix-person-H2.sql}                     |   0
 .../V3_8_01_fix-person-PG.sql}                     |   0
 .../V3_8_02_fix-branchelinecomposition-H2.sql}     |   0
 .../V3_8_02_fix-branchelinecomposition-PG.sql}     |   0
 .../V3_8_03_normalize-sensorused-H2.sql}           |   0
 .../V3_8_03_normalize-sensorused-PG.sql}           |   0
 .../V3_8_04_normalize-tdr-H2.sql}                  |   0
 .../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
 .../V3_9_02_fill-sensorDataFormat-H2.sql}          |   0
 .../V3_9_02_fill-sensorDataFormat-PG.sql}          |   0
 .../V4_0_01_empty-H2.sql}                          |   0
 .../V4_0_01_empty-PG.sql}                          |   0
 .../V4_0_1_01_remove-gender-column-H2.sql}         |   0
 .../V4_0_1_02_add-missing-fk-H2.sql}               |   0
 .../V4_0_1_02_add-missing-fk-PG.sql}               |   0
 .../V4_0_2_01_remove-gender-column-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
 ..._0_RC_2_02_update-senne-gear-usedInTrip-H2.sql} |   0
 ..._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
 ..._0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql} |   0
 ..._0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql} |   0
 ..._0_RC_7_01_update-senne-gear-usedInTrip-H2.sql} |   0
 ..._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_900_01_remove_open_field-H2.sql}            |   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
 .../services/service/SqlScriptProducerService.java |   2 +
 .../service/SqlScriptProducerServiceTopia.java     |   6 ++
 .../services/service/MigrateTestsDatabases.java    |  19 +++---
 .../java/fr/ird/observe/test/ObserveFixtures.java  |   2 +-
 .../db/{5.0-3 => 4.902}/dataForTestLongline.sql.gz | Bin
 .../db/{5.0-3 => 4.902}/dataForTestSeine.sql.gz    | Bin
 .../resources/db/{5.0-3 => 4.902}/empty.sql.gz     | Bin
 .../db/{5.0-3 => 4.902}/referentiel.sql.gz         | Bin
 pom.xml                                            |   2 +-
 148 files changed, 141 insertions(+), 277 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

[Observe-commits] 14/19: Merge branch 'feature/normalisation_script_migrations' into develop

codelutin.com scm