This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit c846e804bec721237d35d828c22f2c7672c4b706 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 30 09:59:10 2014 +0100 ajout migration 2.7.2 + normalisation des autres scripts de migration --- .../workingDb/MigrationCallBackForVersion2_7_2.java | 13 +++++++++---- .../2.5.1-0-postgis-structure.sql} | 0 .../2.5.1-1-postgis-view.sql} | 0 .../2.6-0-postgis-view.sql} | 0 .../2.6.1-0-postgis-structure.sql} | 0 .../2.7.2-0-postgis-view.sql} | 0 .../workingDb/h2/2.7.2-1-add-importFile-entity.sql | 3 +++ .../workingDb/pg/2.7.2-1-add-importFile-entity.sql | 3 +++ 8 files changed, 15 insertions(+), 4 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java index 785c459..fc16c8c 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java @@ -1,7 +1,6 @@ package fr.ifremer.echobase.persistence.migration.workingDb; import fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext; -import fr.ifremer.echobase.io.EchoBaseIOUtil; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.Version; @@ -15,8 +14,6 @@ import java.util.List; */ public class MigrationCallBackForVersion2_7_2 extends MigrationCallBackForVersion { - public static final String POSTGIS_STRUCTURE_SQL = "/migration/postgis-view-2.7.2.sql"; - @Override public Version getVersion() { return new Version("2.7.2"); @@ -35,10 +32,18 @@ public class MigrationCallBackForVersion2_7_2 extends MigrationCallBackForVersio // fix reload TotalSampleView (see https://forge.codelutin.com/issues/6318) updatePostgis(queries); } + + // add FileImport entity (see https://forge.codelutin.com/issues/6367) + addFileImportEntity(tx, queries); + } protected void updatePostgis(List<String> queries) { - queries.add(EchoBaseIOUtil.loadScript(POSTGIS_STRUCTURE_SQL)); + addScript("2.7.2-0-postgis-view.sql", queries); + } + + protected void addFileImportEntity(EchoBaseUserTopiaPersistenceContext tx, List<String> queries) { + addSpecificScript(tx, "2.7.2-1-add-importFile-entity.sql", queries); } } \ No newline at end of file diff --git a/echobase-domain/src/main/resources/migration/postgis-structure-2.5.1.sql b/echobase-domain/src/main/resources/migration/workingDb/2.5.1-0-postgis-structure.sql similarity index 100% rename from echobase-domain/src/main/resources/migration/postgis-structure-2.5.1.sql rename to echobase-domain/src/main/resources/migration/workingDb/2.5.1-0-postgis-structure.sql diff --git a/echobase-domain/src/main/resources/migration/postgis-view-2.5.1.sql b/echobase-domain/src/main/resources/migration/workingDb/2.5.1-1-postgis-view.sql similarity index 100% rename from echobase-domain/src/main/resources/migration/postgis-view-2.5.1.sql rename to echobase-domain/src/main/resources/migration/workingDb/2.5.1-1-postgis-view.sql diff --git a/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql b/echobase-domain/src/main/resources/migration/workingDb/2.6-0-postgis-view.sql similarity index 100% rename from echobase-domain/src/main/resources/migration/postgis-view-2.6.sql rename to echobase-domain/src/main/resources/migration/workingDb/2.6-0-postgis-view.sql diff --git a/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql b/echobase-domain/src/main/resources/migration/workingDb/2.6.1-0-postgis-structure.sql similarity index 100% rename from echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql rename to echobase-domain/src/main/resources/migration/workingDb/2.6.1-0-postgis-structure.sql diff --git a/echobase-domain/src/main/resources/migration/postgis-view-2.7.2.sql b/echobase-domain/src/main/resources/migration/workingDb/2.7.2-0-postgis-view.sql similarity index 100% rename from echobase-domain/src/main/resources/migration/postgis-view-2.7.2.sql rename to echobase-domain/src/main/resources/migration/workingDb/2.7.2-0-postgis-view.sql diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/2.7.2-1-add-importFile-entity.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/2.7.2-1-add-importFile-entity.sql new file mode 100644 index 0000000..b407135 --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/2.7.2-1-add-importFile-entity.sql @@ -0,0 +1,3 @@ +CREATE TABLE IMPORTFILE( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, name VARCHAR(255), file BLOB, importLog VARCHAR(255)); +ALTER TABLE IMPORTFILE ADD CONSTRAINT PK_IMPORTFILE PRIMARY KEY(TOPIAID); +ALTER TABLE IMPORTFILE ADD CONSTRAINT FK_IMPORTFILE_IMPORTLOG FOREIGN KEY(IMPORTLOG) REFERENCES IMPORTLOG(TOPIAID); diff --git a/echobase-domain/src/main/resources/migration/workingDb/pg/2.7.2-1-add-importFile-entity.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/2.7.2-1-add-importFile-entity.sql new file mode 100644 index 0000000..969b487 --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/2.7.2-1-add-importFile-entity.sql @@ -0,0 +1,3 @@ +CREATE TABLE IMPORTFILE( topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, name character varying(255), file OID, importLog character varying(255)); +ALTER TABLE IMPORTFILE ADD CONSTRAINT PK_IMPORTFILE PRIMARY KEY(TOPIAID); +ALTER TABLE IMPORTFILE ADD CONSTRAINT FK_IMPORTFILE_IMPORTLOG FOREIGN KEY(IMPORTLOG) REFERENCES IMPORTLOG(TOPIAID); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.