Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe
Commits:
-
8445cb2e
by Tony CHEMIT at 2017-03-15T15:01:46+01:00
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:
| ... | ... | @@ -69,7 +69,6 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM |
| 69 | 69 |
|
| 70 | 70 |
addScript("07", "drop_not_null_constraint_gearUseFeatures", queries);
|
| 71 | 71 |
addScript("08", "drop_not_null_constraint_hauling_identifier", queries);
|
| 72 |
- addScript("09", "add_non_target_length_sex_fk", queries);
|
|
| 73 | 72 |
}
|
| 74 | 73 |
|
| 75 | 74 |
public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 {
|
| ... | ... | @@ -86,7 +85,7 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM |
| 86 | 85 |
Set<String> forkeignKeys = H2DataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength");
|
| 87 | 86 |
Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet());
|
| 88 | 87 |
if (!collect.contains("fk_nontargetlength_sex")) {
|
| 89 |
- addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries);
|
|
| 88 |
+ addScript("09", "add_non_target_length_sex_fk", queries);
|
|
| 90 | 89 |
}
|
| 91 | 90 |
}
|
| 92 | 91 |
|
| ... | ... | @@ -106,7 +105,7 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM |
| 106 | 105 |
Set<String> forkeignKeys = PGDataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength");
|
| 107 | 106 |
Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet());
|
| 108 | 107 |
if (!collect.contains("fk_nontargetlength_sex")) {
|
| 109 |
- addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries);
|
|
| 108 |
+ addScript("09", "add_non_target_length_sex_fk", queries);
|
|
| 110 | 109 |
}
|
| 111 | 110 |
}
|
| 112 | 111 |
|
| ... | ... | @@ -98,6 +98,11 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat |
| 98 | 98 |
super(callBack, PGDataSourceMigration.TYPE);
|
| 99 | 99 |
}
|
| 100 | 100 |
|
| 101 |
+ @Override
|
|
| 102 |
+ protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) {
|
|
| 103 |
+ super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression);
|
|
| 104 |
+ addScript("02", "add-foreign-key-indexes", queries);
|
|
| 105 |
+ }
|
|
| 101 | 106 |
}
|
| 102 | 107 |
|
| 103 | 108 |
}
|
| ... | ... | @@ -71,10 +71,10 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse |
| 71 | 71 |
addMissingForeignKeys(topiaSqlSupport, queries);
|
| 72 | 72 |
|
| 73 | 73 |
// See https://forge.codelutin.com/issues/6983
|
| 74 |
- addScript("02", "update-senne-gear-usedInTrip", queries);
|
|
| 74 |
+ addScript("01", "update-senne-gear-usedInTrip", queries);
|
|
| 75 | 75 |
|
| 76 | 76 |
// See https://forge.codelutin.com/issues/6991
|
| 77 |
- addScript("03", "rename-unknown-longliner", queries);
|
|
| 77 |
+ addScript("02", "rename-unknown-longliner", queries);
|
|
| 78 | 78 |
|
| 79 | 79 |
}
|
| 80 | 80 |
|