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 33d235eeec69782e2f2ef04d248a8a09c116c35c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 30 09:58:35 2014 +0100 normalisation des emplacements de fichiers de migration --- .../internalDb/MigrationCallBackForVersion.java | 14 ++++++++ .../workingDb/MigrationCallBackForVersion.java | 39 ++++++++++++++++++++++ .../workingDb/MigrationCallBackForVersion2_2.java | 3 +- .../MigrationCallBackForVersion2_5_1.java | 9 ++--- .../workingDb/MigrationCallBackForVersion2_6.java | 5 +-- .../MigrationCallBackForVersion2_6_1.java | 5 +-- 6 files changed, 58 insertions(+), 17 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java index c4c3252..7aafd1e 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion.java @@ -22,8 +22,11 @@ package fr.ifremer.echobase.persistence.migration.internalDb; */ import fr.ifremer.echobase.entities.EchoBaseInternalTopiaPersistenceContext; +import fr.ifremer.echobase.io.EchoBaseIOUtil; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; +import java.util.List; + /** * Base migration support for a internal db. * @@ -32,4 +35,15 @@ import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; */ public abstract class MigrationCallBackForVersion extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion<EchoBaseInternalTopiaPersistenceContext> { + protected void addScript(String script, List<String> queries) { + + String scriptPath = getMigrationPath(script); + queries.add(EchoBaseIOUtil.loadScript(scriptPath)); + + } + + protected String getMigrationPath(String script) { + return "/migration/internalDb/" + script; + } + } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java index f444641..8e20f24 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion.java @@ -22,8 +22,11 @@ package fr.ifremer.echobase.persistence.migration.workingDb; */ import fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext; +import fr.ifremer.echobase.io.EchoBaseIOUtil; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; +import java.util.List; + /** * Base migration support for a working db. * @@ -32,4 +35,40 @@ import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; */ public abstract class MigrationCallBackForVersion extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion<EchoBaseUserTopiaPersistenceContext> { + protected void addScript(String script, List<String> queries) { + + String scriptPath = getMigrationPath(script); + queries.add(EchoBaseIOUtil.loadScript(scriptPath)); + + } + + protected void addSpecificScript(EchoBaseUserTopiaPersistenceContext tx, String script, List<String> queries) { + + String scriptPath = getSpecificMigrationPath(tx, script); + queries.add(EchoBaseIOUtil.loadScript(scriptPath)); + + } + + protected String getMigrationPath(String script) { + return "/migration/workingDb/" + script; + } + + protected String getSpecificMigrationPath(EchoBaseUserTopiaPersistenceContext tx, String script) { + + String path; + + if (tx.isPostgresql()) { + + path = getMigrationPath("pg/" + script); + + } else { + + path = getMigrationPath("h2/" + script); + + } + + return path; + + } + } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java index 8e956a8..705a6cc 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_2.java @@ -38,8 +38,7 @@ import java.util.List; public class MigrationCallBackForVersion2_2 extends MigrationCallBackForVersion { /** Logger. */ - private static final Log log = - LogFactory.getLog(MigrationCallBackForVersion2_2.class); + private static final Log log = LogFactory.getLog(MigrationCallBackForVersion2_2.class); @Override public Version getVersion() { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java index 8dfd646..a858b68 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java @@ -22,7 +22,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; @@ -36,10 +35,6 @@ import java.util.List; */ public class MigrationCallBackForVersion2_5_1 extends MigrationCallBackForVersion { - public static final String POSTGIS_STRUCTURE_SQL = "/migration/postgis-structure-2.5.1.sql"; - - public static final String POSTGIS_VIEW_SQL = "/migration/postgis-view-2.5.1.sql"; - @Override public Version getVersion() { return new Version("2.5.1"); @@ -61,7 +56,7 @@ public class MigrationCallBackForVersion2_5_1 extends MigrationCallBackForVersio } protected void updatePostgis(List<String> queries) { - queries.add(EchoBaseIOUtil.loadScript(POSTGIS_STRUCTURE_SQL)); - queries.add(EchoBaseIOUtil.loadScript(POSTGIS_VIEW_SQL)); + addScript("2.5.1-0-postgis-structure.sql", queries); + addScript("2.5.1-1-postgis-view.sql", queries); } } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java index d47a06d..87479cf 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6.java @@ -22,7 +22,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.topia.persistence.support.TopiaSqlQuery; import org.nuiton.util.Version; @@ -41,8 +40,6 @@ import java.util.List; */ public class MigrationCallBackForVersion2_6 extends MigrationCallBackForVersion { - public static final String POSTGIS_VIEW_SQL = "/migration/postgis-view-2.6.sql"; - @Override public Version getVersion() { return new Version("2.6"); @@ -67,7 +64,7 @@ public class MigrationCallBackForVersion2_6 extends MigrationCallBackForVersion } protected void updatePostgis(List<String> queries) { - queries.add(EchoBaseIOUtil.loadScript(POSTGIS_VIEW_SQL)); + addScript("2.6-0-postgis-view.sql", queries); } protected void updateDataMedataReferential(EchoBaseUserTopiaPersistenceContext tx, List<String> queries) { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java index e6f63b9..f38c3da 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java @@ -22,7 +22,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; @@ -36,8 +35,6 @@ import java.util.List; */ public class MigrationCallBackForVersion2_6_1 extends MigrationCallBackForVersion { - public static final String POSTGIS_STRUCTURE_SQL = "/migration/postgis-structure-2.6.1.sql"; - @Override public Version getVersion() { return new Version("2.6.1"); @@ -59,7 +56,7 @@ public class MigrationCallBackForVersion2_6_1 extends MigrationCallBackForVersio } protected void updatePostgis(List<String> queries) { - queries.add(EchoBaseIOUtil.loadScript(POSTGIS_STRUCTURE_SQL)); + addScript("2.6.1-0-postgis-structure.sql", queries); } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.