[Observe-commits] [Git][ultreia.io/ird-observe][develop] report from version 5.x (See #745 and #742)

15 Mar 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe


Commits:
8445cb2e by Tony CHEMIT at 2017-03-15T15:01:46+01:00
report from version 5.x (See #745 and #742)

- - - - -


18 changed files:

- persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java
- persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java
- persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java
- persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-H2.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-PG.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-H2.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-PG.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-H2.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-PG.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-H2.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-PG.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-H2.sql
- persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-PG.sql


Changes:

=====================================
persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java
=====================================

--- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java
+++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java
@@ -69,7 +69,6 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM
 
         addScript("07", "drop_not_null_constraint_gearUseFeatures", queries);
         addScript("08", "drop_not_null_constraint_hauling_identifier", queries);
-        addScript("09", "add_non_target_length_sex_fk", queries);
     }
 
     public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 {
@@ -86,7 +85,7 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM
             Set<String> forkeignKeys = H2DataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength");
             Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet());
             if (!collect.contains("fk_nontargetlength_sex")) {
-                addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries);
+                addScript("09", "add_non_target_length_sex_fk", queries);
             }
         }
 
@@ -106,7 +105,7 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM
             Set<String> forkeignKeys = PGDataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength");
             Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet());
             if (!collect.contains("fk_nontargetlength_sex")) {
-                addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries);
+                addScript("09", "add_non_target_length_sex_fk", queries);
             }
         }
 


=====================================
persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java
=====================================
--- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java
+++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java
@@ -98,6 +98,11 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat
             super(callBack, PGDataSourceMigration.TYPE);
         }
 
+        @Override
+        protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) {
+            super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression);
+            addScript("02", "add-foreign-key-indexes", queries);
+        }
     }
 
 }


=====================================
persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java
=====================================
--- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java
+++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java
@@ -71,10 +71,10 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse
         addMissingForeignKeys(topiaSqlSupport, queries);
 
         // See https://forge.codelutin.com/issues/6983
-        addScript("02", "update-senne-gear-usedInTrip", queries);
+        addScript("01", "update-senne-gear-usedInTrip", queries);
 
         // See https://forge.codelutin.com/issues/6991
-        addScript("03", "rename-unknown-longliner", queries);
+        addScript("02", "rename-unknown-longliner", queries);
 
     }
 


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-H2.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-H2.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-PG.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-PG.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-H2.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-H2.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-PG.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-PG.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-H2.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-H2.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-PG.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-PG.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-H2.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-H2.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-PG.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-PG.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-H2.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-H2.sql


=====================================
persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-PG.sql
=====================================
--- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql
+++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-PG.sql



View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/8445cb2e29c682336b3d91c4653...

    