fix: show nicer error messages when certificate request timed out.

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

diff --git a/src/org/cacert/gigi/database/SQLFileManager.java b/src/org/cacert/gigi/database/SQLFileManager.java
index e51e52165d5c0c986623dd5f245c008601a3dd40..400884af484d15f3d04310b883ae996d693b3a36 100644 (file)
--- a/src/org/cacert/gigi/database/SQLFileManager.java
+++ b/src/org/cacert/gigi/database/SQLFileManager.java
@@ -12,11 +12,11 @@ public class SQLFileManager {
 
     public static enum ImportType {
         /**
-         * Execute Script as-as
+         * Execute Script as-is
          */
         PRODUCTION,
         /**
-         * Execute Script, but changing Engine=InnoDB to Engine=Memory
+         * Execute Script, but change Engine=InnoDB to Engine=Memory
          */
         TEST,
         /**
@@ -27,9 +27,10 @@ public class SQLFileManager {
 
     public static void addFile(Statement stmt, InputStream f, ImportType type) throws IOException, SQLException {
         String sql = readFile(f);
-        sql = sql.replaceAll("--[^\n]+\n", "\n");
+        sql = sql.replaceAll("--[^\n]*\n", "\n");
+        sql = sql.replaceAll("#[^\n]*\n", "\n");
         String[] stmts = sql.split(";");
-        Pattern p = Pattern.compile("\\s*DROP TABLE IF EXISTS `([^`]+)`");
+        Pattern p = Pattern.compile("\\s*DROP TABLE IF EXISTS \"([^\"]+)\"");
         for (String string : stmts) {
             Matcher m = p.matcher(string);
             string = string.trim();
@@ -39,8 +40,9 @@ public class SQLFileManager {
             if ((string.contains("profiles") || string.contains("cacerts")) && type != ImportType.PRODUCTION) {
                 continue;
             }
+            string = DatabaseConnection.preprocessQuery(string);
             if (m.matches() && type == ImportType.TRUNCATE) {
-                String sql2 = "TRUNCATE `" + m.group(1) + "`";
+                String sql2 = "DELETE FROM \"" + m.group(1) + "\"";
                 stmt.addBatch(sql2);
                 continue;
             }