Author: tchemit Date: 2013-12-16 23:20:26 +0100 (Mon, 16 Dec 2013) New Revision: 915 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/915 Log: remove migration 2.5 + try some fix on sql migration Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java 2013-12-16 22:12:34 UTC (rev 914) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_5_1.java 2013-12-16 22:20:26 UTC (rev 915) @@ -64,7 +64,7 @@ if (spatialAware) { - // repass postgis scripts (http://forge.codelutin.com/issues/3672) + // repass postgis scripts (http://forge.codelutin.com/issues/4018) updatePostgis(queries); } } @@ -72,9 +72,5 @@ protected void updatePostgis(List<String> queries) { queries.add(EchoBaseIOUtil.loadScript(EchoBasePersistenceContext.POSTGIS_STRUCTURE_SQL)); queries.add(EchoBaseIOUtil.loadScript(EchoBasePersistenceContext.POSTGIS_VIEW_SQL)); - - // fix http://forge.codelutin.com/issues/3973 - queries.add("update echobase_operation_spatial set operationname = (select op.id from operation op where op.topiaid = operationid);"); - } } Modified: trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion =================================================================== --- trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion 2013-12-16 22:12:34 UTC (rev 914) +++ trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion 2013-12-16 22:20:26 UTC (rev 915) @@ -1,3 +1,2 @@ fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion2_2 -fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion2_5 fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion2_5_1 \ No newline at end of file