This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 300ca6a772c97d92276f269609d61011eae2d194 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 13 13:30:16 2016 +0200 Correction du timestamp lors de la génération du sql (je ne comprends pas pk, mais ça fonctionne :() --- .../service/actions/synchro/InsertSqlStatementGenerator.java | 7 ++++++- .../service/actions/synchro/UpdateSqlStatementGenerator.java | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/InsertSqlStatementGenerator.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/InsertSqlStatementGenerator.java index 9dcd36c..760e993 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/InsertSqlStatementGenerator.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/InsertSqlStatementGenerator.java @@ -94,7 +94,7 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { addStringParameter(referentialDto.getId(), parameters); addOtherTypeParameter(referentialDto.getVersion(), parameters); - addDateParameter(referentialDto.getCreateDate(), parameters); + addTimestampParameter(referentialDto.getCreateDate(), parameters); Map<String, Object> simpleParameters = binder.obtainProperties(referentialDto, true, true, simplePropertyNames); for (String simplePropertyName : simplePropertyNames) { @@ -213,6 +213,11 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { parameters.add("'" + parameter + "'"); } + private void addTimestampParameter(Date parameter, List<String> parameters) { + parameters.add("'" + parameter + "'::timestamp"); + } + + private void addEnumParameter(Enum parameter, List<String> parameters) { parameters.add("" + parameter.ordinal()); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UpdateSqlStatementGenerator.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UpdateSqlStatementGenerator.java index ff34ac9..513a5a2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UpdateSqlStatementGenerator.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UpdateSqlStatementGenerator.java @@ -95,7 +95,7 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { StringBuilder parameters = new StringBuilder(); addOtherTypeParameter(TopiaEntity.PROPERTY_TOPIA_VERSION, referentialDto.getVersion(), parameters); - addDateParameter(TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, referentialDto.getCreateDate(), parameters); + addTimestampParameter(TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, referentialDto.getCreateDate(), parameters); if (simplePropertyNames.length > 0) { @@ -246,6 +246,10 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { addParameter0(columnName, "'" + parameter + "'", parameters); } + private void addTimestampParameter(String columnName, Date parameter, StringBuilder parameters) { + addParameter0(columnName, "'" + parameter + "'::timestamp", parameters); + } + private void addEnumParameter(String columnName, Enum parameter, StringBuilder parameters) { addParameter0(columnName, "" + parameter.ordinal(), parameters); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.