UPD: change "email"-constructor to match the syntax of the

[gigi.git] / util / org / cacert / gigi / util / DatabaseManager.java

diff --git a/util/org/cacert/gigi/util/DatabaseManager.java b/util/org/cacert/gigi/util/DatabaseManager.java
index 457e11ff27b0c42a3a92e89f42422eba917aedef..c97e2e864631cc67d8a4ec32eed47d76be8554b9 100644 (file)
--- a/util/org/cacert/gigi/util/DatabaseManager.java
+++ b/util/org/cacert/gigi/util/DatabaseManager.java
@@ -36,6 +36,7 @@ public class DatabaseManager {
     public static void run(String[] args, boolean truncate) throws ClassNotFoundException, SQLException, IOException {
         Class.forName(args[0]);
         Connection conn = DriverManager.getConnection(args[1], args[2], args[3]);
+        conn.setAutoCommit(false);
         Statement stmt = conn.createStatement();
         addFile(stmt, new File("doc/tableStructure.sql"), truncate);
         File localData = new File("doc/sampleData.sql");
@@ -43,11 +44,13 @@ public class DatabaseManager {
             addFile(stmt, localData, false);
         }
         stmt.executeBatch();
+        conn.commit();
         stmt.close();
     }
 
     private static void addFile(Statement stmt, File f, boolean truncate) throws IOException, SQLException {
         String sql = readFile(f);
+        sql = sql.replaceAll("--[^\n]+\n", "\n");
         String[] stmts = sql.split(";");
         Pattern p = Pattern.compile("\\s*DROP TABLE IF EXISTS `([^`]+)`");
         for (String string : stmts) {