X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fdatabase%2FSQLFileManager.java;h=9f563dbb476062c175928243c16b5bdb5a8326a4;hb=403986318a8050e89a192fa3f9c3b342d9043300;hp=676d9e66e129f992217bf74ed92c0ec8ac57e3be;hpb=53a66914a544d38be7e626aec2e74542745d4fda;p=gigi.git

diff --git a/src/org/cacert/gigi/database/SQLFileManager.java b/src/org/cacert/gigi/database/SQLFileManager.java
index 676d9e66..9f563dbb 100644
--- 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,17 +27,22 @@ 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();
             if (string.equals("")) {
                 continue;
             }
+            if ((string.contains("profiles") || string.contains("cacerts") || string.contains("cats_type") || string.contains("countryIsoCode")) && type == ImportType.TRUNCATE) {
+                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;
             }
@@ -56,6 +61,6 @@ public class SQLFileManager {
         while ((len = f.read(buf)) > 0) {
             baos.write(buf, 0, len);
         }
-        return new String(baos.toByteArray());
+        return new String(baos.toByteArray(), "UTF-8");
     }
 }