From 7fbbd6d52a274e778580b1034701177eab4fce54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Sun, 29 Nov 2015 20:12:08 +0000
Subject: [PATCH] - improved database update (should affect those servers using
an intermediate version)
---
src/fr/inrialpes/exmo/align/service/SQLCache.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/fr/inrialpes/exmo/align/service/SQLCache.java b/src/fr/inrialpes/exmo/align/service/SQLCache.java
index 831dee33..13be632b 100644
--- a/src/fr/inrialpes/exmo/align/service/SQLCache.java
+++ b/src/fr/inrialpes/exmo/align/service/SQLCache.java
@@ -1308,6 +1308,7 @@ public class SQLCache extends VolatilCache implements Cache {
ResultSet rs = st.executeQuery("SELECT version FROM server WHERE port='port'");
rs.next();
int version = rs.getInt("version") ;
+ logger.debug( "Current version: {}", version );
if ( version < VERSION ) {
if ( version >= 302 ) {
if ( version < 310 ) {
@@ -1475,11 +1476,15 @@ public class SQLCache extends VolatilCache implements Cache {
}
if ( version < 480 ) {
logger.info("Upgrading to version 4.8");
- logger.info("Creating EDOAL tables");
- initEDOALTables( createStatement() );
- logger.info("Adding reltype attribute");
- st.executeUpdate("ALTER TABLE alignment ADD reltype VARCHAR(255);");
- st.executeUpdate("ALTER TABLE alignment ADD conftype VARCHAR(255);");
+ if ( version < 471 ) {
+ logger.info("Creating EDOAL tables");
+ initEDOALTables( createStatement() );
+ }
+ if ( version < 472 ) {
+ logger.info("Adding reltype attribute");
+ st.executeUpdate("ALTER TABLE alignment ADD reltype VARCHAR(255);");
+ st.executeUpdate("ALTER TABLE alignment ADD conftype VARCHAR(255);");
+ }
}
// ALTER version
st.executeUpdate("UPDATE server SET version='"+VERSION+"'");
--
GitLab