This is an automated email from the git hooks/post-receive script. New commit to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit f168873939707f43a7734e504368cdcfc0786b18 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 11 09:03:26 2016 +0200 Fix H2 dialect and fix also test databases --- .../ifremer/echobase/entities/FixedH2Dialect.java | 16 ++++++---------- .../echobase-catches-and-voyage-result.h2.db.gz | Bin 657421 -> 627546 bytes .../import-data/echobase-catches.h2.db.gz | Bin 624390 -> 594902 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 179274 -> 190649 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 129991 -> 144051 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 625297 -> 597481 bytes .../import-data/echobase-operation.h2.db.gz | Bin 320307 -> 324995 bytes 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/FixedH2Dialect.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/FixedH2Dialect.java index 10e2366..532c0f2 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/FixedH2Dialect.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/FixedH2Dialect.java @@ -26,23 +26,19 @@ import java.sql.Types; /** * Override the H2Dialect to fix detected wrong value. - * + * * org.nuiton.topia.persistence.SchemaValidationTopiaException: * Wrong column type in ECHOBASE.PUBLIC.ENTITYMODIFICATIONLOG for column modificationText. Found: varchar, expected: longvarchar - * + * * org.nuiton.topia.persistence.SchemaValidationTopiaException: * Wrong column type in ECHOBASE.PUBLIC.ACOUSTICINSTRUMENT for column transducerDepth. Found: double, expected: float - * - * org.nuiton.topia.persistence.SchemaValidationTopiaException: - * Wrong column type in ECHOBASE.PUBLIC.IMPORTFILE for column topiaCreateDate. Found: date, expected: timestamp */ public class FixedH2Dialect extends H2Dialect { - public FixedH2Dialect() { - registerColumnType( Types.LONGVARCHAR, String.format("varchar(%d)", Integer.MAX_VALUE) ); - registerColumnType( Types.FLOAT, "double" ); - registerColumnType( Types.TIMESTAMP, "date" ); - } + public FixedH2Dialect() { + registerColumnType(Types.LONGVARCHAR, String.format("varchar(%d)", Integer.MAX_VALUE)); + registerColumnType(Types.FLOAT, "real"); + } } diff --git a/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz index 0799921..e412968 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-catches-and-voyage-result.h2.db.gz differ diff --git a/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz index dabf906..69618d4 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-catches.h2.db.gz differ diff --git a/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz index b58194e..21a0707 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-commonData.h2.db.gz differ diff --git a/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz index 7d3dc1b..35e7016 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-nodata.h2.db.gz differ diff --git a/echobase-services/src/test/resources/import-data/echobase-operation-total-samples.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-operation-total-samples.h2.db.gz index f6d3e09..fab2d06 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-operation-total-samples.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-operation-total-samples.h2.db.gz differ diff --git a/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz b/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz index 110cc75..560d01d 100644 Binary files a/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz and b/echobase-services/src/test/resources/import-data/echobase-operation.h2.db.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.