add: allow manually triggered email reping. (addresses #5)

[gigi.git] / src / org / cacert / gigi / database / DatabaseConnection.java

diff --git a/src/org/cacert/gigi/database/DatabaseConnection.java b/src/org/cacert/gigi/database/DatabaseConnection.java
index c85b5348d6e253c2dd96d1219723b9913751db23..f1c1c01102e126677e373c42edc864270c512de6 100644 (file)
--- a/src/org/cacert/gigi/database/DatabaseConnection.java
+++ b/src/org/cacert/gigi/database/DatabaseConnection.java
@@ -99,7 +99,7 @@ public class DatabaseConnection {
 
     }
 
-    public static final int CURRENT_SCHEMA_VERSION = 9;
+    public static final int CURRENT_SCHEMA_VERSION = 10;
 
     public static final int CONNECTION_TIMEOUT = 24 * 60 * 60;
 
@@ -222,12 +222,7 @@ public class DatabaseConnection {
             Statement s = getInstance().c.createStatement();
             try {
                 while (version < CURRENT_SCHEMA_VERSION) {
-                    try (InputStream resourceAsStream = DatabaseConnection.class.getResourceAsStream("upgrade/from_" + version + ".sql")) {
-                        if (resourceAsStream == null) {
-                            throw new Error("Upgrade script from version " + version + " was not found.");
-                        }
-                        SQLFileManager.addFile(s, resourceAsStream, ImportType.PRODUCTION);
-                    }
+                    addUpgradeScript(Integer.toString(version), s);
                     version++;
                 }
                 s.addBatch("UPDATE \"schemeVersion\" SET version='" + version + "'");
@@ -244,6 +239,15 @@ public class DatabaseConnection {
         }
     }
 
+    private static void addUpgradeScript(String version, Statement s) throws Error, IOException, SQLException {
+        try (InputStream resourceAsStream = DatabaseConnection.class.getResourceAsStream("upgrade/from_" + version + ".sql")) {
+            if (resourceAsStream == null) {
+                throw new Error("Upgrade script from version " + version + " was not found.");
+            }
+            SQLFileManager.addFile(s, resourceAsStream, ImportType.PRODUCTION);
+        }
+    }
+
     public static final String preprocessQuery(String originalQuery) {
         originalQuery = originalQuery.replace('`', '"');
         if (originalQuery.matches("^INSERT INTO [^ ]+ SET .*")) {