[Echobase-commits] 01/01: La version 3.902 permet de lancer enfin echobase avec topia 3 sur tout type de base

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 034ec06f0008d4769a4569b6fde6c39cfb9dfdb6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 28 13:12:26 2016 +0200 La version 3.902 permet de lancer enfin echobase avec topia 3 sur tout type de base --- .../EchoBaseInternalTopiaApplicationContext.java | 2 +- .../EchoBaseUserTopiaApplicationContext.java | 2 +- .../WorkingDbMigrationCallBackForVersion3_901.java | 1 + ...WorkingDbMigrationCallBackForVersion3_902.java} | 11 ++--- .../migration/workingDb/h2/3.902-0-fix-types.sql | 56 ++++++++++++++++++++++ .../pg/3.901-0-add-importFile_importId-table.sql | 2 + .../3.901-1-add-importFile-importText-column.sql | 1 + .../migration/workingDb/pg/3.902-0-fix-types.sql | 56 ++++++++++++++++++++++ echobase-domain/src/main/xmi/echobase.properties | 2 +- 9 files changed, 123 insertions(+), 10 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalTopiaApplicationContext.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalTopiaApplicationContext.java index a34e0a2..5064b94 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalTopiaApplicationContext.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalTopiaApplicationContext.java @@ -41,7 +41,7 @@ public class EchoBaseInternalTopiaApplicationContext extends AbstractEchoBaseInt hibernateExtraProperties.put(Environment.SHOW_SQL, Boolean.FALSE.toString()); hibernateExtraProperties.put(Environment.FORMAT_SQL, Boolean.FALSE.toString()); hibernateExtraProperties.put(Environment.USE_SQL_COMMENTS, Boolean.FALSE.toString()); - hibernateExtraProperties.put(Environment.DIALECT, FixedH2Dialect.class.getName()); + hibernateExtraProperties.put(Environment.DIALECT, driverType.getDialectClass().getName()); configuration.setHibernateExtraConfiguration(hibernateExtraProperties); diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java index dd50fb1..4cb6a45 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java @@ -92,7 +92,7 @@ public class EchoBaseUserTopiaApplicationContext extends AbstractEchoBaseUserTop hibernateExtraProperties.put(Environment.SHOW_SQL, Boolean.FALSE.toString()); hibernateExtraProperties.put(Environment.FORMAT_SQL, Boolean.FALSE.toString()); hibernateExtraProperties.put(Environment.USE_SQL_COMMENTS, Boolean.FALSE.toString()); - hibernateExtraProperties.put(Environment.DIALECT, FixedH2Dialect.class.getName()); + hibernateExtraProperties.put(Environment.DIALECT, driverType.getDialectClass().getName()); configuration.setHibernateExtraConfiguration(hibernateExtraProperties); diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_901.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_901.java index 4509f3c..0dfc9fe 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_901.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_901.java @@ -31,6 +31,7 @@ public class WorkingDbMigrationCallBackForVersion3_901 extends WorkingDbMigratio addScript("3.901-2-drop-importLog_importId-table.sql", queries); addScript("3.901-3-drop-importLog-voyageId-notNull.sql", queries); + } } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_901.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_902.java similarity index 60% copy from echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_901.java copy to echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_902.java index 4509f3c..768ecb7 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_901.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_902.java @@ -12,11 +12,11 @@ import java.util.List; * * @author Tony Chemit - chemit@codelutin.com */ -public class WorkingDbMigrationCallBackForVersion3_901 extends WorkingDbMigrationCallBackForVersionSupport { +public class WorkingDbMigrationCallBackForVersion3_902 extends WorkingDbMigrationCallBackForVersionSupport { @Override public Version getVersion() { - return Versions.valueOf("3.901"); + return Versions.valueOf("3.902"); } @Override @@ -25,11 +25,8 @@ public class WorkingDbMigrationCallBackForVersion3_901 extends WorkingDbMigratio boolean showSql, boolean showProgression) throws TopiaException { - // rethink import files (see https://forge.codelutin.com/issues/8170) - addSpecificScript("3.901-0-add-importFile_importId-table.sql", queries); - addSpecificScript("3.901-1-add-importFile-importText-column.sql", queries); - addScript("3.901-2-drop-importLog_importId-table.sql", queries); - addScript("3.901-3-drop-importLog-voyageId-notNull.sql", queries); + // fix database hibernate type validation + addSpecificScript("3.902-0-fix-types.sql", queries); } diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/3.902-0-fix-types.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/3.902-0-fix-types.sql new file mode 100644 index 0000000..936efaa --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/3.902-0-fix-types.sql @@ -0,0 +1,56 @@ +ALTER TABLE PUBLIC.ACOUSTICINSTRUMENT ALTER COLUMN TRANSDUCERDEPTH REAL; +ALTER TABLE PUBLIC.ACOUSTICINSTRUMENT ALTER COLUMN TRANSDUCERELEVATION REAL; +ALTER TABLE PUBLIC.ACOUSTICINSTRUMENT ALTER COLUMN TRANSDUCERAZIMUTH REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSCEIVERACQUISITIONABSORPTION REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSCEIVERACQUISITIONGAIN REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSCEIVERACQUISITIONPULSELENGTH REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSCEIVERACQUISITIONSACORRECTION REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSDUCERACQUISITIONBEAMANGLEALONGSHIP REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSDUCERACQUISITIONBEAMANGLEATHWARTSHIP REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSDUCERACQUISITIONPSI REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSCEIVERACQUISITIONPOWER REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN DIGITTHRESHOLD REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN TRANSCEIVERPROCESSINGABSORPTION REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN TRANSCEIVERPROCESSINGGAIN REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN TRANSCEIVERPROCESSINGSACORRECTION REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN TRANSDUCERPROCESSINGBEAMANGLEALONGSHIP REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN TRANSDUCERPROCESSINGBEAMANGLEATHWARTSHIP REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN TRANSDUCERPROCESSINGPSI REAL; +ALTER TABLE PUBLIC.DATAMETADATA ALTER COLUMN ADDOFFSET REAL; +ALTER TABLE PUBLIC.IMPACTE ALTER COLUMN MEASUREMENTBINSIZE REAL; +ALTER TABLE PUBLIC.LENGTHAGEKEY ALTER COLUMN LENGTH REAL; +ALTER TABLE PUBLIC.LENGTHAGEKEY ALTER COLUMN PERCENTATAGE REAL; +ALTER TABLE PUBLIC.LENGTHWEIGHTKEY ALTER COLUMN APARAMETER REAL; +ALTER TABLE PUBLIC.LENGTHWEIGHTKEY ALTER COLUMN BPARAMETER REAL; +ALTER TABLE PUBLIC.OPERATION ALTER COLUMN GEARSHOOTINGENDLATITUDE REAL; +ALTER TABLE PUBLIC.OPERATION ALTER COLUMN GEARSHOOTINGENDLONGITUDE REAL; +ALTER TABLE PUBLIC.OPERATION ALTER COLUMN GEARSHOOTINGSTARTLATITUDE REAL; +ALTER TABLE PUBLIC.OPERATION ALTER COLUMN GEARSHOOTINGSTARTLONGITUDE REAL; +ALTER TABLE PUBLIC.OPERATION ALTER COLUMN MIDHAULLATITUDE REAL; +ALTER TABLE PUBLIC.OPERATION ALTER COLUMN MIDHAULLONGITUDE REAL; +ALTER TABLE PUBLIC.SAMPLE ALTER COLUMN SAMPLEWEIGHT REAL; +ALTER TABLE PUBLIC.SAMPLEDATA ALTER COLUMN DATAVALUE REAL; +ALTER TABLE PUBLIC.STRATA ALTER COLUMN MAXLATITUDE REAL; +ALTER TABLE PUBLIC.STRATA ALTER COLUMN MINLATITUDE REAL; +ALTER TABLE PUBLIC.STRATA ALTER COLUMN MINLONGITUDE REAL; +ALTER TABLE PUBLIC.STRATA ALTER COLUMN MAXLONGITUDE REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN GEOSPATIALLATMAX REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN GEOSPATIALLATMIN REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN GEOSPATIALLONMAX REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN GEOSPATIALLONMIN REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN GEOSPATIALVERTICALMAX REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN GEOSPATIALVERTICALMIN REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN BINSIZEPINGAXIS REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN A REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN B REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN R2 REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN MINDEPTH REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN MINFISHLENGTH REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN MAXDEPTH REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN MAXFISHLENGTH REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN AVERAGEDEPTH REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN AVERAGEFISHLENGTH REAL; +ALTER TABLE PUBLIC.VESSEL ALTER COLUMN LENGTH REAL; +ALTER TABLE PUBLIC.VESSEL ALTER COLUMN TONNAGE REAL; + +ALTER TABLE PUBLIC.IMPORTFILE ALTER COLUMN TOPIACREATEDATE TIMESTAMP; \ No newline at end of file diff --git a/echobase-domain/src/main/resources/migration/workingDb/pg/3.901-0-add-importFile_importId-table.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/3.901-0-add-importFile_importId-table.sql new file mode 100644 index 0000000..6b5a880 --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/3.901-0-add-importFile_importId-table.sql @@ -0,0 +1,2 @@ +CREATE TABLE IMPORTFILE_IMPORTID (owner character varying(255) NOT NULL, importId character varying(255) NOT NULL UNIQUE, lineNumber INTEGER NOT NULL); +ALTER TABLE IMPORTFILE_IMPORTID ADD CONSTRAINT FK_IMPORTFILE_IMPORTID FOREIGN KEY(owner) REFERENCES importfile(TOPIAID); diff --git a/echobase-domain/src/main/resources/migration/workingDb/pg/3.901-1-add-importFile-importText-column.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/3.901-1-add-importFile-importText-column.sql new file mode 100644 index 0000000..da4721b --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/3.901-1-add-importFile-importText-column.sql @@ -0,0 +1 @@ +ALTER TABLE IMPORTFILE ADD importText text; \ No newline at end of file diff --git a/echobase-domain/src/main/resources/migration/workingDb/pg/3.902-0-fix-types.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/3.902-0-fix-types.sql new file mode 100644 index 0000000..8fe0890 --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/3.902-0-fix-types.sql @@ -0,0 +1,56 @@ +ALTER TABLE PUBLIC.ACOUSTICINSTRUMENT ALTER COLUMN TRANSDUCERDEPTH TYPE REAL; +ALTER TABLE PUBLIC.ACOUSTICINSTRUMENT ALTER COLUMN TRANSDUCERELEVATION TYPE REAL; +ALTER TABLE PUBLIC.ACOUSTICINSTRUMENT ALTER COLUMN TRANSDUCERAZIMUTH TYPE REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSCEIVERACQUISITIONABSORPTION TYPE REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSCEIVERACQUISITIONGAIN TYPE REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSCEIVERACQUISITIONPULSELENGTH TYPE REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSCEIVERACQUISITIONSACORRECTION TYPE REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSDUCERACQUISITIONBEAMANGLEALONGSHIP TYPE REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSDUCERACQUISITIONBEAMANGLEATHWARTSHIP TYPE REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSDUCERACQUISITIONPSI TYPE REAL; +ALTER TABLE PUBLIC.DATAACQUISITION ALTER COLUMN TRANSCEIVERACQUISITIONPOWER TYPE REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN DIGITTHRESHOLD TYPE REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN TRANSCEIVERPROCESSINGABSORPTION TYPE REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN TRANSCEIVERPROCESSINGGAIN TYPE REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN TRANSCEIVERPROCESSINGSACORRECTION TYPE REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN TRANSDUCERPROCESSINGBEAMANGLEALONGSHIP TYPE REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN TRANSDUCERPROCESSINGBEAMANGLEATHWARTSHIP TYPE REAL; +ALTER TABLE PUBLIC.DATAPROCESSING ALTER COLUMN TRANSDUCERPROCESSINGPSI TYPE REAL; +ALTER TABLE PUBLIC.DATAMETADATA ALTER COLUMN ADDOFFSET TYPE REAL; +ALTER TABLE PUBLIC.IMPACTE ALTER COLUMN MEASUREMENTBINSIZE TYPE REAL; +ALTER TABLE PUBLIC.LENGTHAGEKEY ALTER COLUMN LENGTH TYPE REAL; +ALTER TABLE PUBLIC.LENGTHAGEKEY ALTER COLUMN PERCENTATAGE TYPE REAL; +ALTER TABLE PUBLIC.LENGTHWEIGHTKEY ALTER COLUMN APARAMETER TYPE REAL; +ALTER TABLE PUBLIC.LENGTHWEIGHTKEY ALTER COLUMN BPARAMETER TYPE REAL; +ALTER TABLE PUBLIC.OPERATION ALTER COLUMN GEARSHOOTINGENDLATITUDE TYPE REAL; +ALTER TABLE PUBLIC.OPERATION ALTER COLUMN GEARSHOOTINGENDLONGITUDE TYPE REAL; +ALTER TABLE PUBLIC.OPERATION ALTER COLUMN GEARSHOOTINGSTARTLATITUDE TYPE REAL; +ALTER TABLE PUBLIC.OPERATION ALTER COLUMN GEARSHOOTINGSTARTLONGITUDE TYPE REAL; +ALTER TABLE PUBLIC.OPERATION ALTER COLUMN MIDHAULLATITUDE TYPE REAL; +ALTER TABLE PUBLIC.OPERATION ALTER COLUMN MIDHAULLONGITUDE TYPE REAL; +ALTER TABLE PUBLIC.SAMPLE ALTER COLUMN SAMPLEWEIGHT TYPE REAL; +ALTER TABLE PUBLIC.SAMPLEDATA ALTER COLUMN DATAVALUE TYPE REAL; +ALTER TABLE PUBLIC.STRATA ALTER COLUMN MAXLATITUDE TYPE REAL; +ALTER TABLE PUBLIC.STRATA ALTER COLUMN MINLATITUDE TYPE REAL; +ALTER TABLE PUBLIC.STRATA ALTER COLUMN MINLONGITUDE TYPE REAL; +ALTER TABLE PUBLIC.STRATA ALTER COLUMN MAXLONGITUDE TYPE REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN GEOSPATIALLATMAX TYPE REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN GEOSPATIALLATMIN TYPE REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN GEOSPATIALLONMAX TYPE REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN GEOSPATIALLONMIN TYPE REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN GEOSPATIALVERTICALMAX TYPE REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN GEOSPATIALVERTICALMIN TYPE REAL; +ALTER TABLE PUBLIC.TRANSECT ALTER COLUMN BINSIZEPINGAXIS TYPE REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN A TYPE REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN B TYPE REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN R2 TYPE REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN MINDEPTH TYPE REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN MINFISHLENGTH TYPE REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN MAXDEPTH TYPE REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN MAXFISHLENGTH TYPE REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN AVERAGEDEPTH TYPE REAL; +ALTER TABLE PUBLIC.TSPARAMETERS ALTER COLUMN AVERAGEFISHLENGTH TYPE REAL; +ALTER TABLE PUBLIC.VESSEL ALTER COLUMN LENGTH TYPE REAL; +ALTER TABLE PUBLIC.VESSEL ALTER COLUMN TONNAGE TYPE REAL; + +ALTER TABLE PUBLIC.IMPORTFILE ALTER COLUMN TOPIACREATEDATE TYPE TIMESTAMP; \ No newline at end of file diff --git a/echobase-domain/src/main/xmi/echobase.properties b/echobase-domain/src/main/xmi/echobase.properties index 7ee35b3..3c6ec6d 100644 --- a/echobase-domain/src/main/xmi/echobase.properties +++ b/echobase-domain/src/main/xmi/echobase.properties @@ -22,7 +22,7 @@ model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true #model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=3.901 +model.tagValue.version=3.902 model.tagValue.generatePropertyChangeSupport=false model.tagValue.generateBooleanGetMethods=false model.tagValue.indexForeignKeys=true -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.