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 97435540e3294449aa7adaca981cb807de1b0aaa Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 12:47:40 2016 +0100 renommage champs source en computed (persistence) --- .../versions/DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_07_evol_8389_rename_source_columns-H2.sql | 4 ++++ .../V5_1_07_evol_8389_rename_source_columns-PG.sql | 4 ++++ .../observe/entities/LengthWeightComputable.java | 8 ++++---- .../observe/entities/seine/NonTargetCatchImpl.java | 8 ++++---- entities/src/main/xmi/observe-seine.zargo | Bin 83528 -> 83500 bytes 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java index 2cccfe5..dbddf29 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java @@ -33,6 +33,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC addScript("04", "evol_6832_branchlineComposition_add_tracelineLength", queries); addScript("05", "evol_6999_nonTargetCatch_add_well", queries); addScript("06", "evol_8375_setSeine_add_booleans", queries); + addScript("07", "evol_8389_rename_source_columns", queries); } diff --git a/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-H2.sql new file mode 100644 index 0000000..dfb007e --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-H2.sql @@ -0,0 +1,4 @@ +ALTER TABLE observe_seine.nontargetlength ALTER COLUMN lengthSource RENAME TO isLengthComputed; +ALTER TABLE observe_seine.nontargetlength ALTER COLUMN weightSource RENAME TO isWeightComputed; +ALTER TABLE observe_seine.targetlength ALTER COLUMN lengthSource RENAME TO isLengthComputed; +ALTER TABLE observe_seine.targetlength ALTER COLUMN weightSource RENAME TO isWeightComputed; \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-PG.sql new file mode 100644 index 0000000..dfb007e --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-PG.sql @@ -0,0 +1,4 @@ +ALTER TABLE observe_seine.nontargetlength ALTER COLUMN lengthSource RENAME TO isLengthComputed; +ALTER TABLE observe_seine.nontargetlength ALTER COLUMN weightSource RENAME TO isWeightComputed; +ALTER TABLE observe_seine.targetlength ALTER COLUMN lengthSource RENAME TO isLengthComputed; +ALTER TABLE observe_seine.targetlength ALTER COLUMN weightSource RENAME TO isWeightComputed; \ No newline at end of file diff --git a/entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java b/entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java index ad10554..9507b10 100644 --- a/entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java +++ b/entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java @@ -30,16 +30,16 @@ public interface LengthWeightComputable extends TopiaEntity { void setLength(Float length); - boolean isLengthSource(); + boolean isIsLengthComputed(); - void setLengthSource(boolean lengthSource); + void setIsLengthComputed(boolean lengthSource); Float getWeight(); void setWeight(Float weight); - boolean isWeightSource(); + boolean isIsWeightComputed(); - void setWeightSource(boolean weightSource); + void setIsWeightComputed(boolean weightSource); } //LengthWeightComputable diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java index 0f0a497..810a7c3 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java @@ -58,12 +58,12 @@ public class NonTargetCatchImpl extends NonTargetCatchAbstract { } @Override - public boolean isLengthSource() { + public boolean isIsLengthComputed() { return isMeanLengthComputed(); } @Override - public void setLengthSource(boolean lengthSource) { + public void setIsLengthComputed(boolean lengthSource) { setMeanLengthComputedSource(NonTargetCatchComputedValueSourcePersist.fromData); } @@ -78,12 +78,12 @@ public class NonTargetCatchImpl extends NonTargetCatchAbstract { } @Override - public boolean isWeightSource() { + public boolean isIsWeightComputed() { return isMeanWeightComputed(); } @Override - public void setWeightSource(boolean weightSource) { + public void setIsWeightComputed(boolean weightSource) { setMeanWeightComputedSource(NonTargetCatchComputedValueSourcePersist.fromData); } diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index 738b0ac..a341754 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.